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
@@ -24,7 +24,7 @@
#include "common/define.h"
#include "common/rational.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class Block;
class TrackOutput;
@@ -59,6 +59,6 @@ public:
// FIXME: Hardcoded (but that might be okay here)
#define PLAYHEAD_COLOR Qt::red
OLIVE_NAMESPACE_EXIT
}
#endif // TIMELINECOMMON_H
+2 -2
View File
@@ -20,7 +20,7 @@
#include "timelinecoordinate.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
TimelineCoordinate::TimelineCoordinate() :
track_(Timeline::kTrackTypeNone, 0)
@@ -59,4 +59,4 @@ void TimelineCoordinate::SetTrack(const TrackReference &track)
track_ = track;
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -24,7 +24,7 @@
#include "common/rational.h"
#include "trackreference.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class TimelineCoordinate
{
@@ -46,6 +46,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // TIMELINECOORDINATE_H
+2 -2
View File
@@ -22,7 +22,7 @@
#include "common/xmlutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
TimelineMarker::TimelineMarker(const TimeRange &time, const QString &name, QObject *parent) :
QObject(parent),
@@ -121,4 +121,4 @@ void TimelineMarkerList::Load(QXmlStreamReader *reader)
}
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -27,7 +27,7 @@
#include "common/timerange.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class TimelineMarker : public QObject
{
@@ -80,6 +80,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // TIMELINEMARKER_H
+2 -2
View File
@@ -22,7 +22,7 @@
#include "common/xmlutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
TimelineMarkerList *TimelinePoints::markers()
{
@@ -68,4 +68,4 @@ TimelineWorkArea *TimelinePoints::workarea()
return &workarea_;
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -27,7 +27,7 @@
#include "timelinemarker.h"
#include "timelineworkarea.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class TimelinePoints
{
@@ -50,6 +50,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // TIMELINEPOINTS_H
+2 -2
View File
@@ -22,7 +22,7 @@
#include "common/xmlutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
const rational TimelineWorkArea::kResetIn = 0;
const rational TimelineWorkArea::kResetOut = RATIONAL_MAX;
@@ -101,4 +101,4 @@ const rational &TimelineWorkArea::length() const
return workarea_range_.length();
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -27,7 +27,7 @@
#include "common/timerange.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class TimelineWorkArea : public QObject
{
@@ -62,6 +62,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // TIMELINEWORKAREA_H
+2 -2
View File
@@ -20,7 +20,7 @@
#include "trackreference.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
TrackReference::TrackReference() :
type_(Timeline::kTrackTypeNone),
@@ -62,4 +62,4 @@ uint qHash(const TrackReference &r, uint seed)
seed);
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -23,7 +23,7 @@
#include "timeline/timelinecommon.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class TrackReference
{
@@ -51,6 +51,6 @@ private:
uint qHash(const TrackReference& r, uint seed);
OLIVE_NAMESPACE_EXIT
}
#endif // TRACKREFERENCE_H