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/task/conform/conform.cpp
+2 -2
View File
@@ -22,7 +22,7 @@
#include "codec/decoder.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ConformTask::ConformTask(AudioStreamPtr stream, const AudioParams& params) :
stream_(stream),
@@ -57,4 +57,4 @@ bool ConformTask::Run()
return true;
}
OLIVE_NAMESPACE_EXIT
}
app/task/conform/conform.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "render/audioparams.h"
#include "task/task.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ConformTask : public Task
{
@@ -43,6 +43,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // CONFORMTASK_H
app/task/export/export.cpp
+2 -2
View File
@@ -23,7 +23,7 @@
#include "common/timecodefunctions.h"
#include "render/colormanager.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ExportTask::ExportTask(ViewerOutput* viewer_node,
ColorManager* color_manager,
@@ -189,4 +189,4 @@ void ExportTask::AudioDownloaded(const TimeRange &range, SampleBufferPtr samples
audio_data_.WritePCM(adjusted_range, samples, QDateTime::currentMSecsSinceEpoch());
}
OLIVE_NAMESPACE_EXIT
}
app/task/export/export.h
+2 -2
View File
@@ -27,7 +27,7 @@
#include "task/render/render.h"
#include "task/task.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ExportTask : public RenderTask
{
@@ -64,6 +64,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // EXPORTTASK_H
app/task/export/exportparams.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "exportparams.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ExportParams::ExportParams() :
video_scaling_method_(kStretch),
@@ -122,4 +122,4 @@ void ExportParams::Save(QXmlStreamWriter *writer) const
writer->writeEndElement(); // export
}
OLIVE_NAMESPACE_EXIT
}
app/task/export/exportparams.h
+2 -2
View File
@@ -27,7 +27,7 @@
#include "node/output/viewer/viewer.h"
#include "render/colortransform.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ExportParams : public EncodingParams {
public:
@@ -70,6 +70,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // EXPORTPARAMS_H
app/task/precache/precachetask.cpp
+2 -2
View File
@@ -22,7 +22,7 @@
#include "project/project.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
PreCacheTask::PreCacheTask(VideoStreamPtr footage, Sequence* sequence) :
RenderTask(new ViewerOutput(), sequence->video_params(), sequence->audio_params()),
@@ -92,4 +92,4 @@ void PreCacheTask::AudioDownloaded(const TimeRange &range, SampleBufferPtr sampl
Q_UNUSED(job_time)
}
OLIVE_NAMESPACE_EXIT
}
app/task/precache/precachetask.h
+2 -2
View File
@@ -26,7 +26,7 @@
#include "project/item/sequence/sequence.h"
#include "task/render/render.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class PreCacheTask : public RenderTask
{
@@ -50,6 +50,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PRECACHETASK_H
app/task/project/import/import.cpp
+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
}
app/task/project/import/import.h
+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
app/task/project/import/importerrordialog.cpp
+2 -2
View File
@@ -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
}
app/task/project/import/importerrordialog.h
+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
app/task/project/load/load.cpp
+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
}
app/task/project/load/load.h
+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
app/task/project/load/loadbasetask.cpp
+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
}
app/task/project/load/loadbasetask.h
+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
app/task/project/loadotio/loadotio.cpp
+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
}
app/task/project/loadotio/loadotio.h
+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
app/task/project/save/save.cpp
+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
}
app/task/project/save/save.h
+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
app/task/project/saveotio/saveotio.cpp
+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
}
app/task/project/saveotio/saveotio.h
+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
app/task/render/render.cpp
+2 -2
View File
@@ -23,7 +23,7 @@
#include "common/timecodefunctions.h"
#include "render/rendermanager.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
RenderTask::RenderTask(ViewerOutput* viewer, const VideoParams &vparams, const AudioParams &aparams) :
viewer_(viewer),
@@ -238,4 +238,4 @@ void RenderTask::TicketDone(RenderTicketWatcher* watcher)
finished_watcher_mutex_.unlock();
}
OLIVE_NAMESPACE_EXIT
}
app/task/render/render.h
+2 -2
View File
@@ -29,7 +29,7 @@
#include "threading/threadticket.h"
#include "threading/threadticketwatcher.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class RenderTask : public Task
{
@@ -102,6 +102,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // RENDERTASK_H
app/task/task.h
+2 -2
View File
@@ -27,7 +27,7 @@
#include "common/cancelableobject.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A base class for background tasks running in Olive.
@@ -162,6 +162,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // TASK_H
app/task/taskmanager.cpp
+2 -2
View File
@@ -23,7 +23,7 @@
#include <QDebug>
#include <QThread>
OLIVE_NAMESPACE_ENTER
namespace olive {
TaskManager* TaskManager::instance_ = nullptr;
@@ -133,4 +133,4 @@ void TaskManager::TaskFinished()
emit TaskListChanged();
}
OLIVE_NAMESPACE_EXIT
}
app/task/taskmanager.h
+2 -2
View File
@@ -27,7 +27,7 @@
#include "task/task.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief An object that manages background Task objects, handling their start and end
@@ -136,6 +136,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // TASKMANAGER_H