oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use hardcoded namespace

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
app/common/autoscroll.h
+2 -2
View File
@@ -23,7 +23,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class AutoScroll {
public:
@@ -34,6 +34,6 @@ public:
};
};
OLIVE_NAMESPACE_EXIT
}
#endif // AUTOSCROLL_H
app/common/bezier.cpp
+2 -2
View File
@@ -22,7 +22,7 @@
#include <QtMath>
OLIVE_NAMESPACE_ENTER
namespace olive {
double Bezier::QuadraticXtoT(double x, double a, double b, double c)
{
@@ -63,4 +63,4 @@ double Bezier::CubicTtoY(double a, double b, double c, double d, double t)
return qPow(1.0 - t, 3)*a + 3*qPow(1.0 - t, 2)*t*b + 3*(1.0 - t)*qPow(t, 2)*c + qPow(t, 3)*d;
}
OLIVE_NAMESPACE_EXIT
}
app/common/bezier.h
+2 -2
View File
@@ -23,7 +23,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class Bezier
{
@@ -37,6 +37,6 @@ public:
static double CubicTtoY(double a, double b, double c, double d, double t);
};
OLIVE_NAMESPACE_EXIT
}
#endif // BEZIER_H
app/common/cancelableobject.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class CancelableObject {
public:
@@ -53,6 +53,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // CANCELABLEOBJECT_H
app/common/crashpadinterface.cpp
+2 -2
View File
@@ -40,7 +40,7 @@ crashpad::CrashpadClient *client;
QString GenerateReportPath()
{
return QDir(OLIVE_NAMESPACE::FileFunctions::GetTempFilePath()).filePath(QStringLiteral("reports"));
return QDir(olive::FileFunctions::GetTempFilePath()).filePath(QStringLiteral("reports"));
}
base::FilePath GenerateReportPathForCrashpad()
@@ -90,7 +90,7 @@ bool InitializeCrashpad()
base::FilePath reports_dir = GenerateReportPathForCrashpad();
base::FilePath metrics_dir(QSTRING_TO_BASE_STRING(QDir(OLIVE_NAMESPACE::FileFunctions::GetTempFilePath()).filePath(QStringLiteral("metrics"))));
base::FilePath metrics_dir(QSTRING_TO_BASE_STRING(QDir(olive::FileFunctions::GetTempFilePath()).filePath(QStringLiteral("metrics"))));
// Metadata that will be posted to the server with the crash report map
std::map<std::string, std::string> annotations;
app/common/debug.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "debug.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
void DebugHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{
@@ -54,4 +54,4 @@ void DebugHandler(QtMsgType type, const QMessageLogContext &context, const QStri
#endif
}
OLIVE_NAMESPACE_EXIT
}
app/common/debug.h
+2 -2
View File
@@ -25,10 +25,10 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
void DebugHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg);
OLIVE_NAMESPACE_EXIT
}
#endif // DEBUG_H
app/common/define.h
+5 -11
View File
@@ -21,13 +21,7 @@
#ifndef OLIVECOMMONDEFINE_H
#define OLIVECOMMONDEFINE_H
#define OLIVE_NAMESPACE olive
#define OLIVE_NAMESPACE_ENTER namespace OLIVE_NAMESPACE {
#define OLIVE_NAMESPACE_EXIT }
OLIVE_NAMESPACE_ENTER
namespace olive {
/// The minimum size an icon in ProjectExplorer can be
const int kProjectIconSizeMinimum = 16;
@@ -40,14 +34,14 @@ const int kProjectIconSizeDefault = 64;
const int kBytesInGigabyte = 1073741824;
OLIVE_NAMESPACE_EXIT
}
#define MACRO_NAME_AS_STR(s) #s
#define MACRO_VAL_AS_STR(s) MACRO_NAME_AS_STR(s)
#define OLIVE_NS_CONST_ARG(x, y) QArgument<const OLIVE_NAMESPACE::x>("const " MACRO_VAL_AS_STR(OLIVE_NAMESPACE) "::" #x, y)
#define OLIVE_NS_ARG(x, y) QArgument<OLIVE_NAMESPACE::x>(MACRO_VAL_AS_STR(OLIVE_NAMESPACE) "::" #x, y)
#define OLIVE_NS_RETURN_ARG(x, y) QReturnArgument<OLIVE_NAMESPACE::x>(MACRO_VAL_AS_STR(OLIVE_NAMESPACE) "::" #x, y)
#define OLIVE_NS_CONST_ARG(x, y) QArgument<const olive::x>("const " MACRO_VAL_AS_STR(olive) "::" #x, y)
#define OLIVE_NS_ARG(x, y) QArgument<olive::x>(MACRO_VAL_AS_STR(olive) "::" #x, y)
#define OLIVE_NS_RETURN_ARG(x, y) QReturnArgument<olive::x>(MACRO_VAL_AS_STR(olive) "::" #x, y)
/**
* Copy/move deleters. Similar to Q_DISABLE_COPY_MOVE, et al. but those functions are not present in Qt < 5.13 so we
app/common/ffmpegutils.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "common/ffmpegutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
AVPixelFormat FFmpegUtils::GetCompatiblePixelFormat(const AVPixelFormat &pix_fmt)
{
@@ -138,4 +138,4 @@ VideoParams::Format FFmpegUtils::GetCompatiblePixelFormat(const VideoParams::For
return VideoParams::kFormatInvalid;
}
OLIVE_NAMESPACE_EXIT
}
app/common/ffmpegutils.h
+2 -2
View File
@@ -28,7 +28,7 @@ extern "C" {
#include "render/audioparams.h"
#include "render/videoparams.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class FFmpegUtils {
public:
@@ -58,6 +58,6 @@ public:
static AVSampleFormat GetFFmpegSampleFormat(const AudioParams::Format &smp_fmt);
};
OLIVE_NAMESPACE_EXIT
}
#endif // FFMPEGABSTRACTION_H
app/common/filefunctions.cpp
+2 -2
View File
@@ -29,7 +29,7 @@
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
QString FileFunctions::GetUniqueFileIdentifier(const QString &filename)
{
@@ -240,4 +240,4 @@ bool FileFunctions::RenameFileAllowOverwrite(const QString &from, const QString
return true;
}
OLIVE_NAMESPACE_EXIT
}
app/common/filefunctions.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A collection of static file and directory functions
@@ -88,6 +88,6 @@ public:
OLIVE_NAMESPACE_EXIT
}
#endif // FILEFUNCTIONS_H
app/common/flipmodifiers.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "flipmodifiers.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
Qt::KeyboardModifiers FlipControlAndShiftModifiers(Qt::KeyboardModifiers e) {
if (e & Qt::ControlModifier & Qt::ShiftModifier) {
@@ -38,4 +38,4 @@ Qt::KeyboardModifiers FlipControlAndShiftModifiers(Qt::KeyboardModifiers e) {
return e;
}
OLIVE_NAMESPACE_EXIT
}
app/common/flipmodifiers.h
+2 -2
View File
@@ -25,10 +25,10 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
Qt::KeyboardModifiers FlipControlAndShiftModifiers(Qt::KeyboardModifiers e);
OLIVE_NAMESPACE_EXIT
}
#endif // FLIPMODIFIERS_H
app/common/memorypool.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
#include "memorypool.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
size_t memory_pool_consumption = 0;
QMutex memory_pool_consumption_lock;
@@ -11,4 +11,4 @@ bool MemoryPoolLimitReached()
return (memory_pool_consumption >= 2147483648);
}
OLIVE_NAMESPACE_EXIT
}
app/common/memorypool.h
+2 -2
View File
@@ -30,7 +30,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
extern size_t memory_pool_consumption;
extern QMutex memory_pool_consumption_lock;
@@ -397,6 +397,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // MEMORYPOOL_H
app/common/ocioutils.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "ocioutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
OCIO::BitDepth OCIOUtils::GetOCIOBitDepthFromPixelFormat(VideoParams::Format format)
{
@@ -44,4 +44,4 @@ OCIO::BitDepth OCIOUtils::GetOCIOBitDepthFromPixelFormat(VideoParams::Format for
return OCIO::BIT_DEPTH_UNKNOWN;
}
OLIVE_NAMESPACE_EXIT
}
app/common/ocioutils.h
+2 -2
View File
@@ -26,7 +26,7 @@ namespace OCIO = OpenColorIO_v2_0dev;
#include "render/videoparams.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class OCIOUtils
{
@@ -34,6 +34,6 @@ public:
static OCIO::BitDepth GetOCIOBitDepthFromPixelFormat(VideoParams::Format format);
};
OLIVE_NAMESPACE_EXIT
}
#endif // OCIOUTILS_H
app/common/oiioutils.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "oiioutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
void OIIOUtils::FrameToBuffer(const Frame* frame, OIIO::ImageBuf *buf)
{
@@ -117,4 +117,4 @@ VideoParams::Format OIIOUtils::GetFormatFromOIIOBasetype(OIIO::TypeDesc::BASETYP
return VideoParams::kFormatInvalid;
}
OLIVE_NAMESPACE_EXIT
}
app/common/oiioutils.h
+2 -2
View File
@@ -27,7 +27,7 @@
#include "codec/frame.h"
#include "render/videoparams.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class OIIOUtils {
public:
@@ -60,6 +60,6 @@ public:
};
OLIVE_NAMESPACE_EXIT
}
#endif // OIIOUTILS_H
app/common/power.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
uint32_t ceil_to_power_of_2(uint32_t v)
{
@@ -51,6 +51,6 @@ uint32_t floor_to_power_of_2(uint32_t x)
return x - (x >> 1);
}
OLIVE_NAMESPACE_EXIT
}
#endif // POWER_H
app/common/qtutils.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "qtutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
int QtUtils::QFontMetricsWidth(QFontMetrics fm, const QString& s) {
#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
@@ -38,4 +38,4 @@ QFrame *QtUtils::CreateHorizontalLine()
return horizontal_line;
}
OLIVE_NAMESPACE_EXIT
}
app/common/qtutils.h
+2 -2
View File
@@ -32,7 +32,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class QtUtils {
public:
@@ -49,6 +49,6 @@ public:
};
OLIVE_NAMESPACE_EXIT
}
#endif // QTVERSIONABSTRACTION_H
app/common/ratiodialog.cpp
+2 -2
View File
@@ -23,7 +23,7 @@
#include <QCoreApplication>
#include <QMessageBox>
OLIVE_NAMESPACE_ENTER
namespace olive {
double GetFloatRatioFromUser(QWidget* parent,
const QString& title,
@@ -88,4 +88,4 @@ double GetFloatRatioFromUser(QWidget* parent,
}
}
OLIVE_NAMESPACE_EXIT
}
app/common/ratiodialog.h
+2 -2
View File
@@ -25,12 +25,12 @@
#include "common/rational.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
double GetFloatRatioFromUser(QWidget* parent,
const QString& title,
bool* ok_in);
OLIVE_NAMESPACE_EXIT
}
#endif // RATIODIALOG_H
app/common/rational.cpp
+3 -3
View File
@@ -3,7 +3,7 @@
#include "rational.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
rational rational::fromDouble(const double &flt)
{
@@ -391,9 +391,9 @@ uint qHash(const rational &r, uint seed)
return ::qHash(r.toDouble(), seed);
}
OLIVE_NAMESPACE_EXIT
}
QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::rational &r)
QDebug operator<<(QDebug debug, const olive::rational &r)
{
return debug.space() << r.toDouble();
/*
app/common/rational.h
+4 -4
View File
@@ -20,7 +20,7 @@ extern "C" {
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
typedef int64_t intType;
/*
@@ -140,10 +140,10 @@ private:
uint qHash(const rational& r, uint seed);
OLIVE_NAMESPACE_EXIT
}
QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::rational& r);
QDebug operator<<(QDebug debug, const olive::rational& r);
Q_DECLARE_METATYPE(OLIVE_NAMESPACE::rational)
Q_DECLARE_METATYPE(olive::rational)
#endif // RATIONAL_H
app/common/threadedobject.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "threadedobject.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
void ThreadedObject::LockDeletes()
{
@@ -54,4 +54,4 @@ bool ThreadedObject::TryLockMutex(int timeout)
return threadobj_main_lock_.tryLock(timeout);
}
OLIVE_NAMESPACE_EXIT
}
app/common/threadedobject.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ThreadedObject
{
@@ -45,6 +45,6 @@ private:
QAtomicInt threadobj_delete_lock_;
};
OLIVE_NAMESPACE_EXIT
}
#endif // THREADEDOBJECT_H
app/common/timecodefunctions.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
QString padded(int64_t arg, int padding) {
return QStringLiteral("%1").arg(arg, padding, 10, QChar('0'));
@@ -289,4 +289,4 @@ int64_t Timecode::rescale_timestamp_ceil(const int64_t &ts, const rational &sour
return qCeil(static_cast<double>(ts) * source.toDouble() / dest.toDouble());
}
OLIVE_NAMESPACE_EXIT
}
app/common/timecodefunctions.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "common/rational.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief Functions for converting times/timecodes/timestamps
@@ -72,6 +72,6 @@ public:
};
OLIVE_NAMESPACE_EXIT
}
#endif // TIMECODEFUNCTIONS_H
app/common/timerange.cpp
+3 -3
View File
@@ -23,7 +23,7 @@
#include <QtMath>
#include <utility>
OLIVE_NAMESPACE_ENTER
namespace olive {
TimeRange::TimeRange(const rational &in, const rational &out) :
in_(in),
@@ -296,9 +296,9 @@ uint qHash(const TimeRange &r, uint seed)
return qHash(r.in(), seed) ^ qHash(r.out(), seed);
}
OLIVE_NAMESPACE_EXIT
}
QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::TimeRange &r)
QDebug operator<<(QDebug debug, const olive::TimeRange &r)
{
debug.nospace() << r.in().toDouble() << " - " << r.out().toDouble();
return debug.space();
app/common/timerange.h
+5 -5
View File
@@ -23,7 +23,7 @@
#include "rational.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class TimeRange {
public:
@@ -139,11 +139,11 @@ private:
uint qHash(const TimeRange& r, uint seed);
OLIVE_NAMESPACE_EXIT
}
QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::TimeRange& r);
QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::TimeRangeList& r);
QDebug operator<<(QDebug debug, const olive::TimeRange& r);
QDebug operator<<(QDebug debug, const olive::TimeRangeList& r);
Q_DECLARE_METATYPE(OLIVE_NAMESPACE::TimeRange)
Q_DECLARE_METATYPE(olive::TimeRange)
#endif // TIMERANGE_H
app/common/tohex.h
+2 -2
View File
@@ -5,12 +5,12 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
inline QString ToHex(quint64 t) {
return QStringLiteral("%1").arg(t, 0, 16);
}
OLIVE_NAMESPACE_EXIT
}
#endif // TOHEX_H
app/common/xmlutils.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "node/factory.h"
#include "widget/nodeview/nodeviewundo.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
void XMLConnectNodes(const XMLNodeData &xml_node_data, QUndoCommand *command)
{
@@ -64,4 +64,4 @@ void XMLLinkBlocks(const XMLNodeData &xml_node_data)
}
}
OLIVE_NAMESPACE_EXIT
}
app/common/xmlutils.h
+2 -2
View File
@@ -26,7 +26,7 @@
#include "project/item/footage/stream.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class Block;
class Node;
@@ -71,6 +71,6 @@ bool XMLReadNextStartElement(QXmlStreamReader* reader);
void XMLLinkBlocks(const XMLNodeData& xml_node_data);
OLIVE_NAMESPACE_EXIT
}
#endif // XMLREADLOOP_H