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 ;) )
2020-11-17 20:24:42 +11:00
parent d241090a9f
commit 75d4cd899b
626 changed files with 1971 additions and 1972 deletions
@@ -25,7 +25,7 @@
 #include "project/item/sequence/sequence.h"
 #include "ui/icons/icons.h"

-OLIVE_NAMESPACE_ENTER
+namespace olive {

 Item::Type Folder::type() const
 {
@@ -104,4 +104,4 @@ void Folder::Save(QXmlStreamWriter *writer) const
  }
 }

-OLIVE_NAMESPACE_EXIT
+}
@@ -25,7 +25,7 @@
 #include "project/item/footage/footage.h"
 #include "project/item/item.h"

-OLIVE_NAMESPACE_ENTER
+namespace olive {

 /**
 * @brief The Folder class representing a directory in a project structure
@@ -52,6 +52,6 @@ private:

 };

-OLIVE_NAMESPACE_EXIT
+}

 #endif // FOLDER_H
@@ -22,7 +22,7 @@

 #include "common/xmlutils.h"

-OLIVE_NAMESPACE_ENTER
+namespace olive {

 AudioStream::AudioStream()
 {
@@ -93,4 +93,4 @@ void AudioStream::SaveCustomParameters(QXmlStreamWriter *writer) const
  writer->writeTextElement(QStringLiteral("rate"), QString::number(sample_rate_));
 }

-OLIVE_NAMESPACE_EXIT
+}
@@ -27,7 +27,7 @@
 #include "render/audioparams.h"
 #include "stream.h"

-OLIVE_NAMESPACE_ENTER
+namespace olive {

 /**
 * @brief A Stream derivative containing audio-specific information
@@ -65,6 +65,6 @@ private:

 using AudioStreamPtr = std::shared_ptr<AudioStream>;

-OLIVE_NAMESPACE_EXIT
+}

 #endif // AUDIOSTREAM_H
@@ -30,7 +30,7 @@
 #include "core.h"
 #include "ui/icons/icons.h"

-OLIVE_NAMESPACE_ENTER
+namespace olive {

 Footage::Footage()
 {
@@ -345,4 +345,4 @@ void Footage::UpdateTooltip()
  }
 }

-OLIVE_NAMESPACE_EXIT
+}
@@ -30,7 +30,7 @@
 #include "project/item/footage/videostream.h"
 #include "timeline/timelinepoints.h"

-OLIVE_NAMESPACE_ENTER
+namespace olive {

 class Footage;
 using FootagePtr = std::shared_ptr<Footage>;
@@ -250,6 +250,6 @@ private:

 };

-OLIVE_NAMESPACE_EXIT
+}

 #endif // FOOTAGE_H
@@ -23,7 +23,7 @@
 #include "footage.h"
 #include "ui/icons/icons.h"

-OLIVE_NAMESPACE_ENTER
+namespace olive {

 Stream::Stream() :
  footage_(nullptr),
@@ -190,4 +190,4 @@ void Stream::SaveCustomParameters(QXmlStreamWriter*) const
 {
 }

-OLIVE_NAMESPACE_EXIT
+}
@@ -30,7 +30,7 @@
 #include "common/rational.h"
 #include "ui/icons/icons.h"

-OLIVE_NAMESPACE_ENTER
+namespace olive {

 class Footage;
 class Stream;
@@ -122,9 +122,9 @@ private:

 };

-OLIVE_NAMESPACE_EXIT
+}

 #include <QMetaType>
-Q_DECLARE_METATYPE(OLIVE_NAMESPACE::StreamPtr)
+Q_DECLARE_METATYPE(olive::StreamPtr)

 #endif // STREAM_H
@@ -28,7 +28,7 @@
 #include "project/project.h"
 #include "render/colormanager.h"

-OLIVE_NAMESPACE_ENTER
+namespace olive {

 VideoStream::VideoStream() :
  premultiplied_alpha_(false),
@@ -187,4 +187,4 @@ void VideoStream::DefaultColorSpaceChanged()
  }
 }

-OLIVE_NAMESPACE_EXIT
+}
@@ -24,7 +24,7 @@
 #include "render/videoparams.h"
 #include "stream.h"

-OLIVE_NAMESPACE_ENTER
+namespace olive {

 /**
 * @brief A Stream derivative containing video-specific information
@@ -176,6 +176,6 @@ private:

 using VideoStreamPtr = std::shared_ptr<VideoStream>;

-OLIVE_NAMESPACE_EXIT
+}

 #endif // VIDEOSTREAM_H
@@ -20,7 +20,7 @@

 #include "item.h"

-OLIVE_NAMESPACE_ENTER
+namespace olive {

 Item::Item() :
  parent_(nullptr),
@@ -203,4 +203,4 @@ bool Item::ChildExistsWithNameInternal(const QString &name, Item *folder)
  return false;
 }

-OLIVE_NAMESPACE_EXIT
+}
@@ -33,7 +33,7 @@
 #include "node/param.h"
 #include "project/item/footage/stream.h"

-OLIVE_NAMESPACE_ENTER
+namespace olive {

 class Project;

@@ -123,6 +123,6 @@ private:

 };

-OLIVE_NAMESPACE_EXIT
+}

 #endif // ITEM_H
@@ -36,7 +36,7 @@
 #include "panel/sequenceviewer/sequenceviewer.h"
 #include "ui/icons/icons.h"

-OLIVE_NAMESPACE_ENTER
+namespace olive {

 Sequence::Sequence()
 {
@@ -352,4 +352,4 @@ void Sequence::NameChangedEvent(const QString &name)
  viewer_output_->set_media_name(name);
 }

-OLIVE_NAMESPACE_EXIT
+}
@@ -29,7 +29,7 @@
 #include "project/item/item.h"
 #include "timeline/timelinepoints.h"

-OLIVE_NAMESPACE_ENTER
+namespace olive {

 class Sequence;
 using SequencePtr = std::shared_ptr<Sequence>;
@@ -84,6 +84,6 @@ private:

 };

-OLIVE_NAMESPACE_EXIT
+}

 #endif // SEQUENCE_H
@@ -29,7 +29,7 @@
 #include "render/diskmanager.h"
 #include "window/mainwindow/mainwindow.h"

-OLIVE_NAMESPACE_ENTER
+namespace olive {

 Project::Project() :
  is_modified_(false),
@@ -228,4 +228,4 @@ void Project::DefaultColorSpaceChanged()
  }
 }

-OLIVE_NAMESPACE_EXIT
+}
@@ -28,7 +28,7 @@
 #include "project/item/folder/folder.h"
 #include "window/mainwindow/mainwindowlayoutinfo.h"

-OLIVE_NAMESPACE_ENTER
+namespace olive {

 /**
 * @brief A project instance containing all the data pertaining to the user's project
@@ -105,6 +105,6 @@ private slots:

 using ProjectPtr = std::shared_ptr<Project>;

-OLIVE_NAMESPACE_EXIT
+}

 #endif // PROJECT_H
@@ -27,7 +27,7 @@
 #include "core.h"
 #include "node/input/media/media.h"

-OLIVE_NAMESPACE_ENTER
+namespace olive {

 ProjectViewModel::ProjectViewModel(QObject *parent) :
  QAbstractItemModel(parent),
@@ -604,4 +604,4 @@ void ProjectViewModel::RemoveItemCommand::undo_internal()
  model_->AddChild(parent_, item_);
 }

-OLIVE_NAMESPACE_EXIT
+}
@@ -27,7 +27,7 @@
 #include "undo/undocommand.h"
 #include "node/block/block.h"

-OLIVE_NAMESPACE_ENTER
+namespace olive {

 /**
 * @brief An adapter that interprets the data in a Project into a Qt item model for usage in ViewModel Views.
@@ -251,6 +251,6 @@ private:
  QVector<ColumnType> columns_;
 };

-OLIVE_NAMESPACE_EXIT
+}

 #endif // VIEWMODEL_H