Qt Designer: Introduce Q_DECL_OVERRIDE.

Replacement done by a script and verified with clang 3.5 to not cause
new warnings.

Change-Id: Ibaa1efe91cd65a6b54591a629b7335aebc0803bf
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>

9 files changed, 46 insertions, 46 deletions

diff --git a/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.h b/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.h
index 7dd456047..9fda8efc8 100644
--- a/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.h
+++ b/src/designer/src/plugins/activeqt/qaxwidgetextrainfo.h
@@ -51,14 +51,14 @@ class QAxWidgetExtraInfo: public QObject, public QDesignerExtraInfoExtension
 public:
     QAxWidgetExtraInfo(QDesignerAxWidget *widget, QDesignerFormEditorInterface *core, QObject *parent);
 
-    virtual QWidget *widget() const;
-    virtual QDesignerFormEditorInterface *core() const;
+    QWidget *widget() const Q_DECL_OVERRIDE;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
 
-    virtual bool saveUiExtraInfo(DomUI *ui);
-    virtual bool loadUiExtraInfo(DomUI *ui);
+    bool saveUiExtraInfo(DomUI *ui) Q_DECL_OVERRIDE;
+    bool loadUiExtraInfo(DomUI *ui) Q_DECL_OVERRIDE;
 
-    virtual bool saveWidgetExtraInfo(DomWidget *ui_widget);
-    virtual bool loadWidgetExtraInfo(DomWidget *ui_widget);
+    bool saveWidgetExtraInfo(DomWidget *ui_widget) Q_DECL_OVERRIDE;
+    bool loadWidgetExtraInfo(DomWidget *ui_widget) Q_DECL_OVERRIDE;
 
 private:
     QPointer<QDesignerAxWidget> m_widget;
@@ -72,7 +72,7 @@ public:
     explicit QAxWidgetExtraInfoFactory(QDesignerFormEditorInterface *core, QExtensionManager *parent = 0);
 
 protected:
-    virtual QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const;
+    QObject *createExtension(QObject *object, const QString &iid, QObject *parent) const Q_DECL_OVERRIDE;
 
 private:
     QDesignerFormEditorInterface *m_core;
diff --git a/src/designer/src/plugins/activeqt/qaxwidgetplugin.h b/src/designer/src/plugins/activeqt/qaxwidgetplugin.h
index 8a6709a66..9c94a1468 100644
--- a/src/designer/src/plugins/activeqt/qaxwidgetplugin.h
+++ b/src/designer/src/plugins/activeqt/qaxwidgetplugin.h
@@ -49,17 +49,17 @@ class QAxWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
 public:
     explicit QAxWidgetPlugin(QObject *parent = 0);
 
-    virtual QString name() const;
-    virtual QString group() const;
-    virtual QString toolTip() const;
-    virtual QString whatsThis() const;
-    virtual QString includeFile() const;
-    virtual QIcon icon() const;
-    virtual bool isContainer() const;
-    virtual QWidget *createWidget(QWidget *parent);
-    virtual bool isInitialized() const;
-    virtual void initialize(QDesignerFormEditorInterface *core);
-    virtual QString domXml() const;
+    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;
 
 private:
     QDesignerFormEditorInterface *m_core;
diff --git a/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h b/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h
index a609061b8..57857acf9 100644
--- a/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h
+++ b/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h
@@ -57,10 +57,10 @@ class QAxWidgetPropertySheet: public QDesignerPropertySheet
 public:
     explicit QAxWidgetPropertySheet(QDesignerAxWidget *object, QObject *parent = 0);
 
-    virtual bool isEnabled(int index) const;
-    virtual QVariant property(int index) const;
-    virtual void setProperty(int index, const QVariant &value);
-    virtual bool reset(int index);
+    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;
     bool dynamicPropertiesAllowed() const;
 
diff --git a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h
index 6eb0627e1..4c64e8521 100644
--- a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h
+++ b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.h
@@ -48,7 +48,7 @@ class QAxWidgetTaskMenu: public QObject, public QDesignerTaskMenuExtension
 public:
     explicit QAxWidgetTaskMenu(QDesignerAxWidget *object, QObject *parent = 0);
     virtual ~QAxWidgetTaskMenu();
-    virtual QList<QAction*> taskActions() const;
+    QList<QAction*> taskActions() const Q_DECL_OVERRIDE;
 
 private slots:
     void setActiveXControl();
diff --git a/src/designer/src/plugins/activeqt/qdesigneraxwidget.h b/src/designer/src/plugins/activeqt/qdesigneraxwidget.h
index 0fbb97072..046130022 100644
--- a/src/designer/src/plugins/activeqt/qdesigneraxwidget.h
+++ b/src/designer/src/plugins/activeqt/qdesigneraxwidget.h
@@ -102,8 +102,8 @@ public:
     explicit QDesignerAxPluginWidget(QWidget *parent);
     virtual ~QDesignerAxPluginWidget();
 
-    virtual const QMetaObject *metaObject() const;
-    virtual int qt_metacall(QMetaObject::Call, int, void **);
+    const QMetaObject *metaObject() const Q_DECL_OVERRIDE;
+    int qt_metacall(QMetaObject::Call, int, void **) Q_DECL_OVERRIDE;
 
 private:
     QMap<int, bool> m_propValues;
diff --git a/src/designer/src/plugins/qwebview/qwebview_plugin.h b/src/designer/src/plugins/qwebview/qwebview_plugin.h
index c402c6671..f02b35f8b 100644
--- a/src/designer/src/plugins/qwebview/qwebview_plugin.h
+++ b/src/designer/src/plugins/qwebview/qwebview_plugin.h
@@ -46,17 +46,17 @@ class QWebViewPlugin: public QObject, public QDesignerCustomWidgetInterface
 public:
     QWebViewPlugin(QObject *parent = 0);
 
-    virtual QString name() const;
-    virtual QString group() const;
-    virtual QString toolTip() const;
-    virtual QString whatsThis() const;
-    virtual QString includeFile() const;
-    virtual QIcon icon() const;
-    virtual bool isContainer() const;
-    virtual QWidget *createWidget(QWidget *parent);
-    virtual bool isInitialized() const;
-    virtual void initialize(QDesignerFormEditorInterface *core);
-    virtual QString domXml() const;
+    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;
 
 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 5a58afc54..ba0fd3481 100644
--- a/src/designer/src/plugins/tools/view3d/view3d.cpp
+++ b/src/designer/src/plugins/tools/view3d/view3d.cpp
@@ -57,7 +57,7 @@ class QView3DWidget : public QGLWidget
 public:
     QView3DWidget(QWidget *parent);
     virtual void initializeGL();
-    virtual void resizeGL(int w, int h);
+    void resizeGL(int w, int h) Q_DECL_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 fa2bf02ac..72a0d33a8 100644
--- a/src/designer/src/plugins/tools/view3d/view3d_plugin.h
+++ b/src/designer/src/plugins/tools/view3d/view3d_plugin.h
@@ -55,10 +55,10 @@ class VIEW3D_EXPORT QView3DPlugin : public QObject, public QDesignerFormEditorPl
 
 public:
     QView3DPlugin();
-    virtual bool isInitialized() const;
-    virtual void initialize(QDesignerFormEditorInterface *core);
-    virtual QAction *action() const;
-    virtual QDesignerFormEditorInterface *core() const;
+    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;
 
 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 4817169aa..0abe6598f 100644
--- a/src/designer/src/plugins/tools/view3d/view3d_tool.h
+++ b/src/designer/src/plugins/tools/view3d/view3d_tool.h
@@ -48,16 +48,16 @@ class VIEW3D_EXPORT QView3DTool : public QDesignerFormWindowToolInterface
 
 public:
     explicit QView3DTool(QDesignerFormWindowInterface *formWindow, QObject *parent = 0);
-    virtual QDesignerFormEditorInterface *core() const;
-    virtual QDesignerFormWindowInterface *formWindow() const;
-    virtual QWidget *editor() const;
+    QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE;
+    QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE;
+    QWidget *editor() const Q_DECL_OVERRIDE;
 
-    virtual QAction *action() const;
+    QAction *action() const Q_DECL_OVERRIDE;
 
     virtual void activated();
     virtual void deactivated();
 
-    virtual bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event);
+    bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event) Q_DECL_OVERRIDE;
 
 private:
     QDesignerFormWindowInterface *m_formWindow;