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
@@ -36,7 +36,7 @@
#include "widget/menu/menushared.h"
#include "mainwindow.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
MainMenu::MainMenu(MainWindow *parent) :
QMenuBar(parent)
@@ -692,4 +692,4 @@ void MainMenu::Retranslate()
help_about_item_->setText(tr("&About..."));
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -27,7 +27,7 @@
#include "dialog/actionsearch/actionsearch.h"
#include "widget/menu/menu.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class MainWindow;
@@ -272,6 +272,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // MAINMENU_H
+2 -2
View File
@@ -22,7 +22,7 @@
#include <QCoreApplication>
OLIVE_NAMESPACE_ENTER
namespace olive {
MainStatusBar::MainStatusBar(QWidget *parent) :
QStatusBar(parent),
@@ -104,4 +104,4 @@ void MainStatusBar::mouseDoubleClickEvent(QMouseEvent* e)
emit DoubleClicked();
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -26,7 +26,7 @@
#include "task/taskmanager.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief Shows abbreviated information from a TaskManager object
@@ -61,6 +61,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // MAINSTATUSBAR_H
+2 -2
View File
@@ -32,7 +32,7 @@
#include "mainmenu.h"
#include "mainstatusbar.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent)
@@ -697,4 +697,4 @@ T *MainWindow::AppendFloatingPanelInternal(QList<T *> &list)
return panel;
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -44,7 +44,7 @@
#include <shobjidl.h>
#endif
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief Olive's main window responsible for docking widgets and the main menu bar.
@@ -175,6 +175,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif
@@ -1,6 +1,6 @@
#include "mainwindowlayoutinfo.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
void MainWindowLayoutInfo::toXml(QXmlStreamWriter *writer) const
{
@@ -101,4 +101,4 @@ void MainWindowLayoutInfo::set_state(const QByteArray &layout)
state_ = layout;
}
OLIVE_NAMESPACE_EXIT
}
+3 -3
View File
@@ -4,7 +4,7 @@
#include "project/item/folder/folder.h"
#include "project/item/sequence/sequence.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class MainWindowLayoutInfo
{
@@ -50,8 +50,8 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
Q_DECLARE_METATYPE(OLIVE_NAMESPACE::MainWindowLayoutInfo)
Q_DECLARE_METATYPE(olive::MainWindowLayoutInfo)
#endif // MAINWINDOWLAYOUTINFO_H