oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use hardcoded namespace

Browse Source 
The macro defined namespaces confused the hell out of lupdate and more or less broke translations permanently. Looks like the only way we can do it is to have a hardcoded namespace, which goes against my instinct, but honestly how likely is it that we'll change the namespace anyway (I guess forks might want to do it, but that's their problem ;) )
This commit is contained in:
itsmattkc
2020-11-17 20:24:42 +11:00
parent d241090a9f
commit 75d4cd899b
626 changed files with 1971 additions and 1972 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/panel/audiomonitor/audiomonitor.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "audiomonitor.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
AudioMonitorPanel::AudioMonitorPanel(QWidget *parent) :
PanelWidget(QStringLiteral("AudioMonitor"), parent)
@@ -37,4 +37,4 @@ void AudioMonitorPanel::Retranslate()
SetTitle(tr("Audio Monitor"));
}
OLIVE_NAMESPACE_EXIT
}
app/panel/audiomonitor/audiomonitor.h
+2 -2
View File
@@ -24,7 +24,7 @@
#include "widget/audiomonitor/audiomonitor.h"
#include "widget/panel/panel.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief PanelWidget wrapper around an AudioMonitor
@@ -42,6 +42,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // AUDIOMONITORPANEL_H
app/panel/curve/curve.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "curve.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
CurvePanel::CurvePanel(QWidget *parent) :
TimeBasedPanel(QStringLiteral("CurvePanel"), parent)
@@ -61,4 +61,4 @@ void CurvePanel::Retranslate()
SetTitle(tr("Curve Editor"));
}
OLIVE_NAMESPACE_EXIT
}
app/panel/curve/curve.h
+2 -2
View File
@@ -24,7 +24,7 @@
#include "panel/timebased/timebased.h"
#include "widget/curvewidget/curvewidget.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class CurvePanel : public TimeBasedPanel
{
@@ -46,6 +46,6 @@ protected:
};
OLIVE_NAMESPACE_EXIT
}
#endif // CURVEPANEL_H
app/panel/footageviewer/footageviewer.cpp
+2 -2
View File
@@ -22,7 +22,7 @@
#include "widget/viewer/footageviewer.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
FootageViewerPanel::FootageViewerPanel(QWidget *parent) :
ViewerPanelBase(QStringLiteral("FootageViewerPanel"), parent)
@@ -72,4 +72,4 @@ void FootageViewerPanel::Retranslate()
SetTitle(tr("Footage Viewer"));
}
OLIVE_NAMESPACE_EXIT
}
app/panel/footageviewer/footageviewer.h
+2 -2
View File
@@ -26,7 +26,7 @@
#include "panel/viewer/viewerbase.h"
#include "panel/project/footagemanagementpanel.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief Dockable wrapper around a ViewerWidget
@@ -45,6 +45,6 @@ protected:
};
OLIVE_NAMESPACE_EXIT
}
#endif // FOOTAGE_VIEWER_PANEL_H
app/panel/node/node.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "node.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
NodePanel::NodePanel(QWidget *parent) :
PanelWidget(QStringLiteral("NodePanel"), parent)
@@ -39,4 +39,4 @@ NodePanel::NodePanel(QWidget *parent) :
Retranslate();
}
OLIVE_NAMESPACE_EXIT
}
app/panel/node/node.h
+2 -2
View File
@@ -24,7 +24,7 @@
#include "widget/nodeview/nodeview.h"
#include "widget/panel/panel.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A PanelWidget wrapper around a NodeView
@@ -111,6 +111,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // NODEPANEL_H
app/panel/panelmanager.cpp
+2 -2
View File
@@ -22,7 +22,7 @@
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
PanelManager* PanelManager::instance_ = nullptr;
@@ -164,4 +164,4 @@ void PanelManager::PanelDestroyed()
}
}
OLIVE_NAMESPACE_EXIT
}
app/panel/panelmanager.h
+2 -2
View File
@@ -26,7 +26,7 @@
#include "widget/panel/panel.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief The PanelFocusManager class
@@ -232,6 +232,6 @@ QList<T*> PanelManager::GetPanelsOfType()
return panels;
}
OLIVE_NAMESPACE_EXIT
}
#endif // PANELFOCUSMANAGER_H
app/panel/param/param.cpp
+2 -2
View File
@@ -22,7 +22,7 @@
#include "window/mainwindow/mainwindow.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ParamPanel::ParamPanel(QWidget* parent) :
TimeBasedPanel(QStringLiteral("ParamPanel"), parent)
@@ -70,4 +70,4 @@ void ParamPanel::Retranslate()
}
}
OLIVE_NAMESPACE_EXIT
}
app/panel/param/param.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "panel/timebased/timebased.h"
#include "widget/nodeparamview/nodeparamview.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ParamPanel : public TimeBasedPanel
{
@@ -51,6 +51,6 @@ protected:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PARAM_H
app/panel/pixelsampler/pixelsamplerpanel.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "pixelsamplerpanel.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
PixelSamplerPanel::PixelSamplerPanel(QWidget *parent) :
PanelWidget(QStringLiteral("ProjectPanel"), parent)
@@ -41,4 +41,4 @@ void PixelSamplerPanel::Retranslate()
SetTitle(tr("Pixel Sampler"));
}
OLIVE_NAMESPACE_EXIT
}
app/panel/pixelsampler/pixelsamplerpanel.h
+2 -2
View File
@@ -24,7 +24,7 @@
#include "widget/panel/panel.h"
#include "widget/pixelsampler/pixelsampler.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class PixelSamplerPanel : public PanelWidget
{
@@ -42,6 +42,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PIXELSAMPLERPANEL_H
app/panel/project/footagemanagementpanel.h
+2 -2
View File
@@ -25,13 +25,13 @@
#include "project/item/footage/footage.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class FootageManagementPanel {
public:
virtual QList<Footage*> GetSelectedFootage() const = 0;
};
OLIVE_NAMESPACE_EXIT
}
#endif // FOOTAGEMANAGEMENTPANEL_H
app/panel/project/project.cpp
+2 -2
View File
@@ -32,7 +32,7 @@
#include "widget/projecttoolbar/projecttoolbar.h"
#include "window/mainwindow/mainwindow.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectPanel::ProjectPanel(QWidget *parent) :
PanelWidget(QStringLiteral("ProjectPanel"), parent)
@@ -243,4 +243,4 @@ QList<Footage *> ProjectPanel::GetSelectedFootage() const
return footage;
}
OLIVE_NAMESPACE_EXIT
}
app/panel/project/project.h
+3 -3
View File
@@ -26,7 +26,7 @@
#include "widget/panel/panel.h"
#include "widget/projectexplorer/projectexplorer.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A PanelWidget wrapper around a ProjectExplorer and a ProjectToolbar
@@ -80,8 +80,8 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
Q_DECLARE_METATYPE(OLIVE_NAMESPACE::ProjectPtr)
Q_DECLARE_METATYPE(olive::ProjectPtr)
#endif // PROJECT_PANEL_H
app/panel/scope/scope.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "panel/viewer/viewer.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ScopePanel::ScopePanel(QWidget* parent) :
PanelWidget(QStringLiteral("ScopePanel"), parent)
@@ -105,4 +105,4 @@ void ScopePanel::Retranslate()
}
}
OLIVE_NAMESPACE_EXIT
}
app/panel/scope/scope.h
+2 -2
View File
@@ -28,7 +28,7 @@
#include "widget/scope/histogram/histogram.h"
#include "widget/scope/waveform/waveform.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ViewerPanel;
@@ -70,6 +70,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // SCOPE_PANEL_H
app/panel/sequenceviewer/sequenceviewer.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "sequenceviewer.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
SequenceViewerPanel::SequenceViewerPanel(QWidget *parent) :
ViewerPanel(QStringLiteral("SequenceViewerPanel"), parent)
@@ -36,4 +36,4 @@ void SequenceViewerPanel::Retranslate()
SetTitle(tr("Sequence Viewer"));
}
OLIVE_NAMESPACE_EXIT
}
app/panel/sequenceviewer/sequenceviewer.h
+2 -2
View File
@@ -23,7 +23,7 @@
#include "panel/viewer/viewer.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class SequenceViewerPanel : public ViewerPanel
{
@@ -36,6 +36,6 @@ protected:
};
OLIVE_NAMESPACE_EXIT
}
#endif // SEQUENCEVIEWERPANEL_H
app/panel/table/table.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "table.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
NodeTablePanel::NodeTablePanel(QWidget* parent) :
TimeBasedPanel(QStringLiteral("NodeTablePanel"), parent)
@@ -35,4 +35,4 @@ void NodeTablePanel::Retranslate()
SetTitle(tr("Table View"));
}
OLIVE_NAMESPACE_EXIT
}
app/panel/table/table.h
+2 -2
View File
@@ -24,7 +24,7 @@
#include "panel/timebased/timebased.h"
#include "widget/nodetableview/nodetablewidget.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class NodeTablePanel : public TimeBasedPanel
{
@@ -48,6 +48,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // NODETABLEPANEL_H
app/panel/taskmanager/taskmanager.cpp
+2 -2
View File
@@ -22,7 +22,7 @@
#include "task/taskmanager.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
TaskManagerPanel::TaskManagerPanel(QWidget* parent) :
PanelWidget(QStringLiteral("TaskManagerPanel"), parent)
@@ -48,4 +48,4 @@ void TaskManagerPanel::Retranslate()
SetTitle(tr("Task Manager"));
}
OLIVE_NAMESPACE_EXIT
}
app/panel/taskmanager/taskmanager.h
+2 -2
View File
@@ -24,7 +24,7 @@
#include "widget/taskview/taskview.h"
#include "widget/panel/panel.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A PanelWidget wrapper around a TaskView widget
@@ -41,6 +41,6 @@ private:
TaskView* view_;
};
OLIVE_NAMESPACE_EXIT
}
#endif // TASKMANAGER_H
app/panel/timebased/timebased.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "timebased.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
TimeBasedPanel::TimeBasedPanel(const QString &object_name, QWidget *parent) :
PanelWidget(object_name, parent),
@@ -214,4 +214,4 @@ void TimeBasedPanel::GoToOut()
GetTimeBasedWidget()->GoToOut();
}
OLIVE_NAMESPACE_EXIT
}
app/panel/timebased/timebased.h
+2 -2
View File
@@ -24,7 +24,7 @@
#include "widget/panel/panel.h"
#include "widget/timebased/timebased.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class TimeBasedPanel : public PanelWidget
{
@@ -118,6 +118,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // TIMEBASEDPANEL_H
app/panel/timeline/timeline.cpp
+2 -2
View File
@@ -23,7 +23,7 @@
#include "panel/panelmanager.h"
#include "panel/project/footagemanagementpanel.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
TimelinePanel::TimelinePanel(QWidget *parent) :
TimeBasedPanel(QStringLiteral("TimelinePanel"), parent)
@@ -182,4 +182,4 @@ void TimelinePanel::Retranslate()
SetTitle(tr("Timeline"));
}
OLIVE_NAMESPACE_EXIT
}
app/panel/timeline/timeline.h
+2 -2
View File
@@ -24,7 +24,7 @@
#include "panel/timebased/timebased.h"
#include "widget/timelinewidget/timelinewidget.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief Panel container for a TimelineWidget
@@ -97,6 +97,6 @@ signals:
};
OLIVE_NAMESPACE_EXIT
}
#endif // TIMELINE_PANEL_H
app/panel/tool/tool.cpp
+2 -2
View File
@@ -23,7 +23,7 @@
#include "core.h"
#include "widget/toolbar/toolbar.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ToolPanel::ToolPanel(QWidget *parent) :
PanelWidget(QStringLiteral("ToolPanel"), parent)
@@ -52,4 +52,4 @@ void ToolPanel::Retranslate()
SetTitle(tr("Tools"));
}
OLIVE_NAMESPACE_EXIT
}
app/panel/tool/tool.h
+2 -2
View File
@@ -23,7 +23,7 @@
#include "widget/panel/panel.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A PanelWidget wrapper around a Toolbar
@@ -39,6 +39,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // TOOL_PANEL_H
app/panel/viewer/viewer.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "viewer.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ViewerPanel::ViewerPanel(const QString &object_name, QWidget *parent) :
ViewerPanelBase(object_name, parent)
@@ -41,4 +41,4 @@ void ViewerPanel::Retranslate()
SetTitle(tr("Viewer"));
}
OLIVE_NAMESPACE_EXIT
}
app/panel/viewer/viewer.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "viewerbase.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief Dockable wrapper around a ViewerWidget
@@ -40,6 +40,6 @@ protected:
};
OLIVE_NAMESPACE_EXIT
}
#endif // VIEWER_PANEL_H
app/panel/viewer/viewerbase.cpp
+2 -2
View File
@@ -22,7 +22,7 @@
#include "window/mainwindow/mainwindow.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ViewerPanelBase::ViewerPanelBase(const QString& object_name, QWidget *parent) :
TimeBasedPanel(object_name, parent)
@@ -123,4 +123,4 @@ void ViewerPanelBase::closeEvent(QCloseEvent *e)
TimeBasedPanel::closeEvent(e);
}
OLIVE_NAMESPACE_EXIT
}
app/panel/viewer/viewerbase.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "panel/timebased/timebased.h"
#include "widget/viewer/viewer.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ViewerPanelBase : public TimeBasedPanel
{
@@ -68,6 +68,6 @@ protected:
};
OLIVE_NAMESPACE_EXIT
}
#endif // VIEWERPANELBASE_H