summaryrefslogtreecommitdiffstats
path: root/src/plugins/android/src/common
diff options
context:
space:
mode:
authorKevin Funk <kevin.funk@kdab.com>2017-09-20 20:57:43 +0200
committerKevin Funk <kevin.funk@kdab.com>2017-09-22 14:31:24 +0000
commitc4274f6e98e29c1399120bdd8db86770d6bba104 (patch)
tree9c3e905386cd9bf6b01e32cc1835d7263eb9070d /src/plugins/android/src/common
parentbb6166a5eca14550584bfc4ab4cb4130872df3ad (diff)
Replace Q_DECL_OVERRIDE with override
Change-Id: I17b3650a3df5688274151c1f2c4629e4a5062028 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/android/src/common')
-rw-r--r--src/plugins/android/src/common/qandroidvideooutput.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/android/src/common/qandroidvideooutput.h b/src/plugins/android/src/common/qandroidvideooutput.h
index 936e4c40b..62a936881 100644
--- a/src/plugins/android/src/common/qandroidvideooutput.h
+++ b/src/plugins/android/src/common/qandroidvideooutput.h
@@ -93,19 +93,19 @@ class QAndroidTextureVideoOutput : public QAndroidVideoOutput
Q_OBJECT
public:
explicit QAndroidTextureVideoOutput(QObject *parent = 0);
- ~QAndroidTextureVideoOutput() Q_DECL_OVERRIDE;
+ ~QAndroidTextureVideoOutput() override;
QAbstractVideoSurface *surface() const;
void setSurface(QAbstractVideoSurface *surface);
- AndroidSurfaceTexture *surfaceTexture() Q_DECL_OVERRIDE;
+ AndroidSurfaceTexture *surfaceTexture() override;
- bool isReady() Q_DECL_OVERRIDE;
- void setVideoSize(const QSize &) Q_DECL_OVERRIDE;
- void stop() Q_DECL_OVERRIDE;
- void reset() Q_DECL_OVERRIDE;
+ bool isReady() override;
+ void setVideoSize(const QSize &) override;
+ void stop() override;
+ void reset() override;
- void customEvent(QEvent *) Q_DECL_OVERRIDE;
+ void customEvent(QEvent *) override;
private Q_SLOTS:
void onFrameAvailable();