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
@@ -25,7 +25,7 @@
#include "node/output/track/track.h"
#include "transition/transition.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
Block::Block() :
previous_(nullptr),
@@ -375,4 +375,4 @@ void Block::Hash(QCryptographicHash &, const rational &) const
// A block does nothing by default, so we hash nothing
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -24,7 +24,7 @@
#include "node/node.h"
#include "timeline/timelinecommon.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A Node that represents a block of time, also displayable on a Timeline
@@ -137,6 +137,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // BLOCK_H
+2 -2
View File
@@ -20,7 +20,7 @@
#include "clip.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ClipBlock::ClipBlock()
{
@@ -120,4 +120,4 @@ void ClipBlock::Hash(QCryptographicHash &hash, const rational &time) const
}
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -23,7 +23,7 @@
#include "node/block/block.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief Node that represents a block of Media
@@ -61,6 +61,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // TIMELINEBLOCK_H
+2 -2
View File
@@ -20,7 +20,7 @@
#include "gap.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
GapBlock::GapBlock()
{
@@ -51,4 +51,4 @@ QString GapBlock::Description() const
return tr("A time-based node that represents an empty space.");
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -23,7 +23,7 @@
#include "node/block/block.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief Node that represents nothing in its respective track for a certain period of time
@@ -46,6 +46,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // TIMELINEBLOCK_H
@@ -20,7 +20,7 @@
#include "crossdissolvetransition.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
CrossDissolveTransition::CrossDissolveTransition()
{
@@ -86,4 +86,4 @@ void CrossDissolveTransition::SampleJobEvent(SampleBufferPtr from_samples, Sampl
}
}
OLIVE_NAMESPACE_EXIT
}
@@ -23,7 +23,7 @@
#include "node/block/transition/transition.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class CrossDissolveTransition : public TransitionBlock
{
@@ -47,6 +47,6 @@ protected:
};
OLIVE_NAMESPACE_EXIT
}
#endif // CROSSDISSOLVETRANSITION_H
@@ -20,7 +20,7 @@
#include "diptocolortransition.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
DipToColorTransition::DipToColorTransition()
{
@@ -65,4 +65,4 @@ void DipToColorTransition::ShaderJobEvent(NodeValueDatabase &value, ShaderJob &j
job.InsertValue(color_input_, value);
}
OLIVE_NAMESPACE_EXIT
}
@@ -23,7 +23,7 @@
#include "node/block/transition/transition.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class DipToColorTransition : public TransitionBlock
{
@@ -48,6 +48,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // DIPTOCOLORTRANSITION_H
+2 -2
View File
@@ -22,7 +22,7 @@
#include "common/clamp.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
TransitionBlock::TransitionBlock() :
connected_out_block_(nullptr),
@@ -319,4 +319,4 @@ double TransitionBlock::TransformCurve(double linear) const
return linear;
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -23,7 +23,7 @@
#include "node/block/block.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class TransitionBlock : public Block
{
@@ -91,6 +91,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // TRANSITIONBLOCK_H