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 ;) )

app/render/audioparams.cpp

@@ -26,7 +26,7 @@ extern "C" {
 
 #include <QCoreApplication>
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 const QVector<int> AudioParams::kSupportedSampleRates = {
   8000,          // 8000 Hz
@@ -195,4 +195,4 @@ QString AudioParams::ChannelLayoutToString(const uint64_t &layout)
   }
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/render/audioparams.h

@@ -26,7 +26,7 @@
 
 #include "common/rational.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class AudioParams {
 public:
@@ -132,8 +132,8 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
-Q_DECLARE_METATYPE(OLIVE_NAMESPACE::AudioParams)
+Q_DECLARE_METATYPE(olive::AudioParams)
 
 #endif // AUDIOPARAMS_H

app/render/audioplaybackcache.cpp

@@ -26,7 +26,7 @@
 
 #include "common/filefunctions.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 const qint64 AudioPlaybackCache::kDefaultSegmentSize = 5242880;
 
@@ -538,4 +538,4 @@ qint64 AudioPlaybackCache::Playlist::GetLength() const
   return this->last().offset() + this->last().size();
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/render/audioplaybackcache.h

@@ -25,7 +25,7 @@
 #include "codec/samplebuffer.h"
 #include "render/playbackcache.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 /**
  * @brief A fully integrated system of storing and playing cached audio
@@ -214,6 +214,6 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // AUDIOPLAYBACKCACHE_H

app/render/color.cpp

@@ -25,7 +25,7 @@
 #include "common/clamp.h"
 #include "common/oiioutils.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 Color Color::fromHsv(const double &h, const double &s, const double &v)
 {
@@ -301,9 +301,9 @@ Color Color::operator/(const double &rhs) const
   return c;
 }
 
-OLIVE_NAMESPACE_EXIT
+}
 
-QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::Color &r)
+QDebug operator<<(QDebug debug, const olive::Color &r)
 {
   debug.nospace() << "[R: " << r.red() << ", G: " << r.green() << ", B: " << r.blue() << ", A: " << r.alpha() << "]";
   return debug.space();

app/render/color.h

@@ -27,7 +27,7 @@
 #include "common/define.h"
 #include "render/videoparams.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 /**
  * @brief High precision 64-bit float based RGBA color value
@@ -111,10 +111,10 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
-QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::Color& r);
+QDebug operator<<(QDebug debug, const olive::Color& r);
 
-Q_DECLARE_METATYPE(OLIVE_NAMESPACE::Color)
+Q_DECLARE_METATYPE(olive::Color)
 
 #endif // COLOR_H

app/render/colormanager.cpp

@@ -29,7 +29,7 @@
 #include "config/config.h"
 #include "core.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 OCIO::ConstConfigRcPtr ColorManager::default_config_;
 
@@ -318,4 +318,4 @@ ColorManager::SetLocale::~SetLocale()
   setlocale(LC_NUMERIC, old_locale_.toUtf8());
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/render/colormanager.h

@@ -28,7 +28,7 @@
 
 #define OCIO_SET_C_LOCALE_FOR_SCOPE ColorManager::SetLocale d("C")
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class ColorManager : public QObject
 {
@@ -113,6 +113,6 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // COLORSERVICE_H

app/render/colorprocessor.cpp

@@ -24,7 +24,7 @@
 #include "common/ocioutils.h"
 #include "colormanager.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 ColorProcessor::ColorProcessor(ColorManager *config, const QString &input, const ColorTransform &transform)
 {
@@ -131,4 +131,4 @@ void ColorProcessor::ConvertFrame(FramePtr f)
   ConvertFrame(f.get());
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/render/colorprocessor.h

@@ -26,7 +26,7 @@
 #include "render/color.h"
 #include "render/colortransform.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class ColorManager;
 
@@ -72,8 +72,8 @@ private:
 
 using ColorProcessorChain = QVector<ColorProcessorPtr>;
 
-OLIVE_NAMESPACE_EXIT
+}
 
-Q_DECLARE_METATYPE(OLIVE_NAMESPACE::ColorProcessorPtr)
+Q_DECLARE_METATYPE(olive::ColorProcessorPtr)
 
 #endif // COLORPROCESSOR_H

app/render/colorprocessorcache.h

@@ -24,10 +24,10 @@
 #include "project/item/footage/stream.h"
 #include "render/colorprocessor.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 using ColorProcessorCache = QHash<QString, ColorProcessorPtr>;
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // COLORPROCESSORCACHE_H

app/render/colortransform.h

@@ -26,7 +26,7 @@
 #include "common/define.h"
 #include "common/ocioutils.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class ColorTransform
 {
@@ -79,6 +79,6 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // COLORTRANSFORM_H

app/render/diskmanager.cpp

@@ -33,7 +33,7 @@
 #include "core.h"
 #include "dialog/diskcache/diskcachedialog.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 DiskManager* DiskManager::instance_ = nullptr;
 
@@ -364,4 +364,4 @@ void DiskCacheFolder::SaveDiskCacheIndex()
   }
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/render/diskmanager.h

@@ -29,7 +29,7 @@
 #include "common/define.h"
 #include "project/project.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class DiskCacheFolder : public QObject
 {
@@ -165,6 +165,6 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // DISKMANAGER_H

app/render/framehashcache.cpp

@@ -32,7 +32,7 @@
 #include "common/timecodefunctions.h"
 #include "render/diskmanager.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 FrameHashCache::FrameHashCache(QObject *parent) :
   PlaybackCache(parent)
@@ -438,4 +438,4 @@ bool FrameHashCache::SaveCacheFrame(const QString &filename, char *data, const V
   return true;
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/render/framehashcache.h

@@ -29,7 +29,7 @@
 #include "render/playbackcache.h"
 #include "render/videoparams.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class FrameHashCache : public PlaybackCache
 {
@@ -76,7 +76,7 @@ public:
   QVector<rational> GetInvalidatedFrames(const TimeRange& intersecting);
 
 public slots:
-  void SetHash(const OLIVE_NAMESPACE::rational& time, const QByteArray& hash, const qint64 &job_time, bool frame_exists);
+  void SetHash(const olive::rational& time, const QByteArray& hash, const qint64 &job_time, bool frame_exists);
 
 protected:
   virtual void LengthChangedEvent(const rational& old, const rational& newlen) override;
@@ -97,6 +97,6 @@ private slots:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // VIDEORENDERFRAMECACHE_H

app/render/job/acceleratedjob.h

@@ -26,7 +26,7 @@
 #include "render/shadervalue.h"
 #include "node/value.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class AcceleratedJob {
 public:
@@ -96,6 +96,6 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // ACCELERATEDJOB_H

app/render/job/generatejob.h

@@ -23,7 +23,7 @@
 
 #include "acceleratedjob.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class GenerateJob : public AcceleratedJob {
 public:
@@ -47,8 +47,8 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
-Q_DECLARE_METATYPE(OLIVE_NAMESPACE::GenerateJob)
+Q_DECLARE_METATYPE(olive::GenerateJob)
 
 #endif // GENERATEJOB_H

app/render/job/samplejob.h

@@ -24,7 +24,7 @@
 #include "acceleratedjob.h"
 #include "codec/samplebuffer.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class SampleJob : public AcceleratedJob {
 public:
@@ -58,8 +58,8 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
-Q_DECLARE_METATYPE(OLIVE_NAMESPACE::SampleJob)
+Q_DECLARE_METATYPE(olive::SampleJob)
 
 #endif // SAMPLEJOB_H

app/render/job/shaderjob.h

@@ -26,7 +26,7 @@
 #include "generatejob.h"
 #include "render/texture.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class ShaderJob : public GenerateJob {
 public:
@@ -93,8 +93,8 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
-Q_DECLARE_METATYPE(OLIVE_NAMESPACE::ShaderJob)
+Q_DECLARE_METATYPE(olive::ShaderJob)
 
 #endif // SHADERJOB_H

app/render/managedcolor.cpp

@@ -20,7 +20,7 @@
 
 #include "managedcolor.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 ManagedColor::ManagedColor()
 {
@@ -61,4 +61,4 @@ void ManagedColor::set_color_output(const ColorTransform &color_output)
   color_transform_ = color_output;
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/render/managedcolor.h

@@ -24,7 +24,7 @@
 #include "color.h"
 #include "colortransform.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class ManagedColor : public Color
 {
@@ -47,6 +47,6 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // MANAGEDCOLOR_H

app/render/opengl/openglrenderer.cpp

@@ -23,7 +23,7 @@
 #include <QDebug>
 #include <QOpenGLExtraFunctions>
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 const QVector<GLfloat> blit_vertices = {
   -1.0f, -1.0f, 0.0f,
@@ -665,4 +665,4 @@ void OpenGLRenderer::PrepareInputTexture(GLenum target, Texture::Interpolation i
   functions_->glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/render/opengl/openglrenderer.h

@@ -30,7 +30,7 @@
 
 #include "render/renderer.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class OpenGLRenderer : public Renderer
 {
@@ -51,24 +51,24 @@ public slots:
 
   virtual void ClearDestination(double r = 0.0, double g = 0.0, double b = 0.0, double a = 0.0) override;
 
-  virtual QVariant CreateNativeTexture2D(int width, int height, OLIVE_NAMESPACE::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) override;
-  virtual QVariant CreateNativeTexture3D(int width, int height, int depth, OLIVE_NAMESPACE::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) override;
+  virtual QVariant CreateNativeTexture2D(int width, int height, olive::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) override;
+  virtual QVariant CreateNativeTexture3D(int width, int height, int depth, olive::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) override;
 
   virtual void DestroyNativeTexture(QVariant texture) override;
 
-  virtual QVariant CreateNativeShader(OLIVE_NAMESPACE::ShaderCode code) override;
+  virtual QVariant CreateNativeShader(olive::ShaderCode code) override;
 
   virtual void DestroyNativeShader(QVariant shader) override;
 
-  virtual void UploadToTexture(OLIVE_NAMESPACE::Texture* texture, const void* data, int linesize) override;
+  virtual void UploadToTexture(olive::Texture* texture, const void* data, int linesize) override;
 
-  virtual void DownloadFromTexture(OLIVE_NAMESPACE::Texture* texture, void* data, int linesize) override;
+  virtual void DownloadFromTexture(olive::Texture* texture, void* data, int linesize) override;
 
 protected slots:
   virtual void Blit(QVariant shader,
-                    OLIVE_NAMESPACE::ShaderJob job,
-                    OLIVE_NAMESPACE::Texture* destination,
-                    OLIVE_NAMESPACE::VideoParams destination_params) override;
+                    olive::ShaderJob job,
+                    olive::Texture* destination,
+                    olive::VideoParams destination_params) override;
 
 private:
   static GLint GetInternalFormat(VideoParams::Format format, int channel_layout);
@@ -77,7 +77,7 @@ private:
 
   static GLenum GetPixelFormat(int channel_count);
 
-  void AttachTextureAsDestination(OLIVE_NAMESPACE::Texture* texture);
+  void AttachTextureAsDestination(olive::Texture* texture);
 
   void DetachTextureAsDestination();
 
@@ -93,6 +93,6 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // OPENGLCONTEXT_H

app/render/playbackcache.cpp

@@ -27,7 +27,7 @@
 #include "project/project.h"
 #include "render/diskmanager.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 void PlaybackCache::Invalidate(const TimeRange &r)
 {
@@ -195,4 +195,4 @@ QString PlaybackCache::GetCacheDirectory() const
   }
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/render/playbackcache.h

@@ -26,7 +26,7 @@
 
 #include "common/timerange.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class Project;
 
@@ -71,13 +71,13 @@ public slots:
   void Shift(const rational& from, const rational& to);
 
 signals:
-  void Invalidated(const OLIVE_NAMESPACE::TimeRange& r);
+  void Invalidated(const olive::TimeRange& r);
 
-  void Validated(const OLIVE_NAMESPACE::TimeRange& r);
+  void Validated(const olive::TimeRange& r);
 
-  void Shifted(const OLIVE_NAMESPACE::rational& from, const OLIVE_NAMESPACE::rational& to);
+  void Shifted(const olive::rational& from, const olive::rational& to);
 
-  void LengthChanged(const OLIVE_NAMESPACE::rational& r);
+  void LengthChanged(const olive::rational& r);
 
 protected:
   void Validate(const TimeRange& r);
@@ -106,6 +106,6 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // PLAYBACKCACHE_H

app/render/previewautocacher.cpp

@@ -8,7 +8,7 @@
 #include "render/rendermanager.h"
 #include "render/renderprocessor.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 PreviewAutoCacher::PreviewAutoCacher() :
   viewer_node_(nullptr),
@@ -771,4 +771,4 @@ void PreviewAutoCacher::SetViewerNode(ViewerOutput *viewer_node)
   }
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/render/previewautocacher.h

@@ -9,7 +9,7 @@
 #include "render/colormanager.h"
 #include "threading/threadticketwatcher.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 /**
  * @brief Manager for dynamically caching a sequence in the background
@@ -160,12 +160,12 @@ private slots:
   /**
    * @brief Handler for when the NodeGraph reports a video change over a certain time range
    */
-  void VideoInvalidated(const OLIVE_NAMESPACE::TimeRange &range);
+  void VideoInvalidated(const olive::TimeRange &range);
 
   /**
    * @brief Handler for when the NodeGraph reports a audio change over a certain time range
    */
-  void AudioInvalidated(const OLIVE_NAMESPACE::TimeRange &range);
+  void AudioInvalidated(const olive::TimeRange &range);
 
   /**
    * @brief Handler for when we have applied all the hashes to the FrameHashCache
@@ -204,6 +204,6 @@ private slots:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // AUTOCACHER_H

app/render/rendercache.h

@@ -24,7 +24,7 @@
 #include "codec/decoder.h"
 #include "project/item/footage/stream.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 template <typename K, typename V>
 class RenderCache : public QHash<K, V>
@@ -43,6 +43,6 @@ private:
 using DecoderCache = RenderCache<Stream*, DecoderPtr>;
 using ShaderCache = RenderCache<QString, QVariant>;
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // RENDERCACHE_H

app/render/renderer.cpp

@@ -24,7 +24,7 @@
 
 #include "common/ocioutils.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 Renderer::Renderer(QObject *parent) :
   QObject(parent)
@@ -275,4 +275,4 @@ void Renderer::BlitColorManagedInternal(ColorProcessorPtr color_processor, Textu
   }
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/render/renderer.h

@@ -31,7 +31,7 @@
 #include "render/videoparams.h"
 #include "texture.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class ShaderJob;
 
@@ -47,15 +47,15 @@ public:
   TexturePtr CreateTexture(const VideoParams& params, const void *data = nullptr, int linesize = 0);
 
   void BlitToTexture(QVariant shader,
-                     OLIVE_NAMESPACE::ShaderJob job,
-                     OLIVE_NAMESPACE::Texture* destination)
+                     olive::ShaderJob job,
+                     olive::Texture* destination)
   {
     Blit(shader, job, destination, destination->params());
   }
 
   void Blit(QVariant shader,
-            OLIVE_NAMESPACE::ShaderJob job,
-            OLIVE_NAMESPACE::VideoParams params)
+            olive::ShaderJob job,
+            olive::VideoParams params)
   {
     Blit(shader, job, nullptr, params);
   }
@@ -72,24 +72,24 @@ public slots:
 
   virtual void ClearDestination(double r = 0.0, double g = 0.0, double b = 0.0, double a = 0.0) = 0;
 
-  virtual QVariant CreateNativeTexture2D(int width, int height, OLIVE_NAMESPACE::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) = 0;
-  virtual QVariant CreateNativeTexture3D(int width, int height, int depth, OLIVE_NAMESPACE::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) = 0;
+  virtual QVariant CreateNativeTexture2D(int width, int height, olive::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) = 0;
+  virtual QVariant CreateNativeTexture3D(int width, int height, int depth, olive::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) = 0;
 
   virtual void DestroyNativeTexture(QVariant texture) = 0;
 
-  virtual QVariant CreateNativeShader(OLIVE_NAMESPACE::ShaderCode code) = 0;
+  virtual QVariant CreateNativeShader(olive::ShaderCode code) = 0;
 
   virtual void DestroyNativeShader(QVariant shader) = 0;
 
-  virtual void UploadToTexture(OLIVE_NAMESPACE::Texture* texture, const void* data, int linesize) = 0;
+  virtual void UploadToTexture(olive::Texture* texture, const void* data, int linesize) = 0;
 
-  virtual void DownloadFromTexture(OLIVE_NAMESPACE::Texture* texture, void* data, int linesize) = 0;
+  virtual void DownloadFromTexture(olive::Texture* texture, void* data, int linesize) = 0;
 
 protected slots:
   virtual void Blit(QVariant shader,
-                    OLIVE_NAMESPACE::ShaderJob job,
-                    OLIVE_NAMESPACE::Texture* destination,
-                    OLIVE_NAMESPACE::VideoParams destination_params) = 0;
+                    olive::ShaderJob job,
+                    olive::Texture* destination,
+                    olive::VideoParams destination_params) = 0;
 
 private:
   struct ColorContext {
@@ -121,6 +121,6 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // RENDERCONTEXT_H

app/render/rendererthreadwrapper.cpp

@@ -20,7 +20,7 @@
 
 #include "rendererthreadwrapper.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 RendererThreadWrapper::RendererThreadWrapper(Renderer *inner, QObject *parent) :
   Renderer(parent),
@@ -157,4 +157,4 @@ void RendererThreadWrapper::Blit(QVariant shader, ShaderJob job, Texture *destin
                             OLIVE_NS_ARG(VideoParams, destination_params));
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/render/rendererthreadwrapper.h

@@ -25,7 +25,7 @@
 
 #include "renderer.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class RendererThreadWrapper : public Renderer
 {
@@ -47,24 +47,24 @@ public slots:
 
   virtual void ClearDestination(double r = 0.0, double g = 0.0, double b = 0.0, double a = 0.0) override;
 
-  virtual QVariant CreateNativeTexture2D(int width, int height, OLIVE_NAMESPACE::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) override;
-  virtual QVariant CreateNativeTexture3D(int width, int height, int depth, OLIVE_NAMESPACE::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) override;
+  virtual QVariant CreateNativeTexture2D(int width, int height, olive::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) override;
+  virtual QVariant CreateNativeTexture3D(int width, int height, int depth, olive::VideoParams::Format format, int channel_count, const void* data = nullptr, int linesize = 0) override;
 
   virtual void DestroyNativeTexture(QVariant texture) override;
 
-  virtual QVariant CreateNativeShader(OLIVE_NAMESPACE::ShaderCode code) override;
+  virtual QVariant CreateNativeShader(olive::ShaderCode code) override;
 
   virtual void DestroyNativeShader(QVariant shader) override;
 
-  virtual void UploadToTexture(OLIVE_NAMESPACE::Texture* texture, const void* data, int linesize) override;
+  virtual void UploadToTexture(olive::Texture* texture, const void* data, int linesize) override;
 
-  virtual void DownloadFromTexture(OLIVE_NAMESPACE::Texture* texture, void* data, int linesize) override;
+  virtual void DownloadFromTexture(olive::Texture* texture, void* data, int linesize) override;
 
 protected slots:
   virtual void Blit(QVariant shader,
-                    OLIVE_NAMESPACE::ShaderJob job,
-                    OLIVE_NAMESPACE::Texture* destination,
-                    OLIVE_NAMESPACE::VideoParams destination_params) override;
+                    olive::ShaderJob job,
+                    olive::Texture* destination,
+                    olive::VideoParams destination_params) override;
 
 private:
   Renderer* inner_;
@@ -73,6 +73,6 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // RENDERCONTEXTTHREADWRAPPER_H

app/render/rendermanager.cpp

@@ -34,7 +34,7 @@
 #include "task/taskmanager.h"
 #include "window/mainwindow/mainwindow.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 RenderManager* RenderManager::instance_ = nullptr;
 
@@ -199,4 +199,4 @@ void RenderManager::RunTicket(RenderTicketPtr ticket) const
   RenderProcessor::Process(ticket, context_, still_cache_, decoder_cache_, shader_cache_, default_shader_);
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/render/rendermanager.h

@@ -34,7 +34,7 @@
 #include "stillimagecache.h"
 #include "threading/threadpool.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class RenderManager : public ThreadPool
 {
@@ -142,8 +142,8 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
-Q_DECLARE_METATYPE(OLIVE_NAMESPACE::RenderManager::TicketType)
+Q_DECLARE_METATYPE(olive::RenderManager::TicketType)
 
 #endif // RENDERBACKEND_H

app/render/rendermodes.h

@@ -23,7 +23,7 @@
 
 #include "common/define.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class RenderMode {
 public:
@@ -45,6 +45,6 @@ public:
   };
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // RENDERMODE_H

app/render/renderprocessor.cpp

@@ -27,7 +27,7 @@
 #include "project/project.h"
 #include "rendermanager.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 RenderProcessor::RenderProcessor(RenderTicketPtr ticket, Renderer *render_ctx, StillImageCache* still_image_cache, DecoderCache* decoder_cache, ShaderCache *shader_cache, QVariant default_shader) :
   ticket_(ticket),
@@ -512,4 +512,4 @@ QVariant RenderProcessor::GetCachedFrame(const Node *node, const rational &time)
   return QVariant();
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/render/renderprocessor.h

@@ -27,7 +27,7 @@
 #include "stillimagecache.h"
 #include "threading/threadticket.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class RenderProcessor : public NodeTraverser
 {
@@ -76,8 +76,8 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
-Q_DECLARE_METATYPE(OLIVE_NAMESPACE::RenderProcessor::RenderedWaveform)
+Q_DECLARE_METATYPE(olive::RenderProcessor::RenderedWaveform)
 
 #endif // RENDERPROCESSOR_H

app/render/shadercode.h

@@ -23,7 +23,7 @@
 
 #include "common/filefunctions.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class ShaderCode {
 public:
@@ -57,6 +57,6 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // SHADERCODE_H

app/render/shadervalue.h

@@ -23,7 +23,7 @@
 
 #include "node/param.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 struct ShaderValue
 {
@@ -50,6 +50,6 @@ struct ShaderValue
 
 using NodeValueMap = QHash<QString, ShaderValue>;
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // SHADERVALUE_H

app/render/stillimagecache.h

@@ -8,7 +8,7 @@
 #include "project/item/footage/stream.h"
 #include "render/texture.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class StillImageCache
 {
@@ -78,6 +78,6 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // STILLIMAGECACHE_H

app/render/texture.cpp

@@ -22,7 +22,7 @@
 
 #include "renderer.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 const Texture::Interpolation Texture::kDefaultInterpolation = Texture::kMipmappedLinear;
 
@@ -36,4 +36,4 @@ void Texture::Upload(void *data, int linesize)
   renderer_->UploadToTexture(this, data, linesize);
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/render/texture.h

@@ -25,7 +25,7 @@
 
 #include "render/videoparams.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class Renderer;
 
@@ -115,8 +115,8 @@ private:
 
 using TexturePtr = std::shared_ptr<Texture>;
 
-OLIVE_NAMESPACE_EXIT
+}
 
-Q_DECLARE_METATYPE(OLIVE_NAMESPACE::TexturePtr)
+Q_DECLARE_METATYPE(olive::TexturePtr)
 
 #endif // RENDERTEXTURE_H

app/render/videoparams.cpp

@@ -24,7 +24,7 @@
 
 #include "core.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 const int VideoParams::kInternalChannelCount = kRGBAChannelCount;
 
@@ -280,4 +280,4 @@ int VideoParams::GetScaledDimension(int dim, int divider)
   return dim / divider;
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/render/videoparams.h

@@ -24,7 +24,7 @@
 #include "common/rational.h"
 #include "rendermodes.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class VideoParams {
 public:
@@ -263,9 +263,9 @@ private:
   int effective_depth_;
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
-Q_DECLARE_METATYPE(OLIVE_NAMESPACE::VideoParams)
-Q_DECLARE_METATYPE(OLIVE_NAMESPACE::VideoParams::Interlacing)
+Q_DECLARE_METATYPE(olive::VideoParams)
+Q_DECLARE_METATYPE(olive::VideoParams::Interlacing)
 
 #endif // VIDEOPARAMS_H