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
@@ -20,7 +20,7 @@
#include "math.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
MathNode::MathNode()
{
@@ -119,4 +119,4 @@ void MathNode::ProcessSamples(NodeValueDatabase &values, const SampleBufferPtr i
return ProcessSamplesInternal(values, GetOperation(), param_a_in_, param_b_in_, input, output, index);
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -23,7 +23,7 @@
#include "mathbase.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class MathNode : public MathNodeBase
{
@@ -75,6 +75,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // MATHNODE_H
+2 -2
View File
@@ -26,7 +26,7 @@
#include "common/tohex.h"
#include "render/color.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ShaderCode MathNodeBase::GetShaderCodeInternal(const QString &shader_id, NodeInput *param_a_in, olive::NodeInput *param_b_in) const
{
@@ -611,4 +611,4 @@ T MathNodeBase::PerformAddSubMultDiv(Operation operation, T a, U b)
return a;
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -23,7 +23,7 @@
#include "node/node.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class MathNodeBase : public Node
{
@@ -119,6 +119,6 @@ protected:
};
OLIVE_NAMESPACE_EXIT
}
#endif // MATHNODEBASE_H
+2 -2
View File
@@ -20,7 +20,7 @@
#include "merge.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
MergeNode::MergeNode()
{
@@ -117,4 +117,4 @@ void MergeNode::Hash(QCryptographicHash &hash, const rational &time) const
}
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -23,7 +23,7 @@
#include "node/node.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class MergeNode : public Node
{
@@ -55,6 +55,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // MERGENODE_H
+2 -2
View File
@@ -20,7 +20,7 @@
#include "trigonometry.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
TrigonometryNode::TrigonometryNode()
{
@@ -118,4 +118,4 @@ NodeValueTable TrigonometryNode::Value(NodeValueDatabase &value) const
return table;
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -23,7 +23,7 @@
#include "node/node.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class TrigonometryNode : public Node
{
@@ -61,6 +61,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // TRIGNODE_H