use hardcoded namespace

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
+2 -2
View File
@@ -27,7 +27,7 @@
#include "core.h"
#include "project/item/footage/footage.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectImportTask::ProjectImportTask(ProjectViewModel *model, Folder *folder, const QStringList &filenames) :
command_(nullptr),
@@ -284,4 +284,4 @@ int64_t ProjectImportTask::GetImageSequenceLimit(const QString& start_fn, int64_
return start;
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -28,7 +28,7 @@
#include "project/projectviewmodel.h"
#include "task/task.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ProjectImportTask : public Task
{
@@ -83,6 +83,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTIMPORTMANAGER_H
@@ -25,7 +25,7 @@
#include <QListWidget>
#include <QVBoxLayout>
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectImportErrorDialog::ProjectImportErrorDialog(const QStringList& filenames, QWidget* parent) :
QDialog(parent)
@@ -50,4 +50,4 @@ ProjectImportErrorDialog::ProjectImportErrorDialog(const QStringList& filenames,
layout->addWidget(buttons);
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -25,7 +25,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ProjectImportErrorDialog : public QDialog
{
@@ -35,6 +35,6 @@ public:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTIMPORTERRORDIALOG_H
+2 -2
View File
@@ -27,7 +27,7 @@
#include "common/xmlutils.h"
#include "core.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectLoadTask::ProjectLoadTask(const QString &filename) :
ProjectLoadBaseTask(filename)
@@ -99,4 +99,4 @@ bool ProjectLoadTask::Run()
}
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -24,7 +24,7 @@
#include "loadbasetask.h"
#include "window/mainwindow/mainwindowlayoutinfo.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ProjectLoadTask : public ProjectLoadBaseTask
{
@@ -37,6 +37,6 @@ protected:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTLOADMANAGER_H
+2 -2
View File
@@ -20,7 +20,7 @@
#include "loadbasetask.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectLoadBaseTask::ProjectLoadBaseTask(const QString &filename) :
project_(nullptr),
@@ -29,4 +29,4 @@ ProjectLoadBaseTask::ProjectLoadBaseTask(const QString &filename) :
SetTitle(tr("Loading '%1'").arg(filename));
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -24,7 +24,7 @@
#include "project/project.h"
#include "task/task.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ProjectLoadBaseTask : public Task
{
@@ -69,6 +69,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // LOADBASETASK_H
+2 -2
View File
@@ -36,7 +36,7 @@
#define OTIO opentimelineio::v1_0
OLIVE_NAMESPACE_ENTER
namespace olive {
LoadOTIOTask::LoadOTIOTask(const QString& s) :
ProjectLoadBaseTask(s)
@@ -209,4 +209,4 @@ bool LoadOTIOTask::Run()
return true;
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -24,7 +24,7 @@
#include "project/project.h"
#include "task/project/load/loadbasetask.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class LoadOTIOTask : public ProjectLoadBaseTask
{
@@ -37,6 +37,6 @@ protected:
};
OLIVE_NAMESPACE_EXIT
}
#endif // OTIODECODER_H
+2 -2
View File
@@ -27,7 +27,7 @@
#include "common/filefunctions.h"
#include "core.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ProjectSaveTask::ProjectSaveTask(ProjectPtr project) :
project_(project)
@@ -87,4 +87,4 @@ bool ProjectSaveTask::Run()
}
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -24,7 +24,7 @@
#include "project/project.h"
#include "task/task.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ProjectSaveTask : public Task
{
@@ -45,6 +45,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTSAVEMANAGER_H
+2 -2
View File
@@ -29,7 +29,7 @@
#include "node/block/transition/transition.h"
#include "node/input/media/media.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
SaveOTIOTask::SaveOTIOTask(ProjectPtr project) :
project_(project)
@@ -206,4 +206,4 @@ bool SaveOTIOTask::SerializeTrackList(TrackList *list, opentimelineio::v1_0::Tim
return true;
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -27,7 +27,7 @@
#include "project/project.h"
#include "task/task.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class SaveOTIOTask : public Task
{
@@ -49,6 +49,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PROJECTSAVEASOTIOTASK_H