Replace Q_DECL_OVERRIDE with override

Change-Id: I1b8b338a6bc2f3c87af62c20ff1428096b309628
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

10 files changed, 59 insertions, 59 deletions

diff --git a/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.h b/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.h
index ed9c5a048..25caf5960 100644
--- a/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.h
+++ b/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.h
@@ -46,14 +46,14 @@ class QAxWidgetExtraInfo: public QObject, public QDesignerExtraInfoExtension
 public:
     QAxWidgetExtraInfo(QDesignerAxWidget *widget, QDesignerFormEditorInterface *core, QObject *parent);
 
-    QWidget *widget() const Q_DECL_OVERRIDE;
-    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
+    QWidget *widget() const override;
+    QDesignerFormEditorInterface *core() const override;
 
-    bool saveUiExtraInfo(DomUI *ui) Q_DECL_OVERRIDE;
-    bool loadUiExtraInfo(DomUI *ui) Q_DECL_OVERRIDE;
+    bool saveUiExtraInfo(DomUI *ui) override;
+    bool loadUiExtraInfo(DomUI *ui) override;
 
-    bool saveWidgetExtraInfo(DomWidget *ui_widget) Q_DECL_OVERRIDE;
-    bool loadWidgetExtraInfo(DomWidget *ui_widget) Q_DECL_OVERRIDE;
+    bool saveWidgetExtraInfo(DomWidget *ui_widget) override;
+    bool loadWidgetExtraInfo(DomWidget *ui_widget) override;
 
 private:
     QPointer<QDesignerAxWidget> m_widget;
@@ -67,7 +67,7 @@ public:
     explicit QAxWidgetExtraInfoFactory(QDesignerFormEditorInterface *core, QExtensionManager *parent = 0);
 
 protected:
-    QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const Q_DECL_OVERRIDE;
+    QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const override;
 
 private:
     QDesignerFormEditorInterface *m_core;
diff --git a/src/designer/src/plugins/activeqt/qaxwidgetplugin.h b/src/designer/src/plugins/activeqt/qaxwidgetplugin.h
index d5100c4bb..d5e8aead2 100644
--- a/src/designer/src/plugins/activeqt/qaxwidgetplugin.h
+++ b/src/designer/src/plugins/activeqt/qaxwidgetplugin.h
@@ -44,17 +44,17 @@ class QAxWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
 public:
     explicit QAxWidgetPlugin(QObject *parent = 0);
 
-    QString name() const Q_DECL_OVERRIDE;
-    QString group() const Q_DECL_OVERRIDE;
-    QString toolTip() const Q_DECL_OVERRIDE;
-    QString whatsThis() const Q_DECL_OVERRIDE;
-    QString includeFile() const Q_DECL_OVERRIDE;
-    QIcon icon() const Q_DECL_OVERRIDE;
-    bool isContainer() const Q_DECL_OVERRIDE;
-    QWidget *createWidget(QWidget *parent) Q_DECL_OVERRIDE;
-    bool isInitialized() const Q_DECL_OVERRIDE;
-    void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE;
-    QString domXml() const Q_DECL_OVERRIDE;
+    QString name() const override;
+    QString group() const override;
+    QString toolTip() const override;
+    QString whatsThis() const override;
+    QString includeFile() const override;
+    QIcon icon() const override;
+    bool isContainer() const override;
+    QWidget *createWidget(QWidget *parent) override;
+    bool isInitialized() const override;
+    void initialize(QDesignerFormEditorInterface *core) override;
+    QString domXml() const override;
 
 private:
     QDesignerFormEditorInterface *m_core;
diff --git a/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h b/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h
index b39ce5d5b..93ff577aa 100644
--- a/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h
+++ b/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h
@@ -52,12 +52,12 @@ class QAxWidgetPropertySheet: public QDesignerPropertySheet
 public:
     explicit QAxWidgetPropertySheet(QDesignerAxWidget *object, QObject *parent = 0);
 
-    bool isEnabled(int index) const Q_DECL_OVERRIDE;
-    QVariant property(int index) const Q_DECL_OVERRIDE;
-    void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE;
-    bool reset(int index) Q_DECL_OVERRIDE;
-    int indexOf(const QString &name) const Q_DECL_OVERRIDE;
-    bool dynamicPropertiesAllowed() const Q_DECL_OVERRIDE;
+    bool isEnabled(int index) const override;
+    QVariant property(int index) const override;
+    void setProperty(int index, const QVariant &value) override;
+    bool reset(int index) override;
+    int indexOf(const QString &name) const override;
+    bool dynamicPropertiesAllowed() const override;
 
     static const char *controlPropertyName;
 
diff --git a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h
index 350fe39f7..e986c809e 100644
--- a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h
+++ b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h
@@ -43,7 +43,7 @@ class QAxWidgetTaskMenu: public QObject, public QDesignerTaskMenuExtension
 public:
     explicit QAxWidgetTaskMenu(QDesignerAxWidget *object, QObject *parent = 0);
     virtual ~QAxWidgetTaskMenu();
-    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
+    QList<QAction*> taskActions() const override;
 
 private slots:
     void setActiveXControl();
diff --git a/src/designer/src/plugins/activeqt/qdesigneraxwidget.h b/src/designer/src/plugins/activeqt/qdesigneraxwidget.h
index 8bbabeb53..8458b4a08 100644
--- a/src/designer/src/plugins/activeqt/qdesigneraxwidget.h
+++ b/src/designer/src/plugins/activeqt/qdesigneraxwidget.h
@@ -97,8 +97,8 @@ public:
     explicit QDesignerAxPluginWidget(QWidget *parent);
     virtual ~QDesignerAxPluginWidget();
 
-    const QMetaObject *metaObject() const Q_DECL_OVERRIDE;
-    int qt_metacall(QMetaObject::Call, int, void **) Q_DECL_OVERRIDE;
+    const QMetaObject *metaObject() const override;
+    int qt_metacall(QMetaObject::Call, int, void **) override;
 
 private:
     QMap<int, bool> m_propValues;
diff --git a/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.h b/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.h
index 2553bec87..d0ab8e6b5 100644
--- a/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.h
+++ b/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.h
@@ -42,17 +42,17 @@ class QQuickWidgetPlugin: public QObject, public QDesignerCustomWidgetInterface
 public:
     explicit QQuickWidgetPlugin(QObject *parent = 0);
 
-    QString name() const Q_DECL_OVERRIDE;
-    QString group() const Q_DECL_OVERRIDE;
-    QString toolTip() const Q_DECL_OVERRIDE;
-    QString whatsThis() const Q_DECL_OVERRIDE;
-    QString includeFile() const Q_DECL_OVERRIDE;
-    QIcon icon() const Q_DECL_OVERRIDE;
-    bool isContainer() const Q_DECL_OVERRIDE;
-    QWidget *createWidget(QWidget *parent) Q_DECL_OVERRIDE;
-    bool isInitialized() const Q_DECL_OVERRIDE;
-    void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE;
-    QString domXml() const Q_DECL_OVERRIDE;
+    QString name() const override;
+    QString group() const override;
+    QString toolTip() const override;
+    QString whatsThis() const override;
+    QString includeFile() const override;
+    QIcon icon() const override;
+    bool isContainer() const override;
+    QWidget *createWidget(QWidget *parent) override;
+    bool isInitialized() const override;
+    void initialize(QDesignerFormEditorInterface *core) override;
+    QString domXml() const override;
 
 private slots:
     void sceneGraphError(QQuickWindow::SceneGraphError, const QString &);
diff --git a/src/designer/src/plugins/qwebview/qwebview_plugin.h b/src/designer/src/plugins/qwebview/qwebview_plugin.h
index f555bef08..657a7b7a9 100644
--- a/src/designer/src/plugins/qwebview/qwebview_plugin.h
+++ b/src/designer/src/plugins/qwebview/qwebview_plugin.h
@@ -41,17 +41,17 @@ class QWebViewPlugin: public QObject, public QDesignerCustomWidgetInterface
 public:
     QWebViewPlugin(QObject *parent = 0);
 
-    QString name() const Q_DECL_OVERRIDE;
-    QString group() const Q_DECL_OVERRIDE;
-    QString toolTip() const Q_DECL_OVERRIDE;
-    QString whatsThis() const Q_DECL_OVERRIDE;
-    QString includeFile() const Q_DECL_OVERRIDE;
-    QIcon icon() const Q_DECL_OVERRIDE;
-    bool isContainer() const Q_DECL_OVERRIDE;
-    QWidget *createWidget(QWidget *parent) Q_DECL_OVERRIDE;
-    bool isInitialized() const Q_DECL_OVERRIDE;
-    void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE;
-    QString domXml() const Q_DECL_OVERRIDE;
+    QString name() const override;
+    QString group() const override;
+    QString toolTip() const override;
+    QString whatsThis() const override;
+    QString includeFile() const override;
+    QIcon icon() const override;
+    bool isContainer() const override;
+    QWidget *createWidget(QWidget *parent) override;
+    bool isInitialized() const override;
+    void initialize(QDesignerFormEditorInterface *core) override;
+    QString domXml() const override;
 
 private:
     bool m_initialized;
diff --git a/src/designer/src/plugins/tools/view3d/view3d.cpp b/src/designer/src/plugins/tools/view3d/view3d.cpp
index ac478eb26..8c10a176b 100644
--- a/src/designer/src/plugins/tools/view3d/view3d.cpp
+++ b/src/designer/src/plugins/tools/view3d/view3d.cpp
@@ -52,7 +52,7 @@ class QView3DWidget : public QGLWidget
 public:
     QView3DWidget(QWidget *parent);
     virtual void initializeGL();
-    void resizeGL(int w, int h) Q_DECL_OVERRIDE;
+    void resizeGL(int w, int h) override;
     virtual void paintGL();
     void clear();
 
diff --git a/src/designer/src/plugins/tools/view3d/view3d_plugin.h b/src/designer/src/plugins/tools/view3d/view3d_plugin.h
index d85e4d41e..d01d855a3 100644
--- a/src/designer/src/plugins/tools/view3d/view3d_plugin.h
+++ b/src/designer/src/plugins/tools/view3d/view3d_plugin.h
@@ -50,10 +50,10 @@ class VIEW3D_EXPORT QView3DPlugin : public QObject, public QDesignerFormEditorPl
 
 public:
     QView3DPlugin();
-    bool isInitialized() const Q_DECL_OVERRIDE;
-    void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE;
-    QAction *action() const Q_DECL_OVERRIDE;
-    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
+    bool isInitialized() const override;
+    void initialize(QDesignerFormEditorInterface *core) override;
+    QAction *action() const override;
+    QDesignerFormEditorInterface *core() const override;
 
 public slots:
     void activeFormWindowChanged(QDesignerFormWindowInterface *formWindow);
diff --git a/src/designer/src/plugins/tools/view3d/view3d_tool.h b/src/designer/src/plugins/tools/view3d/view3d_tool.h
index fb8e8c538..1124c2a7c 100644
--- a/src/designer/src/plugins/tools/view3d/view3d_tool.h
+++ b/src/designer/src/plugins/tools/view3d/view3d_tool.h
@@ -43,16 +43,16 @@ class VIEW3D_EXPORT QView3DTool : public QDesignerFormWindowToolInterface
 
 public:
     explicit QView3DTool(QDesignerFormWindowInterface *formWindow, QObject *parent = 0);
-    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
-    QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE;
-    QWidget *editor() const Q_DECL_OVERRIDE;
+    QDesignerFormEditorInterface *core() const override;
+    QDesignerFormWindowInterface *formWindow() const override;
+    QWidget *editor() const override;
 
-    QAction *action() const Q_DECL_OVERRIDE;
+    QAction *action() const override;
 
     virtual void activated();
     virtual void deactivated();
 
-    bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event) Q_DECL_OVERRIDE;
+    bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event) override;
 
 private:
     QDesignerFormWindowInterface *m_formWindow;