diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-04-10 10:20:09 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-05-13 18:08:27 +0000 |
commit | 5dbd90b220c946f439a5806006a2665c2860bf31 (patch) | |
tree | e8a932f4cd25528bd55a1d4b7968c9e86bf3769b /src/designer/src/components | |
parent | 121c7721972064105d8f1c1ac7ca001b6bff4491 (diff) | |
download | qttools-5dbd90b220c946f439a5806006a2665c2860bf31.tar.gz |
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>
Diffstat (limited to 'src/designer/src/components')
64 files changed, 334 insertions, 334 deletions
diff --git a/src/designer/src/components/buddyeditor/buddyeditor.h b/src/designer/src/components/buddyeditor/buddyeditor.h index f28ff261b..789ca1961 100644 --- a/src/designer/src/components/buddyeditor/buddyeditor.h +++ b/src/designer/src/components/buddyeditor/buddyeditor.h @@ -56,19 +56,19 @@ public: BuddyEditor(QDesignerFormWindowInterface *form, QWidget *parent); QDesignerFormWindowInterface *formWindow() const; - virtual void setBackground(QWidget *background); + void setBackground(QWidget *background) Q_DECL_OVERRIDE; virtual void deleteSelected(); public slots: virtual void updateBackground(); - virtual void widgetRemoved(QWidget *w); + void widgetRemoved(QWidget *w) Q_DECL_OVERRIDE; void autoBuddy(); protected: - virtual QWidget *widgetAt(const QPoint &pos) const; - virtual Connection *createConnection(QWidget *source, QWidget *destination); - virtual void endConnection(QWidget *target, const QPoint &pos); - virtual void createContextMenu(QMenu &menu); + QWidget *widgetAt(const QPoint &pos) const Q_DECL_OVERRIDE; + Connection *createConnection(QWidget *source, QWidget *destination) Q_DECL_OVERRIDE; + void endConnection(QWidget *target, const QPoint &pos) Q_DECL_OVERRIDE; + void createContextMenu(QMenu &menu) Q_DECL_OVERRIDE; private: QWidget *findBuddy(QLabel *l, const QWidgetList &existingBuddies) const; diff --git a/src/designer/src/components/buddyeditor/buddyeditor_plugin.h b/src/designer/src/components/buddyeditor/buddyeditor_plugin.h index 32cd0da86..0ce4068db 100644 --- a/src/designer/src/components/buddyeditor/buddyeditor_plugin.h +++ b/src/designer/src/components/buddyeditor/buddyeditor_plugin.h @@ -59,11 +59,11 @@ public: BuddyEditorPlugin(); virtual ~BuddyEditorPlugin(); - virtual bool isInitialized() const; - virtual void initialize(QDesignerFormEditorInterface *core); + bool isInitialized() const Q_DECL_OVERRIDE; + void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE; QAction *action() const; - virtual QDesignerFormEditorInterface *core() const; + QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; public slots: void activeFormWindowChanged(QDesignerFormWindowInterface *formWindow); diff --git a/src/designer/src/components/buddyeditor/buddyeditor_tool.h b/src/designer/src/components/buddyeditor/buddyeditor_tool.h index 58d318bf6..e4b843f71 100644 --- a/src/designer/src/components/buddyeditor/buddyeditor_tool.h +++ b/src/designer/src/components/buddyeditor/buddyeditor_tool.h @@ -57,16 +57,16 @@ public: explicit BuddyEditorTool(QDesignerFormWindowInterface *formWindow, QObject *parent = 0); virtual ~BuddyEditorTool(); - virtual QDesignerFormEditorInterface *core() const; - virtual QDesignerFormWindowInterface *formWindow() const; + QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; + QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE; - virtual QWidget *editor() const; - virtual QAction *action() const; + QWidget *editor() const Q_DECL_OVERRIDE; + 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; diff --git a/src/designer/src/components/formeditor/default_actionprovider.h b/src/designer/src/components/formeditor/default_actionprovider.h index 56358ce5b..6fac93ce2 100644 --- a/src/designer/src/components/formeditor/default_actionprovider.h +++ b/src/designer/src/components/formeditor/default_actionprovider.h @@ -54,7 +54,7 @@ protected: explicit ActionProviderBase(QWidget *widget); public: - virtual void adjustIndicator(const QPoint &pos); + void adjustIndicator(const QPoint &pos) Q_DECL_OVERRIDE; virtual Qt::Orientation orientation() const = 0; protected: @@ -71,12 +71,12 @@ class QT_FORMEDITOR_EXPORT QToolBarActionProvider: public QObject, public Action public: explicit QToolBarActionProvider(QToolBar *widget, QObject *parent = 0); - virtual QRect actionGeometry(QAction *action) const; - virtual QAction *actionAt(const QPoint &pos) const; + QRect actionGeometry(QAction *action) const Q_DECL_OVERRIDE; + QAction *actionAt(const QPoint &pos) const Q_DECL_OVERRIDE; Qt::Orientation orientation() const; protected: - virtual QRect indicatorGeometry(const QPoint &pos, Qt::LayoutDirection layoutDirection) const; + QRect indicatorGeometry(const QPoint &pos, Qt::LayoutDirection layoutDirection) const Q_DECL_OVERRIDE; private: QToolBar *m_widget; @@ -89,8 +89,8 @@ class QT_FORMEDITOR_EXPORT QMenuBarActionProvider: public QObject, public Action public: explicit QMenuBarActionProvider(QMenuBar *widget, QObject *parent = 0); - virtual QRect actionGeometry(QAction *action) const; - virtual QAction *actionAt(const QPoint &pos) const; + QRect actionGeometry(QAction *action) const Q_DECL_OVERRIDE; + QAction *actionAt(const QPoint &pos) const Q_DECL_OVERRIDE; Qt::Orientation orientation() const; private: @@ -104,8 +104,8 @@ class QT_FORMEDITOR_EXPORT QMenuActionProvider: public QObject, public ActionPro public: explicit QMenuActionProvider(QMenu *widget, QObject *parent = 0); - virtual QRect actionGeometry(QAction *action) const; - virtual QAction *actionAt(const QPoint &pos) const; + QRect actionGeometry(QAction *action) const Q_DECL_OVERRIDE; + QAction *actionAt(const QPoint &pos) const Q_DECL_OVERRIDE; Qt::Orientation orientation() const; private: diff --git a/src/designer/src/components/formeditor/default_container.h b/src/designer/src/components/formeditor/default_container.h index a94e041ec..1a4a49c78 100644 --- a/src/designer/src/components/formeditor/default_container.h +++ b/src/designer/src/components/formeditor/default_container.h @@ -60,11 +60,11 @@ public: virtual QWidget *widget(int index) const { return m_widget->widget(index); } virtual int currentIndex() const { return m_widget->currentIndex(); } - virtual void setCurrentIndex(int index); + void setCurrentIndex(int index) Q_DECL_OVERRIDE; - virtual void addWidget(QWidget *widget); - virtual void insertWidget(int index, QWidget *widget); - virtual void remove(int index); + void addWidget(QWidget *widget) Q_DECL_OVERRIDE; + void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE; + void remove(int index) Q_DECL_OVERRIDE; private: QStackedWidget *m_widget; @@ -82,11 +82,11 @@ public: virtual QWidget *widget(int index) const { return m_widget->widget(index); } virtual int currentIndex() const { return m_widget->currentIndex(); } - virtual void setCurrentIndex(int index); + void setCurrentIndex(int index) Q_DECL_OVERRIDE; - virtual void addWidget(QWidget *widget); - virtual void insertWidget(int index, QWidget *widget); - virtual void remove(int index); + void addWidget(QWidget *widget) Q_DECL_OVERRIDE; + void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE; + void remove(int index) Q_DECL_OVERRIDE; private: QTabWidget *m_widget; @@ -104,11 +104,11 @@ public: virtual QWidget *widget(int index) const { return m_widget->widget(index); } virtual int currentIndex() const { return m_widget->currentIndex(); } - virtual void setCurrentIndex(int index); + void setCurrentIndex(int index) Q_DECL_OVERRIDE; - virtual void addWidget(QWidget *widget); - virtual void insertWidget(int index, QWidget *widget); - virtual void remove(int index); + void addWidget(QWidget *widget) Q_DECL_OVERRIDE; + void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE; + void remove(int index) Q_DECL_OVERRIDE; private: QToolBox *m_widget; @@ -123,12 +123,12 @@ class SingleChildContainer: public QDesignerContainerExtension protected: explicit SingleChildContainer(Container *widget, bool active = true); public: - virtual int count() const; - virtual QWidget *widget(int index) const; - virtual int currentIndex() const; + int count() const Q_DECL_OVERRIDE; + QWidget *widget(int index) const Q_DECL_OVERRIDE; + int currentIndex() const Q_DECL_OVERRIDE; virtual void setCurrentIndex(int /*index*/) {} - virtual void addWidget(QWidget *widget); - virtual void insertWidget(int index, QWidget *widget); + void addWidget(QWidget *widget) Q_DECL_OVERRIDE; + void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE; virtual void remove(int /*index*/) {} virtual bool canAddWidget() const { return false; } diff --git a/src/designer/src/components/formeditor/default_layoutdecoration.h b/src/designer/src/components/formeditor/default_layoutdecoration.h index 1f8b3efad..65d79abf4 100644 --- a/src/designer/src/components/formeditor/default_layoutdecoration.h +++ b/src/designer/src/components/formeditor/default_layoutdecoration.h @@ -51,7 +51,7 @@ public: explicit QDesignerLayoutDecorationFactory(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; }; } // namespace qdesigner_internal diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp index 4a96ccbd6..8953d7150 100644 --- a/src/designer/src/components/formeditor/formwindow.cpp +++ b/src/designer/src/components/formeditor/formwindow.cpp @@ -1475,7 +1475,7 @@ public: QDesignerPropertySheetExtension *s, int i) : PropertyHelper(o, sp, s, i) {} - virtual Value setValue(QDesignerFormWindowInterface *fw, const QVariant &value, bool changed, unsigned subPropertyMask); + Value setValue(QDesignerFormWindowInterface *fw, const QVariant &value, bool changed, unsigned subPropertyMask) Q_DECL_OVERRIDE; }; PropertyHelper::Value ArrowKeyPropertyHelper::setValue(QDesignerFormWindowInterface *fw, const QVariant &value, bool changed, unsigned subPropertyMask) @@ -1501,7 +1501,7 @@ protected: virtual PropertyHelper *createPropertyHelper(QObject *o, SpecialProperty sp, QDesignerPropertySheetExtension *s, int i) const { return new ArrowKeyPropertyHelper(o, sp, s, i); } - virtual QVariant mergeValue(const QVariant &newValue); + QVariant mergeValue(const QVariant &newValue) Q_DECL_OVERRIDE; }; ArrowKeyPropertyCommand::ArrowKeyPropertyCommand(QDesignerFormWindowInterface *fw, diff --git a/src/designer/src/components/formeditor/formwindow.h b/src/designer/src/components/formeditor/formwindow.h index 4dd047cb3..01a8f2ded 100644 --- a/src/designer/src/components/formeditor/formwindow.h +++ b/src/designer/src/components/formeditor/formwindow.h @@ -78,54 +78,54 @@ public: explicit FormWindow(FormEditor *core, QWidget *parent = 0, Qt::WindowFlags flags = 0); virtual ~FormWindow(); - virtual QDesignerFormEditorInterface *core() const; + QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; - virtual QDesignerFormWindowCursorInterface *cursor() const; + QDesignerFormWindowCursorInterface *cursor() const Q_DECL_OVERRIDE; // Overwritten: FormWindowBase - virtual QWidget *formContainer() const; + QWidget *formContainer() const Q_DECL_OVERRIDE; - virtual int toolCount() const; - virtual int currentTool() const; - virtual void setCurrentTool(int index); - virtual QDesignerFormWindowToolInterface *tool(int index) const; - virtual void registerTool(QDesignerFormWindowToolInterface *tool); + int toolCount() const Q_DECL_OVERRIDE; + int currentTool() const Q_DECL_OVERRIDE; + void setCurrentTool(int index) Q_DECL_OVERRIDE; + QDesignerFormWindowToolInterface *tool(int index) const Q_DECL_OVERRIDE; + void registerTool(QDesignerFormWindowToolInterface *tool) Q_DECL_OVERRIDE; - virtual QString author() const; - virtual void setAuthor(const QString &author); + QString author() const Q_DECL_OVERRIDE; + void setAuthor(const QString &author) Q_DECL_OVERRIDE; - virtual QString comment() const; - virtual void setComment(const QString &comment); + QString comment() const Q_DECL_OVERRIDE; + void setComment(const QString &comment) Q_DECL_OVERRIDE; - virtual void layoutDefault(int *margin, int *spacing); - virtual void setLayoutDefault(int margin, int spacing); + void layoutDefault(int *margin, int *spacing) Q_DECL_OVERRIDE; + void setLayoutDefault(int margin, int spacing) Q_DECL_OVERRIDE; - virtual void layoutFunction(QString *margin, QString *spacing); - virtual void setLayoutFunction(const QString &margin, const QString &spacing); + void layoutFunction(QString *margin, QString *spacing) Q_DECL_OVERRIDE; + void setLayoutFunction(const QString &margin, const QString &spacing) Q_DECL_OVERRIDE; - virtual QString pixmapFunction() const; - virtual void setPixmapFunction(const QString &pixmapFunction); + QString pixmapFunction() const Q_DECL_OVERRIDE; + void setPixmapFunction(const QString &pixmapFunction) Q_DECL_OVERRIDE; - virtual QString exportMacro() const; - virtual void setExportMacro(const QString &exportMacro); + QString exportMacro() const Q_DECL_OVERRIDE; + void setExportMacro(const QString &exportMacro) Q_DECL_OVERRIDE; - virtual QStringList includeHints() const; - virtual void setIncludeHints(const QStringList &includeHints); + QStringList includeHints() const Q_DECL_OVERRIDE; + void setIncludeHints(const QStringList &includeHints) Q_DECL_OVERRIDE; - virtual QString fileName() const; - virtual void setFileName(const QString &fileName); + QString fileName() const Q_DECL_OVERRIDE; + void setFileName(const QString &fileName) Q_DECL_OVERRIDE; - virtual QString contents() const; - virtual bool setContents(QIODevice *dev, QString *errorMessage = 0); - virtual bool setContents(const QString &); + QString contents() const Q_DECL_OVERRIDE; + bool setContents(QIODevice *dev, QString *errorMessage = 0) Q_DECL_OVERRIDE; + bool setContents(const QString &) Q_DECL_OVERRIDE; - virtual QDir absoluteDir() const; + QDir absoluteDir() const Q_DECL_OVERRIDE; - virtual void simplifySelection(QWidgetList *sel) const; + void simplifySelection(QWidgetList *sel) const Q_DECL_OVERRIDE; - virtual void ensureUniqueObjectName(QObject *object); + void ensureUniqueObjectName(QObject *object) Q_DECL_OVERRIDE; - virtual QWidget *mainContainer() const; + QWidget *mainContainer() const Q_DECL_OVERRIDE; void setMainContainer(QWidget *mainContainer); bool isMainContainer(const QWidget *w) const; @@ -158,11 +158,11 @@ public: void manageWidget(QWidget *w); void unmanageWidget(QWidget *w); - virtual QUndoStack *commandHistory() const; + QUndoStack *commandHistory() const Q_DECL_OVERRIDE; void beginCommand(const QString &description); void endCommand(); - virtual bool blockSelectionChanged(bool blocked); + bool blockSelectionChanged(bool blocked) Q_DECL_OVERRIDE; virtual void emitSelectionChanged(); bool unify(QObject *w, QString &s, bool changeIt); @@ -173,7 +173,7 @@ public: static FormWindow *findFormWindow(QWidget *w); virtual QWidget *containerAt(const QPoint &pos); - virtual QWidget *widgetAt(const QPoint &pos); + QWidget *widgetAt(const QPoint &pos) Q_DECL_OVERRIDE; virtual void highlightWidget(QWidget *w, const QPoint &pos, HighlightMode mode = Highlight); @@ -191,7 +191,7 @@ public: bool dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, QWidget *target, const QPoint &global_mouse_pos); - virtual QWidget *findContainer(QWidget *w, bool excludeLayout) const; + QWidget *findContainer(QWidget *w, bool excludeLayout) const Q_DECL_OVERRIDE; // for WidgetSelection only. QWidget *designerWidget(QWidget *w) const; @@ -199,7 +199,7 @@ public: QMenu *initializePopupMenu(QWidget *managedWidget); #ifndef QT_NO_CLIPBOARD - virtual void paste(PasteMode pasteMode); + void paste(PasteMode pasteMode) Q_DECL_OVERRIDE; #endif virtual QEditorFormBuilder *createFormBuilder(); @@ -227,7 +227,7 @@ public slots: protected: virtual QMenu *createPopupMenu(QWidget *w); - virtual void resizeEvent(QResizeEvent *e); + void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; void insertWidget(QWidget *w, const QRect &rect, QWidget *target, bool already_in_form = false); diff --git a/src/designer/src/components/formeditor/formwindow_dnditem.h b/src/designer/src/components/formeditor/formwindow_dnditem.h index 4295266eb..dbd01fe81 100644 --- a/src/designer/src/components/formeditor/formwindow_dnditem.h +++ b/src/designer/src/components/formeditor/formwindow_dnditem.h @@ -47,7 +47,7 @@ class FormWindowDnDItem : public QDesignerDnDItem public: FormWindowDnDItem(QDesignerDnDItemInterface::DropType type, FormWindow *form, QWidget *widget, const QPoint &global_mouse_pos); - virtual DomUI *domUi() const; + DomUI *domUi() const Q_DECL_OVERRIDE; }; } // namespace qdesigner_internal diff --git a/src/designer/src/components/formeditor/formwindowcursor.h b/src/designer/src/components/formeditor/formwindowcursor.h index 62f5a1da8..c5eae6062 100644 --- a/src/designer/src/components/formeditor/formwindowcursor.h +++ b/src/designer/src/components/formeditor/formwindowcursor.h @@ -51,25 +51,25 @@ public: explicit FormWindowCursor(FormWindow *fw, QObject *parent = 0); virtual ~FormWindowCursor(); - virtual QDesignerFormWindowInterface *formWindow() const; + QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE; - virtual bool movePosition(MoveOperation op, MoveMode mode); + bool movePosition(MoveOperation op, MoveMode mode) Q_DECL_OVERRIDE; - virtual int position() const; - virtual void setPosition(int pos, MoveMode mode); + int position() const Q_DECL_OVERRIDE; + void setPosition(int pos, MoveMode mode) Q_DECL_OVERRIDE; - virtual QWidget *current() const; + QWidget *current() const Q_DECL_OVERRIDE; - virtual int widgetCount() const; - virtual QWidget *widget(int index) const; + int widgetCount() const Q_DECL_OVERRIDE; + QWidget *widget(int index) const Q_DECL_OVERRIDE; - virtual bool hasSelection() const; - virtual int selectedWidgetCount() const; - virtual QWidget *selectedWidget(int index) const; + bool hasSelection() const Q_DECL_OVERRIDE; + int selectedWidgetCount() const Q_DECL_OVERRIDE; + QWidget *selectedWidget(int index) const Q_DECL_OVERRIDE; - virtual void setProperty(const QString &name, const QVariant &value); - virtual void setWidgetProperty(QWidget *widget, const QString &name, const QVariant &value); - virtual void resetWidgetProperty(QWidget *widget, const QString &name); + void setProperty(const QString &name, const QVariant &value) Q_DECL_OVERRIDE; + void setWidgetProperty(QWidget *widget, const QString &name, const QVariant &value) Q_DECL_OVERRIDE; + void resetWidgetProperty(QWidget *widget, const QString &name) Q_DECL_OVERRIDE; public slots: void update(); diff --git a/src/designer/src/components/formeditor/formwindowmanager.h b/src/designer/src/components/formeditor/formwindowmanager.h index 1bb1b2a72..307c658e8 100644 --- a/src/designer/src/components/formeditor/formwindowmanager.h +++ b/src/designer/src/components/formeditor/formwindowmanager.h @@ -65,10 +65,10 @@ public: explicit FormWindowManager(QDesignerFormEditorInterface *core, QObject *parent = 0); virtual ~FormWindowManager(); - virtual QDesignerFormEditorInterface *core() const; + QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; - virtual QAction *action(Action action) const; - virtual QActionGroup *actionGroup(ActionGroup actionGroup) const; + QAction *action(Action action) const Q_DECL_OVERRIDE; + QActionGroup *actionGroup(ActionGroup actionGroup) const Q_DECL_OVERRIDE; QDesignerFormWindowInterface *activeFormWindow() const; diff --git a/src/designer/src/components/formeditor/itemview_propertysheet.h b/src/designer/src/components/formeditor/itemview_propertysheet.h index f5a1cb7e8..20ab7d81d 100644 --- a/src/designer/src/components/formeditor/itemview_propertysheet.h +++ b/src/designer/src/components/formeditor/itemview_propertysheet.h @@ -61,11 +61,11 @@ public: QVariant property(int index) const; void setProperty(int index, const QVariant &value); - virtual void setChanged(int index, bool changed); - virtual bool isChanged(int index) const; + void setChanged(int index, bool changed) Q_DECL_OVERRIDE; + bool isChanged(int index) const Q_DECL_OVERRIDE; - virtual bool hasReset(int index) const; - virtual bool reset(int index); + bool hasReset(int index) const Q_DECL_OVERRIDE; + bool reset(int index) Q_DECL_OVERRIDE; private: void initHeaderProperties(QHeaderView *hv, const QString &prefix); diff --git a/src/designer/src/components/formeditor/layout_propertysheet.h b/src/designer/src/components/formeditor/layout_propertysheet.h index c65a19cf4..4106639e1 100644 --- a/src/designer/src/components/formeditor/layout_propertysheet.h +++ b/src/designer/src/components/formeditor/layout_propertysheet.h @@ -54,9 +54,9 @@ public: explicit LayoutPropertySheet(QLayout *object, QObject *parent = 0); virtual ~LayoutPropertySheet(); - virtual void setProperty(int index, const QVariant &value); - virtual QVariant property(int index) const; - virtual bool reset(int index); + void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE; + QVariant property(int index) const Q_DECL_OVERRIDE; + bool reset(int index) Q_DECL_OVERRIDE; void setChanged(int index, bool changed); static void stretchAttributesToDom(QDesignerFormEditorInterface *core, QLayout *lt, DomLayout *domLayout); diff --git a/src/designer/src/components/formeditor/line_propertysheet.h b/src/designer/src/components/formeditor/line_propertysheet.h index b961fb31b..3244f8a63 100644 --- a/src/designer/src/components/formeditor/line_propertysheet.h +++ b/src/designer/src/components/formeditor/line_propertysheet.h @@ -50,9 +50,9 @@ public: explicit LinePropertySheet(Line *object, QObject *parent = 0); virtual ~LinePropertySheet(); - virtual void setProperty(int index, const QVariant &value); - virtual bool isVisible(int index) const; - virtual QString propertyGroup(int index) const; + void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE; + bool isVisible(int index) const Q_DECL_OVERRIDE; + QString propertyGroup(int index) const Q_DECL_OVERRIDE; }; typedef QDesignerPropertySheetFactory<Line, LinePropertySheet> LinePropertySheetFactory; diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp index c040d6839..b1e9fdc24 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.cpp +++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp @@ -135,13 +135,13 @@ public: QStringList loadedQrcFiles() const { return m_loadedQrcFiles.keys(); } // needed only for loading old resource attribute of <iconset> tag. #endif - virtual QVariant loadResource(const QDir &workingDirectory, const DomProperty *icon) const; + QVariant loadResource(const QDir &workingDirectory, const DomProperty *icon) const Q_DECL_OVERRIDE; - virtual QVariant toNativeValue(const QVariant &value) const; + QVariant toNativeValue(const QVariant &value) const Q_DECL_OVERRIDE; - virtual DomProperty *saveResource(const QDir &workingDirectory, const QVariant &value) const; + DomProperty *saveResource(const QDir &workingDirectory, const QVariant &value) const Q_DECL_OVERRIDE; - virtual bool isResourceType(const QVariant &value) const; + bool isResourceType(const QVariant &value) const Q_DECL_OVERRIDE; private: QDesignerFormEditorInterface *m_core; @@ -364,11 +364,11 @@ class QDesignerTextBuilder : public QTextBuilder public: QDesignerTextBuilder() {} - virtual QVariant loadText(const DomProperty *icon) const; + QVariant loadText(const DomProperty *icon) const Q_DECL_OVERRIDE; - virtual QVariant toNativeValue(const QVariant &value) const; + QVariant toNativeValue(const QVariant &value) const Q_DECL_OVERRIDE; - virtual DomProperty *saveText(const QVariant &value) const; + DomProperty *saveText(const QVariant &value) const Q_DECL_OVERRIDE; }; QVariant QDesignerTextBuilder::loadText(const DomProperty *text) const diff --git a/src/designer/src/components/formeditor/qdesigner_resource.h b/src/designer/src/components/formeditor/qdesigner_resource.h index a0a9fe2f4..cb8be235c 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.h +++ b/src/designer/src/components/formeditor/qdesigner_resource.h @@ -70,57 +70,57 @@ public: explicit QDesignerResource(FormWindow *fw); virtual ~QDesignerResource(); - virtual void save(QIODevice *dev, QWidget *widget); + void save(QIODevice *dev, QWidget *widget) Q_DECL_OVERRIDE; - virtual bool copy(QIODevice *dev, const FormBuilderClipboard &selection); - virtual DomUI *copy(const FormBuilderClipboard &selection); + bool copy(QIODevice *dev, const FormBuilderClipboard &selection) Q_DECL_OVERRIDE; + DomUI *copy(const FormBuilderClipboard &selection) Q_DECL_OVERRIDE; - virtual FormBuilderClipboard paste(DomUI *ui, QWidget *widgetParent, QObject *actionParent = 0); - virtual FormBuilderClipboard paste(QIODevice *dev, QWidget *widgetParent, QObject *actionParent = 0); + FormBuilderClipboard paste(DomUI *ui, QWidget *widgetParent, QObject *actionParent = 0) Q_DECL_OVERRIDE; + FormBuilderClipboard paste(QIODevice *dev, QWidget *widgetParent, QObject *actionParent = 0) Q_DECL_OVERRIDE; bool saveRelative() const; void setSaveRelative(bool relative); - virtual QWidget *load(QIODevice *dev, QWidget *parentWidget); + QWidget *load(QIODevice *dev, QWidget *parentWidget) Q_DECL_OVERRIDE; protected: using QEditorFormBuilder::create; using QEditorFormBuilder::createDom; - virtual void saveDom(DomUI *ui, QWidget *widget); - virtual QWidget *create(DomUI *ui, QWidget *parentWidget); - virtual QWidget *create(DomWidget *ui_widget, QWidget *parentWidget); - virtual QLayout *create(DomLayout *ui_layout, QLayout *layout, QWidget *parentWidget); - virtual QLayoutItem *create(DomLayoutItem *ui_layoutItem, QLayout *layout, QWidget *parentWidget); - virtual void applyProperties(QObject *o, const QList<DomProperty*> &properties); - virtual QList<DomProperty*> computeProperties(QObject *obj); - virtual DomProperty *createProperty(QObject *object, const QString &propertyName, const QVariant &value); + void saveDom(DomUI *ui, QWidget *widget) Q_DECL_OVERRIDE; + QWidget *create(DomUI *ui, QWidget *parentWidget) Q_DECL_OVERRIDE; + QWidget *create(DomWidget *ui_widget, QWidget *parentWidget) Q_DECL_OVERRIDE; + QLayout *create(DomLayout *ui_layout, QLayout *layout, QWidget *parentWidget) Q_DECL_OVERRIDE; + QLayoutItem *create(DomLayoutItem *ui_layoutItem, QLayout *layout, QWidget *parentWidget) Q_DECL_OVERRIDE; + void applyProperties(QObject *o, const QList<DomProperty*> &properties) Q_DECL_OVERRIDE; + QList<DomProperty*> computeProperties(QObject *obj) Q_DECL_OVERRIDE; + DomProperty *createProperty(QObject *object, const QString &propertyName, const QVariant &value) Q_DECL_OVERRIDE; - virtual QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name); - virtual QLayout *createLayout(const QString &layoutName, QObject *parent, const QString &name); - virtual void createCustomWidgets(DomCustomWidgets *); - virtual void createResources(DomResources*); - virtual void applyTabStops(QWidget *widget, DomTabStops *tabStops); + QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name) Q_DECL_OVERRIDE; + QLayout *createLayout(const QString &layoutName, QObject *parent, const QString &name) Q_DECL_OVERRIDE; + void createCustomWidgets(DomCustomWidgets *) Q_DECL_OVERRIDE; + void createResources(DomResources*) Q_DECL_OVERRIDE; + void applyTabStops(QWidget *widget, DomTabStops *tabStops) Q_DECL_OVERRIDE; - virtual bool addItem(DomLayoutItem *ui_item, QLayoutItem *item, QLayout *layout); - virtual bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget); + bool addItem(DomLayoutItem *ui_item, QLayoutItem *item, QLayout *layout) Q_DECL_OVERRIDE; + bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) Q_DECL_OVERRIDE; - virtual DomWidget *createDom(QWidget *widget, DomWidget *ui_parentWidget, bool recursive = true); - virtual DomLayout *createDom(QLayout *layout, DomLayout *ui_layout, DomWidget *ui_parentWidget); - virtual DomLayoutItem *createDom(QLayoutItem *item, DomLayout *ui_layout, DomWidget *ui_parentWidget); + DomWidget *createDom(QWidget *widget, DomWidget *ui_parentWidget, bool recursive = true) Q_DECL_OVERRIDE; + DomLayout *createDom(QLayout *layout, DomLayout *ui_layout, DomWidget *ui_parentWidget) Q_DECL_OVERRIDE; + DomLayoutItem *createDom(QLayoutItem *item, DomLayout *ui_layout, DomWidget *ui_parentWidget) Q_DECL_OVERRIDE; - virtual QAction *create(DomAction *ui_action, QObject *parent); - virtual QActionGroup *create(DomActionGroup *ui_action_group, QObject *parent); - virtual void addMenuAction(QAction *action); + QAction *create(DomAction *ui_action, QObject *parent) Q_DECL_OVERRIDE; + QActionGroup *create(DomActionGroup *ui_action_group, QObject *parent) Q_DECL_OVERRIDE; + void addMenuAction(QAction *action) Q_DECL_OVERRIDE; - virtual DomAction *createDom(QAction *action); - virtual DomActionGroup *createDom(QActionGroup *actionGroup); - virtual DomActionRef *createActionRefDom(QAction *action); + DomAction *createDom(QAction *action) Q_DECL_OVERRIDE; + DomActionGroup *createDom(QActionGroup *actionGroup) Q_DECL_OVERRIDE; + DomActionRef *createActionRefDom(QAction *action) Q_DECL_OVERRIDE; - virtual QAction *createAction(QObject *parent, const QString &name); - virtual QActionGroup *createActionGroup(QObject *parent, const QString &name); + QAction *createAction(QObject *parent, const QString &name) Q_DECL_OVERRIDE; + QActionGroup *createActionGroup(QObject *parent, const QString &name) Q_DECL_OVERRIDE; - virtual bool checkProperty(QObject *obj, const QString &prop) const; + bool checkProperty(QObject *obj, const QString &prop) const Q_DECL_OVERRIDE; DomWidget *saveWidget(QTabWidget *widget, DomWidget *ui_parentWidget); DomWidget *saveWidget(QStackedWidget *widget, DomWidget *ui_parentWidget); @@ -134,9 +134,9 @@ protected: virtual DomTabStops *saveTabStops(); virtual DomResources *saveResources(); - virtual void layoutInfo(DomLayout *layout, QObject *parent, int *margin, int *spacing); + void layoutInfo(DomLayout *layout, QObject *parent, int *margin, int *spacing) Q_DECL_OVERRIDE; - virtual void loadExtraInfo(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget); + void loadExtraInfo(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) Q_DECL_OVERRIDE; void changeObjectName(QObject *o, QString name); DomProperty *applyProperStdSetAttribute(QObject *object, const QString &propertyName, DomProperty *property); diff --git a/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.h b/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.h index 56b03bbc6..a8453b801 100644 --- a/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.h +++ b/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.h @@ -50,10 +50,10 @@ public: explicit QLayoutWidgetPropertySheet(QLayoutWidget *object, QObject *parent = 0); virtual ~QLayoutWidgetPropertySheet(); - virtual void setProperty(int index, const QVariant &value); - virtual bool isVisible(int index) const; + void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE; + bool isVisible(int index) const Q_DECL_OVERRIDE; - virtual bool dynamicPropertiesAllowed() const; + bool dynamicPropertiesAllowed() const Q_DECL_OVERRIDE; }; typedef QDesignerPropertySheetFactory<QLayoutWidget, QLayoutWidgetPropertySheet> QLayoutWidgetPropertySheetFactory; diff --git a/src/designer/src/components/formeditor/qmainwindow_container.h b/src/designer/src/components/formeditor/qmainwindow_container.h index 5406809cc..d8cf37fdc 100644 --- a/src/designer/src/components/formeditor/qmainwindow_container.h +++ b/src/designer/src/components/formeditor/qmainwindow_container.h @@ -52,13 +52,13 @@ class QMainWindowContainer: public QObject, public QDesignerContainerExtension public: explicit QMainWindowContainer(QMainWindow *widget, QObject *parent = 0); - virtual int count() const; - virtual QWidget *widget(int index) const; - virtual int currentIndex() const; - virtual void setCurrentIndex(int index); - virtual void addWidget(QWidget *widget); - virtual void insertWidget(int index, QWidget *widget); - virtual void remove(int index); + int count() const Q_DECL_OVERRIDE; + QWidget *widget(int index) const Q_DECL_OVERRIDE; + int currentIndex() const Q_DECL_OVERRIDE; + void setCurrentIndex(int index) Q_DECL_OVERRIDE; + void addWidget(QWidget *widget) Q_DECL_OVERRIDE; + void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE; + void remove(int index) Q_DECL_OVERRIDE; private: QMainWindow *m_mainWindow; diff --git a/src/designer/src/components/formeditor/qmdiarea_container.h b/src/designer/src/components/formeditor/qmdiarea_container.h index 8538dc51c..df8bc5ee1 100644 --- a/src/designer/src/components/formeditor/qmdiarea_container.h +++ b/src/designer/src/components/formeditor/qmdiarea_container.h @@ -54,13 +54,13 @@ class QMdiAreaContainer: public QObject, public QDesignerContainerExtension public: explicit QMdiAreaContainer(QMdiArea *widget, QObject *parent = 0); - virtual int count() const; - virtual QWidget *widget(int index) const; - virtual int currentIndex() const; - virtual void setCurrentIndex(int index); - virtual void addWidget(QWidget *widget); - virtual void insertWidget(int index, QWidget *widget); - virtual void remove(int index); + int count() const Q_DECL_OVERRIDE; + QWidget *widget(int index) const Q_DECL_OVERRIDE; + int currentIndex() const Q_DECL_OVERRIDE; + void setCurrentIndex(int index) Q_DECL_OVERRIDE; + void addWidget(QWidget *widget) Q_DECL_OVERRIDE; + void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE; + void remove(int index) Q_DECL_OVERRIDE; // Semismart positioning of a new MDI child after cascading static void positionNewMdiChild(const QWidget *area, QWidget *mdiChild); @@ -78,11 +78,11 @@ class QMdiAreaPropertySheet: public QDesignerPropertySheet public: explicit QMdiAreaPropertySheet(QWidget *mdiArea, QObject *parent = 0); - virtual void setProperty(int index, const QVariant &value); - virtual bool reset(int index); - virtual bool isEnabled(int index) const; - virtual bool isChanged(int index) const; - virtual QVariant property(int index) const; + void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE; + bool reset(int index) Q_DECL_OVERRIDE; + bool isEnabled(int index) const Q_DECL_OVERRIDE; + bool isChanged(int index) const Q_DECL_OVERRIDE; + QVariant property(int index) const Q_DECL_OVERRIDE; // Check whether the property is to be saved. Returns false for the page // properties (as the property sheet has no concept of 'stored') diff --git a/src/designer/src/components/formeditor/qwizard_container.h b/src/designer/src/components/formeditor/qwizard_container.h index c1ab3af57..6181371d9 100644 --- a/src/designer/src/components/formeditor/qwizard_container.h +++ b/src/designer/src/components/formeditor/qwizard_container.h @@ -58,13 +58,13 @@ class QWizardContainer: public QObject, public QDesignerContainerExtension public: explicit QWizardContainer(QWizard *widget, QObject *parent = 0); - virtual int count() const; - virtual QWidget *widget(int index) const; - virtual int currentIndex() const; - virtual void setCurrentIndex(int index); - virtual void addWidget(QWidget *widget); - virtual void insertWidget(int index, QWidget *widget); - virtual void remove(int index); + int count() const Q_DECL_OVERRIDE; + QWidget *widget(int index) const Q_DECL_OVERRIDE; + int currentIndex() const Q_DECL_OVERRIDE; + void setCurrentIndex(int index) Q_DECL_OVERRIDE; + void addWidget(QWidget *widget) Q_DECL_OVERRIDE; + void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE; + void remove(int index) Q_DECL_OVERRIDE; private: QWizard *m_wizard; @@ -81,7 +81,7 @@ class QWizardPagePropertySheet: public QDesignerPropertySheet public: explicit QWizardPagePropertySheet(QWizardPage *object, QObject *parent = 0); - virtual bool reset(int index); + bool reset(int index) Q_DECL_OVERRIDE; static const char *pageIdProperty; @@ -98,7 +98,7 @@ class QWizardPropertySheet: public QDesignerPropertySheet Q_OBJECT public: explicit QWizardPropertySheet(QWizard *object, QObject *parent = 0); - virtual bool isVisible(int index) const; + bool isVisible(int index) const Q_DECL_OVERRIDE; private: const QString m_startId; diff --git a/src/designer/src/components/formeditor/spacer_propertysheet.h b/src/designer/src/components/formeditor/spacer_propertysheet.h index 8f8749b5b..137aba940 100644 --- a/src/designer/src/components/formeditor/spacer_propertysheet.h +++ b/src/designer/src/components/formeditor/spacer_propertysheet.h @@ -50,10 +50,10 @@ public: explicit SpacerPropertySheet(Spacer *object, QObject *parent = 0); virtual ~SpacerPropertySheet(); - virtual void setProperty(int index, const QVariant &value); - virtual bool isVisible(int index) const; + void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE; + bool isVisible(int index) const Q_DECL_OVERRIDE; - virtual bool dynamicPropertiesAllowed() const; + bool dynamicPropertiesAllowed() const Q_DECL_OVERRIDE; }; typedef QDesignerPropertySheetFactory<Spacer, SpacerPropertySheet> SpacerPropertySheetFactory; diff --git a/src/designer/src/components/formeditor/templateoptionspage.h b/src/designer/src/components/formeditor/templateoptionspage.h index b45c1f7ae..fa25ae23a 100644 --- a/src/designer/src/components/formeditor/templateoptionspage.h +++ b/src/designer/src/components/formeditor/templateoptionspage.h @@ -84,8 +84,8 @@ class TemplateOptionsPage : public QDesignerOptionsPageInterface public: explicit TemplateOptionsPage(QDesignerFormEditorInterface *core); - virtual QString name() const; - virtual QWidget *createPage(QWidget *parent); + QString name() const Q_DECL_OVERRIDE; + QWidget *createPage(QWidget *parent) Q_DECL_OVERRIDE; virtual void apply(); virtual void finish(); diff --git a/src/designer/src/components/formeditor/tool_widgeteditor.h b/src/designer/src/components/formeditor/tool_widgeteditor.h index b703216e2..68686f87b 100644 --- a/src/designer/src/components/formeditor/tool_widgeteditor.h +++ b/src/designer/src/components/formeditor/tool_widgeteditor.h @@ -56,15 +56,15 @@ public: explicit WidgetEditorTool(FormWindow *formWindow); virtual ~WidgetEditorTool(); - virtual QDesignerFormEditorInterface *core() const; - virtual QDesignerFormWindowInterface *formWindow() const; - virtual QWidget *editor() const; - virtual QAction *action() const; + QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; + QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE; + QWidget *editor() const Q_DECL_OVERRIDE; + 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; bool handleContextMenu(QWidget *widget, QWidget *managedWidget, QContextMenuEvent *e); bool handleMouseButtonDblClickEvent(QWidget *widget, QWidget *managedWidget, QMouseEvent *e); diff --git a/src/designer/src/components/formeditor/widgetselection.h b/src/designer/src/components/formeditor/widgetselection.h index 97f36e180..6bae73814 100644 --- a/src/designer/src/components/formeditor/widgetselection.h +++ b/src/designer/src/components/formeditor/widgetselection.h @@ -119,7 +119,7 @@ public: QDesignerFormEditorInterface *core() const; - virtual bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; enum WidgetState { UnlaidOut, LaidOut, ManagedGridLayout, ManagedFormLayout }; static WidgetState widgetState(const QDesignerFormEditorInterface *core, QWidget *w); diff --git a/src/designer/src/components/objectinspector/objectinspector.cpp b/src/designer/src/components/objectinspector/objectinspector.cpp index 2d055cbe4..d4208439e 100644 --- a/src/designer/src/components/objectinspector/objectinspector.cpp +++ b/src/designer/src/components/objectinspector/objectinspector.cpp @@ -123,7 +123,7 @@ class ObjectInspectorDelegate : public QItemDelegate { public: explicit ObjectInspectorDelegate(QObject *parent = 0); - virtual QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; + QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; }; ObjectInspectorDelegate::ObjectInspectorDelegate(QObject *parent) : @@ -151,8 +151,8 @@ public: ObjectInspectorTreeView(QWidget *parent = 0) : QTreeView(parent) {} protected: - virtual void mouseMoveEvent (QMouseEvent * event); - virtual void keyPressEvent(QKeyEvent *event); + void mouseMoveEvent (QMouseEvent * event) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; }; diff --git a/src/designer/src/components/objectinspector/objectinspector.h b/src/designer/src/components/objectinspector/objectinspector.h index cbc26afc1..86e3dd7f2 100644 --- a/src/designer/src/components/objectinspector/objectinspector.h +++ b/src/designer/src/components/objectinspector/objectinspector.h @@ -53,10 +53,10 @@ public: explicit ObjectInspector(QDesignerFormEditorInterface *core, QWidget *parent = 0); virtual ~ObjectInspector(); - virtual QDesignerFormEditorInterface *core() const; + QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; - virtual void getSelection(Selection &s) const; - virtual bool selectObject(QObject *o); + void getSelection(Selection &s) const Q_DECL_OVERRIDE; + bool selectObject(QObject *o) Q_DECL_OVERRIDE; virtual void clearSelection(); void setFormWindow(QDesignerFormWindowInterface *formWindow); @@ -70,10 +70,10 @@ private slots: void slotHeaderDoubleClicked(int column); protected: - virtual void dragEnterEvent (QDragEnterEvent * event); - virtual void dragMoveEvent(QDragMoveEvent * event); - virtual void dragLeaveEvent(QDragLeaveEvent * event); - virtual void dropEvent (QDropEvent * event); + void dragEnterEvent (QDragEnterEvent * event) Q_DECL_OVERRIDE; + void dragMoveEvent(QDragMoveEvent * event) Q_DECL_OVERRIDE; + void dragLeaveEvent(QDragLeaveEvent * event) Q_DECL_OVERRIDE; + void dropEvent (QDropEvent * event) Q_DECL_OVERRIDE; private: class ObjectInspectorPrivate; diff --git a/src/designer/src/components/objectinspector/objectinspectormodel_p.h b/src/designer/src/components/objectinspector/objectinspectormodel_p.h index 8f9243024..e579457b8 100644 --- a/src/designer/src/components/objectinspector/objectinspectormodel_p.h +++ b/src/designer/src/components/objectinspector/objectinspectormodel_p.h @@ -137,8 +137,8 @@ namespace qdesigner_internal { const QModelIndexList indexesOf(QObject *o) const { return m_objectIndexMultiMap.values(o); } QObject *objectAt(const QModelIndex &index) const; - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; private: typedef QMultiMap<QObject *,QModelIndex> ObjectIndexMultiMap; diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.h b/src/designer/src/components/propertyeditor/designerpropertymanager.h index a055d1582..8c46505e3 100644 --- a/src/designer/src/components/propertyeditor/designerpropertymanager.h +++ b/src/designer/src/components/propertyeditor/designerpropertymanager.h @@ -128,15 +128,15 @@ public: explicit DesignerPropertyManager(QDesignerFormEditorInterface *core, QObject *parent = 0); ~DesignerPropertyManager(); - virtual QStringList attributes(int propertyType) const; - virtual int attributeType(int propertyType, const QString &attribute) const; + QStringList attributes(int propertyType) const Q_DECL_OVERRIDE; + int attributeType(int propertyType, const QString &attribute) const Q_DECL_OVERRIDE; - virtual QVariant attributeValue(const QtProperty *property, const QString &attribute) const; - virtual bool isPropertyTypeSupported(int propertyType) const; - virtual QVariant value(const QtProperty *property) const; - virtual int valueType(int propertyType) const; - virtual QString valueText(const QtProperty *property) const; - virtual QIcon valueIcon(const QtProperty *property) const; + QVariant attributeValue(const QtProperty *property, const QString &attribute) const Q_DECL_OVERRIDE; + bool isPropertyTypeSupported(int propertyType) const Q_DECL_OVERRIDE; + QVariant value(const QtProperty *property) const Q_DECL_OVERRIDE; + int valueType(int propertyType) const Q_DECL_OVERRIDE; + QString valueText(const QtProperty *property) const Q_DECL_OVERRIDE; + QIcon valueIcon(const QtProperty *property) const Q_DECL_OVERRIDE; bool resetFontSubProperty(QtProperty *property); bool resetIconSubProperty(QtProperty *subProperty); @@ -157,14 +157,14 @@ public: public Q_SLOTS: virtual void setAttribute(QtProperty *property, const QString &attribute, const QVariant &value); - virtual void setValue(QtProperty *property, const QVariant &value); + void setValue(QtProperty *property, const QVariant &value) Q_DECL_OVERRIDE; Q_SIGNALS: // sourceOfChange - a subproperty (or just property) which caused a change //void valueChanged(QtProperty *property, const QVariant &value, QtProperty *sourceOfChange); void valueChanged(QtProperty *property, const QVariant &value, bool enableSubPropertyHandling); protected: - virtual void initializeProperty(QtProperty *property); - virtual void uninitializeProperty(QtProperty *property); + void initializeProperty(QtProperty *property) Q_DECL_OVERRIDE; + void uninitializeProperty(QtProperty *property) Q_DECL_OVERRIDE; private Q_SLOTS: void slotValueChanged(QtProperty *property, const QVariant &value); void slotPropertyDestroyed(QtProperty *property); diff --git a/src/designer/src/components/propertyeditor/paletteeditor.h b/src/designer/src/components/propertyeditor/paletteeditor.h index 7d6210361..ead06ee30 100644 --- a/src/designer/src/components/propertyeditor/paletteeditor.h +++ b/src/designer/src/components/propertyeditor/paletteeditor.h @@ -184,7 +184,7 @@ public: virtual void paint(QPainter *painter, const QStyleOptionViewItem &opt, const QModelIndex &index) const; - virtual QSize sizeHint(const QStyleOptionViewItem &opt, const QModelIndex &index) const; + QSize sizeHint(const QStyleOptionViewItem &opt, const QModelIndex &index) const Q_DECL_OVERRIDE; private: QDesignerFormEditorInterface *m_core; }; diff --git a/src/designer/src/components/propertyeditor/propertyeditor.h b/src/designer/src/components/propertyeditor/propertyeditor.h index 9108c8dea..545a0ff4f 100644 --- a/src/designer/src/components/propertyeditor/propertyeditor.h +++ b/src/designer/src/components/propertyeditor/propertyeditor.h @@ -71,21 +71,21 @@ public: explicit PropertyEditor(QDesignerFormEditorInterface *core, QWidget *parent = 0, Qt::WindowFlags flags = 0); virtual ~PropertyEditor(); - virtual QDesignerFormEditorInterface *core() const; + QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; - virtual bool isReadOnly() const; - virtual void setReadOnly(bool readOnly); - virtual void setPropertyValue(const QString &name, const QVariant &value, bool changed = true); + bool isReadOnly() const Q_DECL_OVERRIDE; + void setReadOnly(bool readOnly) Q_DECL_OVERRIDE; + void setPropertyValue(const QString &name, const QVariant &value, bool changed = true) Q_DECL_OVERRIDE; virtual void updatePropertySheet(); - virtual void setObject(QObject *object); + void setObject(QObject *object) Q_DECL_OVERRIDE; void reloadResourceProperties(); virtual QObject *object() const { return m_object; } - virtual QString currentPropertyName() const; + QString currentPropertyName() const Q_DECL_OVERRIDE; protected: diff --git a/src/designer/src/components/propertyeditor/qlonglongvalidator.h b/src/designer/src/components/propertyeditor/qlonglongvalidator.h index 71f5284fe..5e0756646 100644 --- a/src/designer/src/components/propertyeditor/qlonglongvalidator.h +++ b/src/designer/src/components/propertyeditor/qlonglongvalidator.h @@ -55,7 +55,7 @@ public: void setBottom(qlonglong); void setTop(qlonglong); - virtual void setRange(qlonglong bottom, qlonglong top); + void setRange(qlonglong bottom, qlonglong top); qlonglong bottom() const { return b; } qlonglong top() const { return t; } @@ -83,7 +83,7 @@ public: void setBottom(qulonglong); void setTop(qulonglong); - virtual void setRange(qulonglong bottom, qulonglong top); + void setRange(qulonglong bottom, qulonglong top); qulonglong bottom() const { return b; } qulonglong top() const { return t; } diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor.h b/src/designer/src/components/signalsloteditor/signalsloteditor.h index 2de1aca94..de7bb3c44 100644 --- a/src/designer/src/components/signalsloteditor/signalsloteditor.h +++ b/src/designer/src/components/signalsloteditor/signalsloteditor.h @@ -55,8 +55,8 @@ public: virtual void setSignal(SignalSlotConnection *con, const QString &member); virtual void setSlot(SignalSlotConnection *con, const QString &member); - virtual void setSource(Connection *con, const QString &obj_name); - virtual void setTarget(Connection *con, const QString &obj_name); + void setSource(Connection *con, const QString &obj_name) Q_DECL_OVERRIDE; + void setTarget(Connection *con, const QString &obj_name) Q_DECL_OVERRIDE; DomConnections *toUi() const; void fromUi(const DomConnections *connections, QWidget *parent); @@ -68,11 +68,11 @@ public: void addEmptyConnection(); protected: - virtual QWidget *widgetAt(const QPoint &pos) const; + QWidget *widgetAt(const QPoint &pos) const Q_DECL_OVERRIDE; private: - virtual Connection *createConnection(QWidget *source, QWidget *destination); - virtual void modifyConnection(Connection *con); + Connection *createConnection(QWidget *source, QWidget *destination) Q_DECL_OVERRIDE; + void modifyConnection(Connection *con) Q_DECL_OVERRIDE; QDesignerFormWindowInterface *m_form_window; bool m_showAllSignalsSlots; diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor_p.h b/src/designer/src/components/signalsloteditor/signalsloteditor_p.h index ee9cbec80..11514453f 100644 --- a/src/designer/src/components/signalsloteditor/signalsloteditor_p.h +++ b/src/designer/src/components/signalsloteditor/signalsloteditor_p.h @@ -99,12 +99,12 @@ public: virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; - virtual QModelIndex parent(const QModelIndex &child) const; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; - virtual int columnCount(const QModelIndex &parent = QModelIndex()) const; - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - virtual bool setData(const QModelIndex &index, const QVariant &data, int role = Qt::DisplayRole); - virtual Qt::ItemFlags flags(const QModelIndex &index) const; + QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + bool setData(const QModelIndex &index, const QVariant &data, int role = Qt::DisplayRole) Q_DECL_OVERRIDE; + Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; virtual QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.h b/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.h index a1594f69a..f9d8ba850 100644 --- a/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.h +++ b/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.h @@ -58,11 +58,11 @@ public: SignalSlotEditorPlugin(); virtual ~SignalSlotEditorPlugin(); - virtual bool isInitialized() const; - virtual void initialize(QDesignerFormEditorInterface *core); - virtual QAction *action() const; + bool isInitialized() const Q_DECL_OVERRIDE; + void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE; + QAction *action() const Q_DECL_OVERRIDE; - virtual QDesignerFormEditorInterface *core() const; + QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; public slots: void activeFormWindowChanged(QDesignerFormWindowInterface *formWindow); diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor_tool.h b/src/designer/src/components/signalsloteditor/signalsloteditor_tool.h index 2f466925e..edbc074ed 100644 --- a/src/designer/src/components/signalsloteditor/signalsloteditor_tool.h +++ b/src/designer/src/components/signalsloteditor/signalsloteditor_tool.h @@ -57,20 +57,20 @@ public: explicit SignalSlotEditorTool(QDesignerFormWindowInterface *formWindow, QObject *parent = 0); virtual ~SignalSlotEditorTool(); - virtual QDesignerFormEditorInterface *core() const; - virtual QDesignerFormWindowInterface *formWindow() const; + QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; + QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE; - virtual QWidget *editor() const; + QWidget *editor() const Q_DECL_OVERRIDE; QAction *action() const; 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; - virtual void saveToDom(DomUI *ui, QWidget *mainContainer); - virtual void loadFromDom(DomUI *ui, QWidget *mainContainer); + void saveToDom(DomUI *ui, QWidget *mainContainer) Q_DECL_OVERRIDE; + void loadFromDom(DomUI *ui, QWidget *mainContainer) Q_DECL_OVERRIDE; private: QDesignerFormWindowInterface *m_formWindow; diff --git a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp index c8628262f..ecc8a2d8a 100644 --- a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp +++ b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp @@ -418,7 +418,7 @@ public: int findText(const QString &text) const; - virtual Qt::ItemFlags flags(const QModelIndex &index) const; + Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; }; InlineEditorModel::InlineEditorModel(int rows, int cols, QObject *parent) diff --git a/src/designer/src/components/tabordereditor/tabordereditor.h b/src/designer/src/components/tabordereditor/tabordereditor.h index 3f45ef632..ab2b0fa63 100644 --- a/src/designer/src/components/tabordereditor/tabordereditor.h +++ b/src/designer/src/components/tabordereditor/tabordereditor.h @@ -68,13 +68,13 @@ private slots: void showTabOrderDialog(); protected: - virtual void paintEvent(QPaintEvent *e); - virtual void mouseMoveEvent(QMouseEvent *e); - virtual void mousePressEvent(QMouseEvent *e); - virtual void mouseDoubleClickEvent(QMouseEvent *e); - virtual void contextMenuEvent(QContextMenuEvent *e); - virtual void resizeEvent(QResizeEvent *e); - virtual void showEvent(QShowEvent *e); + void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; + void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; + void mouseDoubleClickEvent(QMouseEvent *e) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *e) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *e) Q_DECL_OVERRIDE; private: QRect indicatorRect(int index) const; diff --git a/src/designer/src/components/tabordereditor/tabordereditor_plugin.h b/src/designer/src/components/tabordereditor/tabordereditor_plugin.h index 40c5946f0..7003388dc 100644 --- a/src/designer/src/components/tabordereditor/tabordereditor_plugin.h +++ b/src/designer/src/components/tabordereditor/tabordereditor_plugin.h @@ -59,11 +59,11 @@ public: TabOrderEditorPlugin(); virtual ~TabOrderEditorPlugin(); - virtual bool isInitialized() const; - virtual void initialize(QDesignerFormEditorInterface *core); + bool isInitialized() const Q_DECL_OVERRIDE; + void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE; QAction *action() const; - virtual QDesignerFormEditorInterface *core() const; + QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; public slots: void activeFormWindowChanged(QDesignerFormWindowInterface *formWindow); diff --git a/src/designer/src/components/tabordereditor/tabordereditor_tool.h b/src/designer/src/components/tabordereditor/tabordereditor_tool.h index 1a0159ac6..958735e9a 100644 --- a/src/designer/src/components/tabordereditor/tabordereditor_tool.h +++ b/src/designer/src/components/tabordereditor/tabordereditor_tool.h @@ -57,16 +57,16 @@ public: explicit TabOrderEditorTool(QDesignerFormWindowInterface *formWindow, QObject *parent = 0); virtual ~TabOrderEditorTool(); - virtual QDesignerFormEditorInterface *core() const; - virtual QDesignerFormWindowInterface *formWindow() const; + QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; + QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE; - virtual QWidget *editor() const; - virtual QAction *action() const; + QWidget *editor() const Q_DECL_OVERRIDE; + 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; diff --git a/src/designer/src/components/taskmenu/button_taskmenu.cpp b/src/designer/src/components/taskmenu/button_taskmenu.cpp index 8489417d1..eaa56e980 100644 --- a/src/designer/src/components/taskmenu/button_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/button_taskmenu.cpp @@ -384,7 +384,7 @@ public: ButtonTextTaskMenuInlineEditor(QAbstractButton *button, QObject *parent); protected: - virtual QRect editRectangle() const; + QRect editRectangle() const Q_DECL_OVERRIDE; }; ButtonTextTaskMenuInlineEditor::ButtonTextTaskMenuInlineEditor(QAbstractButton *button, QObject *parent) : @@ -407,7 +407,7 @@ public: LinkDescriptionTaskMenuInlineEditor(QAbstractButton *button, QObject *parent); protected: - virtual QRect editRectangle() const; + QRect editRectangle() const Q_DECL_OVERRIDE; }; LinkDescriptionTaskMenuInlineEditor::LinkDescriptionTaskMenuInlineEditor(QAbstractButton *button, QObject *parent) : diff --git a/src/designer/src/components/taskmenu/button_taskmenu.h b/src/designer/src/components/taskmenu/button_taskmenu.h index d4d3d749f..6283e1341 100644 --- a/src/designer/src/components/taskmenu/button_taskmenu.h +++ b/src/designer/src/components/taskmenu/button_taskmenu.h @@ -88,8 +88,8 @@ class ButtonGroupTaskMenu : public QObject, public QDesignerTaskMenuExtension public: explicit ButtonGroupTaskMenu(QButtonGroup *buttonGroup, QObject *parent = 0); - virtual QAction *preferredEditAction() const; - virtual QList<QAction*> taskActions() const; + QAction *preferredEditAction() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const Q_DECL_OVERRIDE; private: QButtonGroup *m_buttonGroup; @@ -106,8 +106,8 @@ public: explicit ButtonTaskMenu(QAbstractButton *button, QObject *parent = 0); virtual ~ButtonTaskMenu(); - virtual QAction *preferredEditAction() const; - virtual QList<QAction*> taskActions() const; + QAction *preferredEditAction() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const Q_DECL_OVERRIDE; QAbstractButton *button() const; diff --git a/src/designer/src/components/taskmenu/combobox_taskmenu.h b/src/designer/src/components/taskmenu/combobox_taskmenu.h index 17a28faa0..eef27df3d 100644 --- a/src/designer/src/components/taskmenu/combobox_taskmenu.h +++ b/src/designer/src/components/taskmenu/combobox_taskmenu.h @@ -55,8 +55,8 @@ public: QObject *parent = 0); virtual ~ComboBoxTaskMenu(); - virtual QAction *preferredEditAction() const; - virtual QList<QAction*> taskActions() const; + QAction *preferredEditAction() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const Q_DECL_OVERRIDE; private slots: void editItems(); @@ -76,7 +76,7 @@ public: explicit ComboBoxTaskMenuFactory(const QString &iid, QExtensionManager *extensionManager); private: - virtual QComboBox *checkObject(QObject *qObject) const; + QComboBox *checkObject(QObject *qObject) const Q_DECL_OVERRIDE; }; } // namespace qdesigner_internal diff --git a/src/designer/src/components/taskmenu/containerwidget_taskmenu.h b/src/designer/src/components/taskmenu/containerwidget_taskmenu.h index 02ee7d300..bbbc8134f 100644 --- a/src/designer/src/components/taskmenu/containerwidget_taskmenu.h +++ b/src/designer/src/components/taskmenu/containerwidget_taskmenu.h @@ -64,8 +64,8 @@ public: explicit ContainerWidgetTaskMenu(QWidget *widget, ContainerType type, QObject *parent = 0); virtual ~ContainerWidgetTaskMenu(); - virtual QAction *preferredEditAction() const; - virtual QList<QAction*> taskActions() const; + QAction *preferredEditAction() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const Q_DECL_OVERRIDE; private slots: void removeCurrentPage(); @@ -104,7 +104,7 @@ class WizardContainerWidgetTaskMenu : public ContainerWidgetTaskMenu { public: explicit WizardContainerWidgetTaskMenu(QWizard *w, QObject *parent = 0); - virtual QList<QAction*> taskActions() const; + QList<QAction*> taskActions() const Q_DECL_OVERRIDE; private: QAction *m_nextAction; @@ -119,7 +119,7 @@ class MdiContainerWidgetTaskMenu : public ContainerWidgetTaskMenu { public: explicit MdiContainerWidgetTaskMenu(QMdiArea *m, QObject *parent = 0); - virtual QList<QAction*> taskActions() const; + QList<QAction*> taskActions() const Q_DECL_OVERRIDE; private: void initializeActions(); @@ -136,7 +136,7 @@ public: explicit ContainerWidgetTaskMenuFactory(QDesignerFormEditorInterface *core, QExtensionManager *extensionManager = 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/components/taskmenu/groupbox_taskmenu.cpp b/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp index 57856ecba..43f3eeebc 100644 --- a/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp @@ -51,7 +51,7 @@ public: GroupBoxTaskMenuInlineEditor(QGroupBox *button, QObject *parent); protected: - virtual QRect editRectangle() const; + QRect editRectangle() const Q_DECL_OVERRIDE; }; GroupBoxTaskMenuInlineEditor::GroupBoxTaskMenuInlineEditor(QGroupBox *w, QObject *parent) : diff --git a/src/designer/src/components/taskmenu/groupbox_taskmenu.h b/src/designer/src/components/taskmenu/groupbox_taskmenu.h index 861e4a09b..2101549f4 100644 --- a/src/designer/src/components/taskmenu/groupbox_taskmenu.h +++ b/src/designer/src/components/taskmenu/groupbox_taskmenu.h @@ -53,8 +53,8 @@ class GroupBoxTaskMenu: public QDesignerTaskMenu public: explicit GroupBoxTaskMenu(QGroupBox *groupbox, QObject *parent = 0); - virtual QAction *preferredEditAction() const; - virtual QList<QAction*> taskActions() const; + QAction *preferredEditAction() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const Q_DECL_OVERRIDE; private: QAction *m_editTitleAction; diff --git a/src/designer/src/components/taskmenu/inplace_widget_helper.h b/src/designer/src/components/taskmenu/inplace_widget_helper.h index c2b6382e1..a34ca462d 100644 --- a/src/designer/src/components/taskmenu/inplace_widget_helper.h +++ b/src/designer/src/components/taskmenu/inplace_widget_helper.h @@ -62,7 +62,7 @@ namespace qdesigner_internal { InPlaceWidgetHelper(QWidget *editorWidget, QWidget *parentWidget, QDesignerFormWindowInterface *fw); virtual ~InPlaceWidgetHelper(); - virtual bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; // returns a recommended alignment for the editor widget determined from the parent. Qt::Alignment alignment() const; diff --git a/src/designer/src/components/taskmenu/itemlisteditor.h b/src/designer/src/components/taskmenu/itemlisteditor.h index da8fa3179..73f3f230b 100644 --- a/src/designer/src/components/taskmenu/itemlisteditor.h +++ b/src/designer/src/components/taskmenu/itemlisteditor.h @@ -139,8 +139,8 @@ private slots: void cacheReloaded(); protected: - virtual void setItemData(int role, const QVariant &v); - virtual QVariant getItemData(int role) const; + void setItemData(int role, const QVariant &v) Q_DECL_OVERRIDE; + QVariant getItemData(int role) const Q_DECL_OVERRIDE; private: void setPropertyBrowserVisible(bool v); diff --git a/src/designer/src/components/taskmenu/label_taskmenu.cpp b/src/designer/src/components/taskmenu/label_taskmenu.cpp index 3f26e3f71..ed50fed23 100644 --- a/src/designer/src/components/taskmenu/label_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/label_taskmenu.cpp @@ -54,7 +54,7 @@ public: LabelTaskMenuInlineEditor(QLabel *button, QObject *parent); protected: - virtual QRect editRectangle() const; + QRect editRectangle() const Q_DECL_OVERRIDE; }; LabelTaskMenuInlineEditor::LabelTaskMenuInlineEditor(QLabel *w, QObject *parent) : diff --git a/src/designer/src/components/taskmenu/label_taskmenu.h b/src/designer/src/components/taskmenu/label_taskmenu.h index ecaefcc36..2e898355c 100644 --- a/src/designer/src/components/taskmenu/label_taskmenu.h +++ b/src/designer/src/components/taskmenu/label_taskmenu.h @@ -52,8 +52,8 @@ class LabelTaskMenu: public QDesignerTaskMenu public: explicit LabelTaskMenu(QLabel *button, QObject *parent = 0); - virtual QAction *preferredEditAction() const; - virtual QList<QAction*> taskActions() const; + QAction *preferredEditAction() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const Q_DECL_OVERRIDE; private slots: void editRichText(); diff --git a/src/designer/src/components/taskmenu/layouttaskmenu.h b/src/designer/src/components/taskmenu/layouttaskmenu.h index 1c49e78c4..e35068966 100644 --- a/src/designer/src/components/taskmenu/layouttaskmenu.h +++ b/src/designer/src/components/taskmenu/layouttaskmenu.h @@ -55,8 +55,8 @@ class LayoutWidgetTaskMenu : public QObject, public QDesignerTaskMenuExtension public: explicit LayoutWidgetTaskMenu(QLayoutWidget *w, QObject *parent = 0); - virtual QAction *preferredEditAction() const; - virtual QList<QAction*> taskActions() const; + QAction *preferredEditAction() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const Q_DECL_OVERRIDE; private: QLayoutWidget *m_widget; @@ -72,8 +72,8 @@ class SpacerTaskMenu : public QObject, public QDesignerTaskMenuExtension public: explicit SpacerTaskMenu(Spacer *bar, QObject *parent = 0); - virtual QAction *preferredEditAction() const; - virtual QList<QAction*> taskActions() const; + QAction *preferredEditAction() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const Q_DECL_OVERRIDE; }; diff --git a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp index c107ea43b..d8403e389 100644 --- a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp @@ -51,7 +51,7 @@ public: LineEditTaskMenuInlineEditor(QLineEdit *button, QObject *parent); protected: - virtual QRect editRectangle() const; + QRect editRectangle() const Q_DECL_OVERRIDE; }; LineEditTaskMenuInlineEditor::LineEditTaskMenuInlineEditor(QLineEdit *w, QObject *parent) : diff --git a/src/designer/src/components/taskmenu/lineedit_taskmenu.h b/src/designer/src/components/taskmenu/lineedit_taskmenu.h index 65dac06e2..a9b36c3fd 100644 --- a/src/designer/src/components/taskmenu/lineedit_taskmenu.h +++ b/src/designer/src/components/taskmenu/lineedit_taskmenu.h @@ -50,8 +50,8 @@ class LineEditTaskMenu: public QDesignerTaskMenu public: explicit LineEditTaskMenu(QLineEdit *button, QObject *parent = 0); - virtual QAction *preferredEditAction() const; - virtual QList<QAction*> taskActions() const; + QAction *preferredEditAction() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const Q_DECL_OVERRIDE; private: QList<QAction*> m_taskActions; diff --git a/src/designer/src/components/taskmenu/listwidget_taskmenu.h b/src/designer/src/components/taskmenu/listwidget_taskmenu.h index b3e48256b..676ae838a 100644 --- a/src/designer/src/components/taskmenu/listwidget_taskmenu.h +++ b/src/designer/src/components/taskmenu/listwidget_taskmenu.h @@ -54,8 +54,8 @@ public: explicit ListWidgetTaskMenu(QListWidget *button, QObject *parent = 0); virtual ~ListWidgetTaskMenu(); - virtual QAction *preferredEditAction() const; - virtual QList<QAction*> taskActions() const; + QAction *preferredEditAction() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const Q_DECL_OVERRIDE; private slots: void editItems(); diff --git a/src/designer/src/components/taskmenu/menutaskmenu.h b/src/designer/src/components/taskmenu/menutaskmenu.h index 4fe52f79e..3be58c66e 100644 --- a/src/designer/src/components/taskmenu/menutaskmenu.h +++ b/src/designer/src/components/taskmenu/menutaskmenu.h @@ -59,8 +59,8 @@ class MenuTaskMenu : public QObject, public QDesignerTaskMenuExtension public: explicit MenuTaskMenu(QDesignerMenu *menu, QObject *parent = 0); - virtual QAction *preferredEditAction() const; - virtual QList<QAction*> taskActions() const; + QAction *preferredEditAction() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const Q_DECL_OVERRIDE; private slots: void removeMenu(); @@ -81,8 +81,8 @@ class MenuBarTaskMenu : public QObject, public QDesignerTaskMenuExtension public: explicit MenuBarTaskMenu(QDesignerMenuBar *bar, QObject *parent = 0); - virtual QAction *preferredEditAction() const; - virtual QList<QAction*> taskActions() const; + QAction *preferredEditAction() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const Q_DECL_OVERRIDE; private: QDesignerMenuBar *m_bar; diff --git a/src/designer/src/components/taskmenu/tablewidget_taskmenu.h b/src/designer/src/components/taskmenu/tablewidget_taskmenu.h index a3fa5500c..ebff75f39 100644 --- a/src/designer/src/components/taskmenu/tablewidget_taskmenu.h +++ b/src/designer/src/components/taskmenu/tablewidget_taskmenu.h @@ -54,8 +54,8 @@ public: explicit TableWidgetTaskMenu(QTableWidget *button, QObject *parent = 0); virtual ~TableWidgetTaskMenu(); - virtual QAction *preferredEditAction() const; - virtual QList<QAction*> taskActions() const; + QAction *preferredEditAction() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const Q_DECL_OVERRIDE; private slots: void editItems(); diff --git a/src/designer/src/components/taskmenu/tablewidgeteditor.h b/src/designer/src/components/taskmenu/tablewidgeteditor.h index cfc27d78f..55ce37a62 100644 --- a/src/designer/src/components/taskmenu/tablewidgeteditor.h +++ b/src/designer/src/components/taskmenu/tablewidgeteditor.h @@ -85,8 +85,8 @@ private slots: void cacheReloaded(); protected: - virtual void setItemData(int role, const QVariant &v); - virtual QVariant getItemData(int role) const; + void setItemData(int role, const QVariant &v) Q_DECL_OVERRIDE; + QVariant getItemData(int role) const Q_DECL_OVERRIDE; private: void setPropertyBrowserVisible(bool v); diff --git a/src/designer/src/components/taskmenu/textedit_taskmenu.h b/src/designer/src/components/taskmenu/textedit_taskmenu.h index 3012e8eda..a18a6c075 100644 --- a/src/designer/src/components/taskmenu/textedit_taskmenu.h +++ b/src/designer/src/components/taskmenu/textedit_taskmenu.h @@ -55,8 +55,8 @@ public: virtual ~TextEditTaskMenu(); - virtual QAction *preferredEditAction() const; - virtual QList<QAction*> taskActions() const; + QAction *preferredEditAction() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const Q_DECL_OVERRIDE; private slots: void editText(); diff --git a/src/designer/src/components/taskmenu/toolbar_taskmenu.h b/src/designer/src/components/taskmenu/toolbar_taskmenu.h index 42eb03518..7ed9c2d14 100644 --- a/src/designer/src/components/taskmenu/toolbar_taskmenu.h +++ b/src/designer/src/components/taskmenu/toolbar_taskmenu.h @@ -54,8 +54,8 @@ class ToolBarTaskMenu : public QObject, public QDesignerTaskMenuExtension public: explicit ToolBarTaskMenu(QToolBar *tb, QObject *parent = 0); - virtual QAction *preferredEditAction() const; - virtual QList<QAction*> taskActions() const; + QAction *preferredEditAction() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const Q_DECL_OVERRIDE; private: QToolBar *m_toolBar; @@ -69,8 +69,8 @@ class StatusBarTaskMenu : public QObject, public QDesignerTaskMenuExtension public: explicit StatusBarTaskMenu(QStatusBar *tb, QObject *parent = 0); - virtual QAction *preferredEditAction() const; - virtual QList<QAction*> taskActions() const; + QAction *preferredEditAction() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const Q_DECL_OVERRIDE; private slots: void removeStatusBar(); diff --git a/src/designer/src/components/taskmenu/treewidget_taskmenu.h b/src/designer/src/components/taskmenu/treewidget_taskmenu.h index 4919cb2fc..73eb127ae 100644 --- a/src/designer/src/components/taskmenu/treewidget_taskmenu.h +++ b/src/designer/src/components/taskmenu/treewidget_taskmenu.h @@ -54,8 +54,8 @@ public: explicit TreeWidgetTaskMenu(QTreeWidget *button, QObject *parent = 0); virtual ~TreeWidgetTaskMenu(); - virtual QAction *preferredEditAction() const; - virtual QList<QAction*> taskActions() const; + QAction *preferredEditAction() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const Q_DECL_OVERRIDE; private slots: void editItems(); diff --git a/src/designer/src/components/taskmenu/treewidgeteditor.h b/src/designer/src/components/taskmenu/treewidgeteditor.h index 6d4709ec1..e18a62d4a 100644 --- a/src/designer/src/components/taskmenu/treewidgeteditor.h +++ b/src/designer/src/components/taskmenu/treewidgeteditor.h @@ -83,8 +83,8 @@ private slots: void cacheReloaded(); protected: - virtual void setItemData(int role, const QVariant &v); - virtual QVariant getItemData(int role) const; + void setItemData(int role, const QVariant &v) Q_DECL_OVERRIDE; + QVariant getItemData(int role) const Q_DECL_OVERRIDE; private: void setPropertyBrowserVisible(bool v); diff --git a/src/designer/src/components/widgetbox/widgetbox.cpp b/src/designer/src/components/widgetbox/widgetbox.cpp index 034b085df..5ed22b719 100644 --- a/src/designer/src/components/widgetbox/widgetbox.cpp +++ b/src/designer/src/components/widgetbox/widgetbox.cpp @@ -64,8 +64,8 @@ public: { setFocusPolicy(Qt::NoFocus); } protected: - virtual void mousePressEvent(QMouseEvent *event); - virtual void focusInEvent(QFocusEvent *e); + void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *e) Q_DECL_OVERRIDE; private: const Qt::FocusPolicy m_defaultFocusPolicy; diff --git a/src/designer/src/components/widgetbox/widgetbox.h b/src/designer/src/components/widgetbox/widgetbox.h index 1ec9cec74..49f028d65 100644 --- a/src/designer/src/components/widgetbox/widgetbox.h +++ b/src/designer/src/components/widgetbox/widgetbox.h @@ -55,30 +55,30 @@ public: QDesignerFormEditorInterface *core() const; - virtual int categoryCount() const; - virtual Category category(int cat_idx) const; - virtual void addCategory(const Category &cat); - virtual void removeCategory(int cat_idx); + int categoryCount() const Q_DECL_OVERRIDE; + Category category(int cat_idx) const Q_DECL_OVERRIDE; + void addCategory(const Category &cat) Q_DECL_OVERRIDE; + void removeCategory(int cat_idx) Q_DECL_OVERRIDE; - virtual int widgetCount(int cat_idx) const; - virtual Widget widget(int cat_idx, int wgt_idx) const; - virtual void addWidget(int cat_idx, const Widget &wgt); - virtual void removeWidget(int cat_idx, int wgt_idx); + int widgetCount(int cat_idx) const Q_DECL_OVERRIDE; + Widget widget(int cat_idx, int wgt_idx) const Q_DECL_OVERRIDE; + void addWidget(int cat_idx, const Widget &wgt) Q_DECL_OVERRIDE; + void removeWidget(int cat_idx, int wgt_idx) Q_DECL_OVERRIDE; void dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, const QPoint &global_mouse_pos); - virtual void setFileName(const QString &file_name); - virtual QString fileName() const; + void setFileName(const QString &file_name) Q_DECL_OVERRIDE; + QString fileName() const Q_DECL_OVERRIDE; virtual bool load(); virtual bool save(); - virtual bool loadContents(const QString &contents); - virtual QIcon iconForWidget(const QString &className, const QString &category = QString()) const; + bool loadContents(const QString &contents) Q_DECL_OVERRIDE; + QIcon iconForWidget(const QString &className, const QString &category = QString()) const Q_DECL_OVERRIDE; protected: - virtual void dragEnterEvent (QDragEnterEvent * event); - virtual void dragMoveEvent(QDragMoveEvent * event); - virtual void dropEvent (QDropEvent * event); + void dragEnterEvent (QDragEnterEvent * event) Q_DECL_OVERRIDE; + void dragMoveEvent(QDragMoveEvent * event) Q_DECL_OVERRIDE; + void dropEvent (QDropEvent * event) Q_DECL_OVERRIDE; private slots: void handleMousePress(const QString &name, const QString &xml, const QPoint &global_mouse_pos); diff --git a/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp b/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp index 70b2127bc..8cc99c88f 100644 --- a/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp +++ b/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp @@ -75,9 +75,9 @@ public: protected: - virtual QWidget *create(DomWidget *ui_widget, QWidget *parents); - virtual QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name); - virtual void createCustomWidgets(DomCustomWidgets *); + QWidget *create(DomWidget *ui_widget, QWidget *parents) Q_DECL_OVERRIDE; + QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name) Q_DECL_OVERRIDE; + void createCustomWidgets(DomCustomWidgets *) Q_DECL_OVERRIDE; }; WidgetBoxResource::WidgetBoxResource(QDesignerFormEditorInterface *core) : diff --git a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp index cc0f62bee..db04cfbc4 100644 --- a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp +++ b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp @@ -118,11 +118,11 @@ public: explicit WidgetBoxCategoryModel(QDesignerFormEditorInterface *core, QObject *parent = 0); // QAbstractListModel - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; - virtual bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole); - virtual Qt::ItemFlags flags (const QModelIndex & index ) const; - virtual bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()); + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole) Q_DECL_OVERRIDE; + Qt::ItemFlags flags (const QModelIndex & index ) const Q_DECL_OVERRIDE; + bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; // The model returns no text in icon mode, so, it also needs to know it QListView::ViewMode viewMode() const; |