reimplement Q_DISABLE_COPY_MOVE for full compatibility with versions < 5.13
I was under the impression Q_DISABLE_COPY_MOVE was a much older function than it is. Since we historically target 5.6 and these functions are small convenience functions, I just implemented them in the actual codebase.
This commit is contained in:
@@ -22,9 +22,9 @@
|
||||
#define DECODER_H
|
||||
|
||||
#include <QObject>
|
||||
#include <QtGlobal>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "common/constructors.h"
|
||||
#include "common/rational.h"
|
||||
#include "project/item/footage/footage.h"
|
||||
#include "decoder/frame.h"
|
||||
@@ -59,7 +59,7 @@ public:
|
||||
// Necessary for subclassing, it's empty
|
||||
virtual ~Decoder();
|
||||
|
||||
Q_DISABLE_COPY_MOVE(Decoder)
|
||||
DISABLE_COPY_MOVE(Decoder)
|
||||
|
||||
virtual QString id() = 0;
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#include <QFile>
|
||||
|
||||
#include "common/constructors.h"
|
||||
#include "render/audioparams.h"
|
||||
|
||||
class WaveInput
|
||||
@@ -12,7 +13,7 @@ public:
|
||||
|
||||
~WaveInput();
|
||||
|
||||
Q_DISABLE_COPY_MOVE(WaveInput)
|
||||
DISABLE_COPY_MOVE(WaveInput)
|
||||
|
||||
bool open();
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
#include <QFile>
|
||||
|
||||
#include "audio/sampleformat.h"
|
||||
#include "common/constructors.h"
|
||||
#include "render/audioparams.h"
|
||||
|
||||
class WaveOutput
|
||||
@@ -15,7 +16,7 @@ public:
|
||||
|
||||
~WaveOutput();
|
||||
|
||||
Q_DISABLE_COPY_MOVE(WaveOutput)
|
||||
DISABLE_COPY_MOVE(WaveOutput)
|
||||
|
||||
bool open();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user