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
@@ -34,7 +34,7 @@
#include "common/filefunctions.h"
#include "common/xmlutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class Preset
{
@@ -234,6 +234,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // PRESETMANAGER_H
+2 -2
View File
@@ -33,7 +33,7 @@
#include "common/rational.h"
#include "undo/undostack.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
SequenceDialog::SequenceDialog(Sequence* s, Type t, QWidget* parent) :
QDialog(parent),
@@ -171,4 +171,4 @@ void SequenceDialog::SequenceParamCommand::undo_internal()
sequence_->set_name(old_name_);
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -30,7 +30,7 @@
#include "sequencedialogpresettab.h"
#include "undo/undocommand.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A dialog for editing Sequence parameters
@@ -133,6 +133,6 @@ private:
};
};
OLIVE_NAMESPACE_EXIT
}
#endif // SEQUENCEDIALOG_H
@@ -7,7 +7,7 @@
#include "core.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
SequenceDialogParameterTab::SequenceDialogParameterTab(Sequence* sequence, QWidget* parent) :
QWidget(parent)
@@ -143,4 +143,4 @@ void SequenceDialogParameterTab::UpdatePreviewResolutionLabel()
QString::number(test_param.effective_height())));
}
OLIVE_NAMESPACE_EXIT
}
@@ -10,7 +10,7 @@
#include "widget/slider/integerslider.h"
#include "widget/standardcombos/standardcombos.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class SequenceDialogParameterTab : public QWidget
{
@@ -97,6 +97,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // SEQUENCEDIALOGPARAMETERTAB_H
@@ -36,7 +36,7 @@
#include "ui/icons/icons.h"
#include "widget/menu/menu.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
const int kDataIsPreset = Qt::UserRole;
const int kDataPresetIsCustomRole = Qt::UserRole + 1;
@@ -295,4 +295,4 @@ void SequenceDialogPresetTab::DeleteSelectedPreset()
}
}
OLIVE_NAMESPACE_EXIT
}
@@ -28,7 +28,7 @@
#include "presetmanager.h"
#include "sequencepreset.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class SequenceDialogPresetTab : public QWidget, public PresetManager<SequencePreset>
{
@@ -77,6 +77,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // SEQUENCEDIALOGPRESETTAB_H
+2 -2
View File
@@ -28,7 +28,7 @@
#include "dialog/sequence/presetmanager.h"
#include "render/videoparams.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class SequencePreset : public Preset {
public:
@@ -174,6 +174,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // SEQUENCEPARAM_H