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 <QAudio>
OLIVE_NAMESPACE_ENTER
namespace olive {
FloatSlider::FloatSlider(QWidget *parent) :
SliderBase(kFloat, parent),
@@ -184,4 +184,4 @@ void FloatSlider::ConvertValue(QVariant v)
emit ValueChanged(v.toDouble());
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -23,7 +23,7 @@
#include "sliderbase.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class FloatSlider : public SliderBase
{
@@ -73,6 +73,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // FLOATSLIDER_H
+2 -2
View File
@@ -20,7 +20,7 @@
#include "integerslider.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
IntegerSlider::IntegerSlider(QWidget* parent) :
SliderBase(kInteger, parent)
@@ -72,4 +72,4 @@ void IntegerSlider::ConvertValue(QVariant v)
emit ValueChanged(v.toInt());
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -23,7 +23,7 @@
#include "sliderbase.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class IntegerSlider : public SliderBase
{
@@ -49,6 +49,6 @@ private slots:
void ConvertValue(QVariant v);
};
OLIVE_NAMESPACE_EXIT
}
#endif // INTEGERSLIDER_H
+2 -2
View File
@@ -28,7 +28,7 @@
#include "core.h"
#include "window/mainwindow/mainwindow.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
SliderBase::SliderBase(Mode mode, QWidget *parent) :
QStackedWidget(parent),
@@ -395,4 +395,4 @@ void SliderBase::ResetValue()
}
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -27,7 +27,7 @@
#include "sliderladder.h"
#include "widget/focusablelineedit/focusablelineedit.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class SliderBase : public QStackedWidget
{
Q_OBJECT
@@ -141,6 +141,6 @@ private slots:
void ResetValue();
};
OLIVE_NAMESPACE_EXIT
}
#endif // SLIDERBASE_H
+2 -2
View File
@@ -24,7 +24,7 @@
#include <QMouseEvent>
#include <QDebug>
OLIVE_NAMESPACE_ENTER
namespace olive {
SliderLabel::SliderLabel(QWidget *parent) :
QLabel(parent)
@@ -69,4 +69,4 @@ void SliderLabel::focusInEvent(QFocusEvent *event)
}
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -25,7 +25,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class SliderLabel : public QLabel
{
@@ -47,6 +47,6 @@ signals:
};
OLIVE_NAMESPACE_EXIT
}
#endif // SLIDERLABEL_H
+2 -2
View File
@@ -33,7 +33,7 @@
#include "common/clamp.h"
#include "common/lerp.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
SliderLadder::SliderLadder(double drag_multiplier, int nb_outer_values, QWidget* parent) :
QFrame(parent, Qt::Popup),
@@ -241,4 +241,4 @@ void SliderLadderElement::UpdateLabel()
}
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -27,7 +27,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class SliderLadderElement : public QWidget
{
@@ -98,6 +98,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // SLIDERLADDER_H
+2 -2
View File
@@ -20,7 +20,7 @@
#include "stringslider.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
StringSlider::StringSlider(QWidget* parent) :
SliderBase(kString, parent)
@@ -49,4 +49,4 @@ void StringSlider::ConvertValue(QVariant v)
emit ValueChanged(v.toString());
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -23,7 +23,7 @@
#include "sliderbase.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class StringSlider : public SliderBase
{
@@ -47,6 +47,6 @@ private slots:
void ConvertValue(QVariant v);
};
OLIVE_NAMESPACE_EXIT
}
#endif // STRINGSLIDER_H
+2 -2
View File
@@ -23,7 +23,7 @@
#include "common/timecodefunctions.h"
#include "core.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
TimeSlider::TimeSlider(QWidget *parent) :
IntegerSlider(parent)
@@ -63,4 +63,4 @@ void TimeSlider::TimecodeDisplayChanged()
UpdateLabel(Value());
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -24,7 +24,7 @@
#include "common/rational.h"
#include "integerslider.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class TimeSlider : public IntegerSlider
{
@@ -47,6 +47,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // TIMESLIDER_H