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
@@ -22,7 +22,7 @@
#include <QAction>
OLIVE_NAMESPACE_ENTER
namespace olive {
KeySequenceEditor::KeySequenceEditor(QWidget* parent, QAction* a)
: QKeySequenceEdit(parent), action(a) {
@@ -49,4 +49,4 @@ QString KeySequenceEditor::export_shortcut() {
return nullptr;
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -25,7 +25,7 @@
#include "common/debug.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief The KeySequenceEditor class
@@ -101,6 +101,6 @@ private:
QAction* action;
};
OLIVE_NAMESPACE_EXIT
}
#endif // KEYSEQUENCEEDITOR_H
+2 -2
View File
@@ -33,7 +33,7 @@
#include "tabs/preferencesaudiotab.h"
#include "tabs/preferenceskeyboardtab.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
PreferencesDialog::PreferencesDialog(QWidget *parent, QMenuBar* main_menu_bar) :
QDialog(parent)
@@ -98,4 +98,4 @@ void PreferencesDialog::AddTab(PreferencesTab *tab, const QString &title)
tabs_.append(tab);
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -30,7 +30,7 @@
#include "tabs/preferencestab.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief The PreferencesDialog class
@@ -69,6 +69,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PREFERENCESDIALOG_H
@@ -29,7 +29,7 @@
#include "node/node.h"
#include "widget/colorbutton/colorbutton.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
PreferencesAppearanceTab::PreferencesAppearanceTab()
{
@@ -122,4 +122,4 @@ void PreferencesAppearanceTab::ColorButtonClicked()
}
}
OLIVE_NAMESPACE_EXIT
}
@@ -28,7 +28,7 @@
#include "preferencestab.h"
#include "ui/style/style.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class PreferencesAppearanceTab : public PreferencesTab
{
@@ -60,6 +60,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PREFERENCESAPPEARANCETAB_H
@@ -26,7 +26,7 @@
#include "audio/audiomanager.h"
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
PreferencesAudioTab::PreferencesAudioTab()
{
@@ -206,4 +206,4 @@ void PreferencesAudioTab::PopulateComboBox(QComboBox *cb, bool still_refreshing,
}
}
OLIVE_NAMESPACE_EXIT
}
@@ -27,7 +27,7 @@
#include "preferencestab.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class PreferencesAudioTab : public PreferencesTab
{
@@ -79,6 +79,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PREFERENCESAUDIOTAB_H
@@ -25,7 +25,7 @@
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
PreferencesBehaviorTab::PreferencesBehaviorTab()
{
@@ -156,4 +156,4 @@ QTreeWidgetItem *PreferencesBehaviorTab::AddParent(const QString &text, QTreeWid
return AddParent(text, QString(), parent);
}
OLIVE_NAMESPACE_EXIT
}
@@ -25,7 +25,7 @@
#include "preferencestab.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class PreferencesBehaviorTab : public PreferencesTab
{
@@ -48,6 +48,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PREFERENCESBEHAVIORTAB_H
@@ -29,7 +29,7 @@
#include "common/filefunctions.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
PreferencesDiskTab::PreferencesDiskTab()
{
@@ -117,4 +117,4 @@ void PreferencesDiskTab::Accept()
Config::Current()["DiskCacheAhead"] = QVariant::fromValue(rational::fromDouble(cache_ahead_slider_->GetValue()));
}
OLIVE_NAMESPACE_EXIT
}
@@ -30,7 +30,7 @@
#include "widget/slider/floatslider.h"
#include "widget/path/pathwidget.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class PreferencesDiskTab : public PreferencesTab
{
@@ -53,6 +53,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PREFERENCESDISKTAB_H
@@ -29,7 +29,7 @@
#include "dialog/sequence/sequence.h"
#include "project/item/sequence/sequence.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
PreferencesGeneralTab::PreferencesGeneralTab()
{
@@ -128,4 +128,4 @@ void PreferencesGeneralTab::AddLanguage(const QString &locale_name)
language_combobox_->setItemData(language_combobox_->count() - 1, locale_name);
}
OLIVE_NAMESPACE_EXIT
}
@@ -29,7 +29,7 @@
#include "project/item/sequence/sequence.h"
#include "widget/slider/floatslider.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class PreferencesGeneralTab : public PreferencesTab
{
@@ -52,6 +52,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PREFERENCESGENERALTAB_H
@@ -27,7 +27,7 @@
#include <QPushButton>
#include <QVBoxLayout>
OLIVE_NAMESPACE_ENTER
namespace olive {
PreferencesKeyboardTab::PreferencesKeyboardTab(QMenuBar *menubar)
{
@@ -239,4 +239,4 @@ void PreferencesKeyboardTab::save_shortcut_file() {
}
}
OLIVE_NAMESPACE_EXIT
}
@@ -27,7 +27,7 @@
#include "preferencestab.h"
#include "../keysequenceeditor.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class PreferencesKeyboardTab : public PreferencesTab
{
@@ -134,6 +134,6 @@ private:
QVector<KeySequenceEditor*> key_shortcut_fields_;
};
OLIVE_NAMESPACE_EXIT
}
#endif // PREFERENCESKEYBOARDTAB_H
@@ -20,11 +20,11 @@
#include "preferencestab.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
bool PreferencesTab::Validate()
{
return true;
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -25,7 +25,7 @@
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class PreferencesTab : public QWidget
{
@@ -37,6 +37,6 @@ public:
virtual void Accept() = 0;
};
OLIVE_NAMESPACE_EXIT
}
#endif // PREFERENCESTAB_H