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:
@@ -20,7 +20,7 @@
|
||||
|
||||
#include "threadpool.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
namespace olive {
|
||||
|
||||
ThreadPool::ThreadPool(QThread::Priority priority, int threads, QObject *parent) :
|
||||
QObject(parent)
|
||||
@@ -135,4 +135,4 @@ void ThreadPoolThread::CancelEvent()
|
||||
wait_cond_.wakeAll();
|
||||
}
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include "common/cancelableobject.h"
|
||||
#include "threading/threadticket.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
namespace olive {
|
||||
|
||||
class ThreadPoolThread;
|
||||
|
||||
@@ -43,7 +43,7 @@ public:
|
||||
virtual void RunTicket(RenderTicketPtr ticket) const = 0;
|
||||
|
||||
public slots:
|
||||
void AddTicket(OLIVE_NAMESPACE::RenderTicketPtr ticket, bool prioritize = false);
|
||||
void AddTicket(olive::RenderTicketPtr ticket, bool prioritize = false);
|
||||
|
||||
private:
|
||||
void RunNext();
|
||||
@@ -88,6 +88,6 @@ private:
|
||||
|
||||
};
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
}
|
||||
|
||||
#endif // THREADPOOL_H
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include "threadticket.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
namespace olive {
|
||||
|
||||
RenderTicket::RenderTicket() :
|
||||
started_(false),
|
||||
@@ -121,4 +121,4 @@ void RenderTicket::Cancel()
|
||||
}
|
||||
}
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "common/timerange.h"
|
||||
#include "node/output/viewer/viewer.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
namespace olive {
|
||||
|
||||
class RenderTicket : public QObject
|
||||
{
|
||||
@@ -89,8 +89,8 @@ private:
|
||||
|
||||
using RenderTicketPtr = std::shared_ptr<RenderTicket>;
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
}
|
||||
|
||||
Q_DECLARE_METATYPE(OLIVE_NAMESPACE::RenderTicketPtr)
|
||||
Q_DECLARE_METATYPE(olive::RenderTicketPtr)
|
||||
|
||||
#endif // RENDERTICKET_H
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include "threadticketwatcher.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
namespace olive {
|
||||
|
||||
RenderTicketWatcher::RenderTicketWatcher(QObject *parent) :
|
||||
QObject(parent),
|
||||
@@ -98,4 +98,4 @@ void RenderTicketWatcher::TicketFinished()
|
||||
emit Finished(this);
|
||||
}
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
#include "threadticket.h"
|
||||
|
||||
OLIVE_NAMESPACE_ENTER
|
||||
namespace olive {
|
||||
|
||||
class RenderTicketWatcher : public QObject
|
||||
{
|
||||
@@ -58,6 +58,6 @@ private:
|
||||
|
||||
};
|
||||
|
||||
OLIVE_NAMESPACE_EXIT
|
||||
}
|
||||
|
||||
#endif // RENDERTICKETWATCHER_H
|
||||
|
||||
Reference in New Issue
Block a user