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 "node/block/gap/gap.h"
#include "node/graph.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
const double TrackOutput::kTrackHeightDefault = 3.0;
const double TrackOutput::kTrackHeightMinimum = 1.5;
@@ -602,4 +602,4 @@ void TrackOutput::MutedInputValueChanged()
emit MutedChanged(IsMuted());
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -25,7 +25,7 @@
#include "node/block/block.h"
#include "timeline/timelinecommon.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A time traversal Node for sorting through one channel/track of Blocks
@@ -304,6 +304,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // TRACKOUTPUT_H
+2 -2
View File
@@ -25,7 +25,7 @@
#include "node/math/merge/merge.h"
#include "node/output/viewer/viewer.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
TrackList::TrackList(ViewerOutput *parent, const Timeline::TrackType &type, NodeInputArray *track_input) :
QObject(parent),
@@ -274,4 +274,4 @@ void TrackList::TrackHeightChangedSlot(int height)
emit TrackHeightChanged(static_cast<TrackOutput*>(sender())->Index(), height);
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -27,7 +27,7 @@
#include "node/output/track/track.h"
#include "timeline/timelinecommon.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ViewerOutput;
@@ -114,6 +114,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // TRACKLIST_H
+2 -2
View File
@@ -22,7 +22,7 @@
#include "node/traverser.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ViewerOutput::ViewerOutput() :
video_frame_cache_(this),
@@ -345,4 +345,4 @@ void ViewerOutput::TrackHeightChangedSlot(int index, int height)
emit TrackHeightChanged(static_cast<TrackList*>(sender())->type(), index, height);
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -34,7 +34,7 @@
#include "timeline/timelinecommon.h"
#include "timeline/trackreference.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A bridge between a node system and a ViewerPanel
@@ -196,6 +196,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // VIEWER_H