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
@@ -30,7 +30,7 @@
#define super HandMovableView
OLIVE_NAMESPACE_ENTER
namespace olive {
NodeView::NodeView(QWidget *parent) :
HandMovableView(parent),
@@ -903,4 +903,4 @@ void NodeView::GraphEdgeRemoved(NodeEdgePtr edge)
}
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -29,7 +29,7 @@
#include "widget/timelinewidget/view/handmovableview.h"
#include "widget/nodecopypaste/nodecopypaste.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A widget for viewing and editing node graphs
@@ -190,6 +190,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // NODEVIEW_H
+2 -2
View File
@@ -25,7 +25,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class NodeViewCommon {
public:
@@ -53,6 +53,6 @@ public:
};
OLIVE_NAMESPACE_EXIT
}
#endif // NODEVIEWCOMMON_H
+2 -2
View File
@@ -30,7 +30,7 @@
#include "nodeview.h"
#include "nodeviewscene.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
NodeViewEdge::NodeViewEdge(QGraphicsItem *parent) :
QGraphicsPathItem(parent),
@@ -170,4 +170,4 @@ void NodeViewEdge::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
painter->drawPath(path());
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -27,7 +27,7 @@
#include "node/edge.h"
#include "nodeviewcommon.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A graphical representation of a NodeEdge to be used in NodeView
@@ -112,6 +112,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // NODEEDGEITEM_H
+2 -2
View File
@@ -36,7 +36,7 @@
#include "ui/icons/icons.h"
#include "window/mainwindow/mainwindow.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
NodeViewItem::NodeViewItem(QGraphicsItem *parent) :
QGraphicsRectItem(parent),
@@ -699,4 +699,4 @@ QPointF NodeViewItem::GetInputPoint(int index, const QPointF& source_pos) const
}
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -32,7 +32,7 @@
#include "nodeviewedge.h"
#include "nodeviewitemwidgetproxy.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A visual widget representation of a Node object to be used in a NodeView
@@ -174,6 +174,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // NODEVIEWITEM_H
+2 -2
View File
@@ -25,7 +25,7 @@
#include "nodeviewitem.h"
#include "project/item/sequence/sequence.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
NodeViewScene::NodeViewScene(QObject *parent) :
QGraphicsScene(parent),
@@ -310,4 +310,4 @@ void NodeViewScene::NodeLabelChanged()
item_map_.value(static_cast<Node*>(sender()))->update();
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -28,7 +28,7 @@
#include "nodeviewedge.h"
#include "nodeviewitem.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class NodeViewScene : public QGraphicsScene
{
@@ -146,6 +146,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // NODEVIEWSCENE_H
+2 -2
View File
@@ -22,7 +22,7 @@
#include "project/item/sequence/sequence.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
NodeEdgeAddCommand::NodeEdgeAddCommand(NodeOutput *output, NodeInput *input, QUndoCommand *parent) :
UndoCommand(parent),
@@ -230,4 +230,4 @@ void NodeCopyInputsCommand::redo()
Node::CopyInputs(src_, dest_, include_connections_);
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -29,7 +29,7 @@
#include "undo/undocommand.h"
#include "widget/timelinewidget/undo/undo.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief An undoable command for connecting two NodeParams together
@@ -209,6 +209,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // NODEVIEWUNDO_H