diff options
author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2017-01-12 13:25:48 +0100 |
---|---|---|
committer | Johan Helsing <johan.helsing@qt.io> | 2017-01-23 16:20:03 +0000 |
commit | f72d63866d3f5820865fcd309b649dc9932518ee (patch) | |
tree | 675610cbbc8a88f0197c351e754e7892e4eb7871 /src/plugins/platforms | |
parent | 76b0fa5ca41df2528ba52fa7601c4bc89e60c03b (diff) | |
download | qtwayland-f72d63866d3f5820865fcd309b649dc9932518ee.tar.gz |
Replace all occurrences of Q_DECL_OVERRIDE with override
Change-Id: I16b7b23efe944b49d1fcc9e7588cdb0a991cebd1
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/plugins/platforms')
8 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/platforms/qwayland-brcm-egl/main.cpp b/src/plugins/platforms/qwayland-brcm-egl/main.cpp index d1b3c733..2640c8ea 100644 --- a/src/plugins/platforms/qwayland-brcm-egl/main.cpp +++ b/src/plugins/platforms/qwayland-brcm-egl/main.cpp @@ -49,7 +49,7 @@ class QWaylandBrcmEglPlatformIntegrationPlugin : public QPlatformIntegrationPlug Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-brcm-egl.json") public: - QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; + QPlatformIntegration *create(const QString&, const QStringList&) override; }; QPlatformIntegration *QWaylandBrcmEglPlatformIntegrationPlugin::create(const QString& system, const QStringList& paramList) diff --git a/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h b/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h index d496e5ad..03584673 100644 --- a/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h +++ b/src/plugins/platforms/qwayland-brcm-egl/qwaylandbrcmeglplatformintegration.h @@ -57,7 +57,7 @@ public: m_gl_integration->initialize(display()); } - QWaylandClientBufferIntegration *clientBufferIntegration() const Q_DECL_OVERRIDE + QWaylandClientBufferIntegration *clientBufferIntegration() const override { return m_gl_integration; } diff --git a/src/plugins/platforms/qwayland-egl/main.cpp b/src/plugins/platforms/qwayland-egl/main.cpp index d6999d4a..ebeeff39 100644 --- a/src/plugins/platforms/qwayland-egl/main.cpp +++ b/src/plugins/platforms/qwayland-egl/main.cpp @@ -49,7 +49,7 @@ class QWaylandEglPlatformIntegrationPlugin : public QPlatformIntegrationPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-egl.json") public: - QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; + QPlatformIntegration *create(const QString&, const QStringList&) override; }; QPlatformIntegration *QWaylandEglPlatformIntegrationPlugin::create(const QString& system, const QStringList& paramList) diff --git a/src/plugins/platforms/qwayland-generic/main.cpp b/src/plugins/platforms/qwayland-generic/main.cpp index 24ecf0ba..08295c97 100644 --- a/src/plugins/platforms/qwayland-generic/main.cpp +++ b/src/plugins/platforms/qwayland-generic/main.cpp @@ -49,7 +49,7 @@ class QWaylandIntegrationPlugin : public QPlatformIntegrationPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-generic.json") public: - QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; + QPlatformIntegration *create(const QString&, const QStringList&) override; }; QPlatformIntegration *QWaylandIntegrationPlugin::create(const QString& system, const QStringList& paramList) diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp b/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp index 321182ad..996f6084 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp +++ b/src/plugins/platforms/qwayland-xcomposite-egl/main.cpp @@ -49,7 +49,7 @@ class QWaylandXCompositeEglPlatformIntegrationPlugin : public QPlatformIntegrati Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-xcomposite-egl.json") public: - QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; + QPlatformIntegration *create(const QString&, const QStringList&) override; }; QPlatformIntegration *QWaylandXCompositeEglPlatformIntegrationPlugin::create(const QString& system, const QStringList& paramList) diff --git a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h index 5d766543..009a12f6 100644 --- a/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h +++ b/src/plugins/platforms/qwayland-xcomposite-egl/qwaylandxcompositeeglplatformintegration.h @@ -58,7 +58,7 @@ public: m_client_buffer_integration->initialize(display()); } - QWaylandClientBufferIntegration *clientBufferIntegration() const Q_DECL_OVERRIDE + QWaylandClientBufferIntegration *clientBufferIntegration() const override { return m_client_buffer_integration; } private: diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp index fdeda6e1..9f075ebb 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp +++ b/src/plugins/platforms/qwayland-xcomposite-glx/main.cpp @@ -51,7 +51,7 @@ class QWaylandXCompositeGlxPlatformIntegrationPlugin : public QPlatformIntegrati Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "qwayland-xcomposite-glx.json") public: - QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; + QPlatformIntegration *create(const QString&, const QStringList&) override; }; QPlatformIntegration *QWaylandXCompositeGlxPlatformIntegrationPlugin::create(const QString& system, const QStringList& paramList) diff --git a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h index ccc39553..a8a70bdd 100644 --- a/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h +++ b/src/plugins/platforms/qwayland-xcomposite-glx/qwaylandxcompositeglxplatformintegration.h @@ -59,7 +59,7 @@ public: m_client_buffer_integration->initialize(display()); } - QWaylandClientBufferIntegration *clientBufferIntegration() const Q_DECL_OVERRIDE + QWaylandClientBufferIntegration *clientBufferIntegration() const override { return m_client_buffer_integration; } private: |