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/widget/viewer/audiowaveformview.cpp

@@ -28,7 +28,7 @@
 #include "config/config.h"
 #include "timeline/timelinecommon.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 AudioWaveformView::AudioWaveformView(QWidget *parent) :
   SeekableWidget(parent),
@@ -152,4 +152,4 @@ void AudioWaveformView::ForceUpdate()
   update();
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/widget/viewer/audiowaveformview.h

@@ -28,7 +28,7 @@
 #include "render/audioplaybackcache.h"
 #include "widget/timeruler/seekablewidget.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class AudioWaveformView : public SeekableWidget
 {
@@ -58,6 +58,6 @@ private slots:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // AUDIOWAVEFORMVIEW_H

app/widget/viewer/footageviewer.cpp

@@ -26,7 +26,7 @@
 #include "config/config.h"
 #include "project/project.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 FootageViewerWidget::FootageViewerWidget(QWidget *parent) :
   ViewerWidget(parent),
@@ -175,4 +175,4 @@ void FootageViewerWidget::StartAudioDrag()
   StartFootageDragInternal(false, true);
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/widget/viewer/footageviewer.h

@@ -26,7 +26,7 @@
 #include "node/output/viewer/viewer.h"
 #include "viewer.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class FootageViewerWidget : public ViewerWidget
 {
@@ -64,6 +64,6 @@ private slots:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // FOOTAGEVIEWERWIDGET_H

app/widget/viewer/gizmotraverser.cpp

@@ -20,7 +20,7 @@
 
 #include "gizmotraverser.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 QVariant GizmoTraverser::ProcessVideoFootage(StreamPtr stream, const rational &input_time)
 {
@@ -40,4 +40,4 @@ QVariant GizmoTraverser::ProcessShader(const Node *node, const TimeRange &range,
   return size_;
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/widget/viewer/gizmotraverser.h

@@ -23,7 +23,7 @@
 
 #include "node/traverser.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class GizmoTraverser : public NodeTraverser
 {
@@ -45,6 +45,6 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // GIZMOTRAVERSER_H

app/widget/viewer/viewer.cpp

@@ -42,7 +42,7 @@
 #include "widget/menu/menu.h"
 #include "window/mainwindow/mainwindow.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 QVector<ViewerWidget*> ViewerWidget::instances_;
 
@@ -1199,4 +1199,4 @@ void ViewerWidget::ViewerShiftedRange(const rational &from, const rational &to)
   }
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/widget/viewer/viewer.h

@@ -42,7 +42,7 @@
 #include "widget/playbackcontrols/playbackcontrols.h"
 #include "widget/timebased/timebased.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 /**
  * @brief An OpenGL-based viewer widget with playback controls (a PlaybackControls widget).
@@ -266,7 +266,7 @@ private slots:
 
   void SetZoomFromMenu(QAction* action);
 
-  void ViewerShiftedRange(const OLIVE_NAMESPACE::rational& from, const OLIVE_NAMESPACE::rational& to);
+  void ViewerShiftedRange(const olive::rational& from, const olive::rational& to);
 
   void UpdateStack();
 
@@ -286,7 +286,7 @@ private slots:
 
   void RendererGeneratedFrameForQueue();
 
-  void ViewerInvalidatedVideoRange(const OLIVE_NAMESPACE::TimeRange &range);
+  void ViewerInvalidatedVideoRange(const olive::TimeRange &range);
 
   void ManualSwitchToWaveform(bool e);
 
@@ -294,6 +294,6 @@ private slots:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // VIEWER_WIDGET_H

app/widget/viewer/viewerdisplay.cpp

@@ -35,7 +35,7 @@
 #include "core.h"
 #include "gizmotraverser.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 ViewerDisplayWidget::ViewerDisplayWidget(QWidget *parent) :
   ManagedDisplayWidget(parent),
@@ -421,4 +421,4 @@ QTransform ViewerDisplayWidget::GenerateWorldTransform()
   return world;
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/widget/viewer/viewerdisplay.h

@@ -32,7 +32,7 @@
 #include "widget/manageddisplay/manageddisplay.h"
 #include "widget/timetarget/timetarget.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 /**
  * @brief The inner display/rendering widget of a Viewer class.
@@ -252,6 +252,6 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // VIEWERGLWIDGET_H

app/widget/viewer/viewerplaybacktimer.cpp

@@ -22,7 +22,7 @@
 
 #include <QDateTime>
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 void ViewerPlaybackTimer::Start(const int64_t &start_timestamp, const int &playback_speed, const double &timebase)
 {
@@ -41,4 +41,4 @@ int64_t ViewerPlaybackTimer::GetTimestampNow() const
   return start_timestamp_ + frames_since_start * playback_speed_;
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/widget/viewer/viewerplaybacktimer.h

@@ -25,7 +25,7 @@
 
 #include "common/define.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class ViewerPlaybackTimer {
 public:
@@ -43,6 +43,6 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // VIEWERPLAYBACKTIMER_H

app/widget/viewer/viewerqueue.h

@@ -25,7 +25,7 @@
 
 #include "codec/frame.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 struct ViewerPlaybackFrame {
   rational timestamp;
@@ -52,6 +52,6 @@ public:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // VIEWERQUEUE_H

app/widget/viewer/viewersafemargininfo.h

@@ -25,7 +25,7 @@
 
 #include "common/define.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class ViewerSafeMarginInfo {
 public:
@@ -70,6 +70,6 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // VIEWERSAFEMARGININFO_H

app/widget/viewer/viewersizer.cpp

@@ -22,7 +22,7 @@
 
 #include <QMatrix4x4>
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 ViewerSizer::ViewerSizer(QWidget *parent) :
   QWidget(parent),
@@ -255,4 +255,4 @@ void ViewerSizer::ScrollBarMoved()
   emit RequestTranslate(mat);
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/widget/viewer/viewersizer.h

@@ -27,7 +27,7 @@
 #include "common/define.h"
 #include "common/rational.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 /**
  * @brief A container widget that enforces the aspect ratio of a child widget
@@ -120,6 +120,6 @@ private slots:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // VIEWERSIZER_H

app/widget/viewer/viewerwindow.cpp

@@ -25,7 +25,7 @@
 
 #include "common/timecodefunctions.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 ViewerWindow::ViewerWindow(QWidget *parent) :
   QWidget(parent, Qt::Window | Qt::WindowStaysOnTopHint),
@@ -140,4 +140,4 @@ void ViewerWindow::UpdateMatrix()
   display_widget_->SetMatrixZoom(mat);
 }
 
-OLIVE_NAMESPACE_EXIT
+}

app/widget/viewer/viewerwindow.h

@@ -27,7 +27,7 @@
 #include "viewerplaybacktimer.h"
 #include "viewerqueue.h"
 
-OLIVE_NAMESPACE_ENTER
+namespace olive {
 
 class ViewerWindow : public QWidget
 {
@@ -89,6 +89,6 @@ private:
 
 };
 
-OLIVE_NAMESPACE_EXIT
+}
 
 #endif // VIEWERWINDOW_H