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
@@ -20,7 +20,7 @@
#include "keyframeview.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
KeyframeView::KeyframeView(QWidget *parent) :
KeyframeViewBase(parent),
@@ -52,4 +52,4 @@ void KeyframeView::AddKeyframe(NodeKeyframePtr key, int y)
item->SetOverrideY(scene_pt.y());
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -23,7 +23,7 @@
#include "keyframeviewbase.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class KeyframeView : public KeyframeViewBase
{
@@ -49,6 +49,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // KEYFRAMEVIEW_H
+2 -2
View File
@@ -30,7 +30,7 @@
#include "widget/menu/menushared.h"
#include "widget/nodeparamview/nodeparamviewundo.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
KeyframeViewBase::KeyframeViewBase(QWidget *parent) :
TimelineViewBase(parent),
@@ -538,4 +538,4 @@ void KeyframeViewBase::AutoSelectKeyTimeNeighbors()
currently_autoselecting_ = false;
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -28,7 +28,7 @@
#include "widget/timelinewidget/view/timelineviewbase.h"
#include "widget/timetarget/timetarget.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class KeyframeViewBase : public TimelineViewBase, public TimeTargetObject
{
@@ -105,6 +105,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // KEYFRAMEVIEWBASE_H
+2 -2
View File
@@ -28,7 +28,7 @@
#include "common/qtutils.h"
#include "node/input.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
KeyframeViewItem::KeyframeViewItem(NodeKeyframePtr key, QGraphicsItem *parent) :
QGraphicsRectItem(parent),
@@ -127,4 +127,4 @@ void KeyframeViewItem::Redraw()
QGraphicsItem::update();
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -26,7 +26,7 @@
#include "node/keyframe.h"
#include "widget/timetarget/timetarget.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class KeyframeViewItem : public QObject, public QGraphicsRectItem, public TimeTargetObject
{
@@ -63,6 +63,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // KEYFRAMEVIEWITEM_H
+2 -2
View File
@@ -24,7 +24,7 @@
#include "node/node.h"
#include "project/item/sequence/sequence.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
KeyframeSetTypeCommand::KeyframeSetTypeCommand(NodeKeyframePtr key, NodeKeyframe::Type type, QUndoCommand *parent) :
UndoCommand(parent),
@@ -82,4 +82,4 @@ void KeyframeSetBezierControlPoint::undo_internal()
key_->set_bezier_control(mode_, old_point_);
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -24,7 +24,7 @@
#include "node/keyframe.h"
#include "undo/undocommand.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class KeyframeSetTypeCommand : public UndoCommand {
public:
@@ -67,6 +67,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // KEYFRAMEVIEWUNDO_H