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:
@@ -25,13 +25,13 @@
|
||||
|
||||
#include "project/item/footage/footage.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
namespace olive {
|
||||
|
||||
class FootageManagementPanel {
|
||||
public:
|
||||
virtual QList<Footage*> GetSelectedFootage() const = 0;
|
||||
};
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
}
|
||||
|
||||
#endif // FOOTAGEMANAGEMENTPANEL_H
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
#include "widget/projecttoolbar/projecttoolbar.h"
|
||||
#include "window/mainwindow/mainwindow.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
namespace olive {
|
||||
|
||||
ProjectPanel::ProjectPanel(QWidget *parent) :
|
||||
PanelWidget(QStringLiteral("ProjectPanel"), parent)
|
||||
@@ -243,4 +243,4 @@ QList<Footage *> ProjectPanel::GetSelectedFootage() const
|
||||
return footage;
|
||||
}
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include "widget/panel/panel.h"
|
||||
#include "widget/projectexplorer/projectexplorer.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
namespace olive {
|
||||
|
||||
/**
|
||||
* @brief A PanelWidget wrapper around a ProjectExplorer and a ProjectToolbar
|
||||
@@ -80,8 +80,8 @@ private slots:
|
||||
|
||||
};
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
}
|
||||
|
||||
Q_DECLARE_METATYPE(OLIVE_NAMESPACE::ProjectPtr)
|
||||
Q_DECLARE_METATYPE(olive::ProjectPtr)
|
||||
|
||||
#endif // PROJECT_PANEL_H
|
||||
|
||||
Reference in New Issue
Block a user