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:
@@ -29,7 +29,7 @@
|
||||
#include "ui/icons/icons.h"
|
||||
#include "widget/menu/menu.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
namespace olive {
|
||||
|
||||
Toolbar::Toolbar(QWidget *parent) :
|
||||
QWidget(parent)
|
||||
@@ -206,4 +206,4 @@ void Toolbar::TransitionMenuItemTriggered(QAction *a)
|
||||
emit SelectedTransitionChanged(NodeFactory::GetIDFromMenuAction(a));
|
||||
}
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "widget/toolbar/toolbarbutton.h"
|
||||
#include "tool/tool.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
namespace olive {
|
||||
|
||||
/**
|
||||
* @brief A widget containing buttons for all of Olive's application-wide tools.
|
||||
@@ -234,6 +234,6 @@ private slots:
|
||||
|
||||
};
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
}
|
||||
|
||||
#endif // TOOLBAR_H
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include "toolbarbutton.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
namespace olive {
|
||||
|
||||
ToolbarButton::ToolbarButton(QWidget *parent, const Tool::Item &tool) :
|
||||
QPushButton(parent),
|
||||
@@ -34,4 +34,4 @@ const Tool::Item &ToolbarButton::tool()
|
||||
return tool_;
|
||||
}
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#include "tool/tool.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
namespace olive {
|
||||
|
||||
/**
|
||||
* @brief Simple derived class of QPushButton to contain an Tool ID. Used as the main widget through Toolbar.
|
||||
@@ -59,6 +59,6 @@ private:
|
||||
Tool::Item tool_;
|
||||
};
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
}
|
||||
|
||||
#endif // TOOLBARBUTTON_H
|
||||
|
||||
Reference in New Issue
Block a user