diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-20 20:57:47 +0200 |
|---|---|---|
| committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-22 07:33:13 +0000 |
| commit | fdf1613fd9d059b5cbfddbf0dd9a76a8d2e23b26 (patch) | |
| tree | c25f693010cc064c768c55313785d4209d09c769 /src/designer | |
| parent | c2f48cd9e8eeafda8fb52c59840bccc3e9c60de5 (diff) | |
| download | qttools-fdf1613fd9d059b5cbfddbf0dd9a76a8d2e23b26.tar.gz | |
Replace Q_DECL_OVERRIDE with override
Change-Id: I1b8b338a6bc2f3c87af62c20ff1428096b309628
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/designer')
125 files changed, 824 insertions, 824 deletions
diff --git a/src/designer/src/components/buddyeditor/buddyeditor.h b/src/designer/src/components/buddyeditor/buddyeditor.h index cd7e701b6..3deeb9d2b 100644 --- a/src/designer/src/components/buddyeditor/buddyeditor.h +++ b/src/designer/src/components/buddyeditor/buddyeditor.h @@ -51,19 +51,19 @@ public: BuddyEditor(QDesignerFormWindowInterface *form, QWidget *parent); QDesignerFormWindowInterface *formWindow() const; - void setBackground(QWidget *background) Q_DECL_OVERRIDE; - void deleteSelected() Q_DECL_OVERRIDE; + void setBackground(QWidget *background) override; + void deleteSelected() override; public slots: - void updateBackground() Q_DECL_OVERRIDE; - void widgetRemoved(QWidget *w) Q_DECL_OVERRIDE; + void updateBackground() override; + void widgetRemoved(QWidget *w) override; void autoBuddy(); protected: - 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; + QWidget *widgetAt(const QPoint &pos) const override; + Connection *createConnection(QWidget *source, QWidget *destination) override; + void endConnection(QWidget *target, const QPoint &pos) override; + void createContextMenu(QMenu &menu) 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 77d6b3861..338489ce2 100644 --- a/src/designer/src/components/buddyeditor/buddyeditor_plugin.h +++ b/src/designer/src/components/buddyeditor/buddyeditor_plugin.h @@ -54,11 +54,11 @@ public: BuddyEditorPlugin(); virtual ~BuddyEditorPlugin(); - bool isInitialized() const Q_DECL_OVERRIDE; - void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE; - QAction *action() const Q_DECL_OVERRIDE; + bool isInitialized() const override; + void initialize(QDesignerFormEditorInterface *core) override; + QAction *action() const override; - QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; + QDesignerFormEditorInterface *core() const 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 7612e48c8..9b27a5df9 100644 --- a/src/designer/src/components/buddyeditor/buddyeditor_tool.h +++ b/src/designer/src/components/buddyeditor/buddyeditor_tool.h @@ -52,16 +52,16 @@ public: explicit BuddyEditorTool(QDesignerFormWindowInterface *formWindow, QObject *parent = 0); virtual ~BuddyEditorTool(); - QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; - QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE; + QDesignerFormEditorInterface *core() const override; + QDesignerFormWindowInterface *formWindow() const override; - QWidget *editor() const Q_DECL_OVERRIDE; - QAction *action() const Q_DECL_OVERRIDE; + QWidget *editor() const override; + QAction *action() const override; - void activated() Q_DECL_OVERRIDE; - void deactivated() Q_DECL_OVERRIDE; + void activated() override; + void deactivated() override; - bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event) Q_DECL_OVERRIDE; + bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event) 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 8eb4f3d60..f8ef9421d 100644 --- a/src/designer/src/components/formeditor/default_actionprovider.h +++ b/src/designer/src/components/formeditor/default_actionprovider.h @@ -49,7 +49,7 @@ protected: explicit ActionProviderBase(QWidget *widget); public: - void adjustIndicator(const QPoint &pos) Q_DECL_OVERRIDE; + void adjustIndicator(const QPoint &pos) override; virtual Qt::Orientation orientation() const = 0; protected: @@ -66,12 +66,12 @@ class QT_FORMEDITOR_EXPORT QToolBarActionProvider: public QObject, public Action public: explicit QToolBarActionProvider(QToolBar *widget, QObject *parent = 0); - QRect actionGeometry(QAction *action) const Q_DECL_OVERRIDE; - QAction *actionAt(const QPoint &pos) const Q_DECL_OVERRIDE; - Qt::Orientation orientation() const Q_DECL_OVERRIDE; + QRect actionGeometry(QAction *action) const override; + QAction *actionAt(const QPoint &pos) const override; + Qt::Orientation orientation() const override; protected: - QRect indicatorGeometry(const QPoint &pos, Qt::LayoutDirection layoutDirection) const Q_DECL_OVERRIDE; + QRect indicatorGeometry(const QPoint &pos, Qt::LayoutDirection layoutDirection) const override; private: QToolBar *m_widget; @@ -84,9 +84,9 @@ class QT_FORMEDITOR_EXPORT QMenuBarActionProvider: public QObject, public Action public: explicit QMenuBarActionProvider(QMenuBar *widget, QObject *parent = 0); - QRect actionGeometry(QAction *action) const Q_DECL_OVERRIDE; - QAction *actionAt(const QPoint &pos) const Q_DECL_OVERRIDE; - Qt::Orientation orientation() const Q_DECL_OVERRIDE; + QRect actionGeometry(QAction *action) const override; + QAction *actionAt(const QPoint &pos) const override; + Qt::Orientation orientation() const override; private: QMenuBar *m_widget; @@ -99,9 +99,9 @@ class QT_FORMEDITOR_EXPORT QMenuActionProvider: public QObject, public ActionPro public: explicit QMenuActionProvider(QMenu *widget, QObject *parent = 0); - QRect actionGeometry(QAction *action) const Q_DECL_OVERRIDE; - QAction *actionAt(const QPoint &pos) const Q_DECL_OVERRIDE; - Qt::Orientation orientation() const Q_DECL_OVERRIDE; + QRect actionGeometry(QAction *action) const override; + QAction *actionAt(const QPoint &pos) const override; + Qt::Orientation orientation() const override; private: QMenu *m_widget; diff --git a/src/designer/src/components/formeditor/default_container.h b/src/designer/src/components/formeditor/default_container.h index 772c166ee..c0af7ded1 100644 --- a/src/designer/src/components/formeditor/default_container.h +++ b/src/designer/src/components/formeditor/default_container.h @@ -51,15 +51,15 @@ class QStackedWidgetContainer: public QObject, public QDesignerContainerExtensio public: explicit QStackedWidgetContainer(QStackedWidget *widget, QObject *parent = 0); - int count() const Q_DECL_OVERRIDE { return m_widget->count(); } - QWidget *widget(int index) const Q_DECL_OVERRIDE { return m_widget->widget(index); } + int count() const override { return m_widget->count(); } + QWidget *widget(int index) const override { return m_widget->widget(index); } - int currentIndex() const Q_DECL_OVERRIDE { return m_widget->currentIndex(); } - void setCurrentIndex(int index) Q_DECL_OVERRIDE; + int currentIndex() const override { return m_widget->currentIndex(); } + void setCurrentIndex(int index) override; - void addWidget(QWidget *widget) Q_DECL_OVERRIDE; - void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE; - void remove(int index) Q_DECL_OVERRIDE; + void addWidget(QWidget *widget) override; + void insertWidget(int index, QWidget *widget) override; + void remove(int index) override; private: QStackedWidget *m_widget; @@ -73,15 +73,15 @@ class QTabWidgetContainer: public QObject, public QDesignerContainerExtension public: explicit QTabWidgetContainer(QTabWidget *widget, QObject *parent = 0); - int count() const Q_DECL_OVERRIDE { return m_widget->count(); } - QWidget *widget(int index) const Q_DECL_OVERRIDE { return m_widget->widget(index); } + int count() const override { return m_widget->count(); } + QWidget *widget(int index) const override { return m_widget->widget(index); } - int currentIndex() const Q_DECL_OVERRIDE { return m_widget->currentIndex(); } - void setCurrentIndex(int index) Q_DECL_OVERRIDE; + int currentIndex() const override { return m_widget->currentIndex(); } + void setCurrentIndex(int index) override; - void addWidget(QWidget *widget) Q_DECL_OVERRIDE; - void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE; - void remove(int index) Q_DECL_OVERRIDE; + void addWidget(QWidget *widget) override; + void insertWidget(int index, QWidget *widget) override; + void remove(int index) override; private: QTabWidget *m_widget; @@ -95,15 +95,15 @@ class QToolBoxContainer: public QObject, public QDesignerContainerExtension public: explicit QToolBoxContainer(QToolBox *widget, QObject *parent = 0); - int count() const Q_DECL_OVERRIDE { return m_widget->count(); } - QWidget *widget(int index) const Q_DECL_OVERRIDE { return m_widget->widget(index); } + int count() const override { return m_widget->count(); } + QWidget *widget(int index) const override { return m_widget->widget(index); } - int currentIndex() const Q_DECL_OVERRIDE { return m_widget->currentIndex(); } - void setCurrentIndex(int index) Q_DECL_OVERRIDE; + int currentIndex() const override { return m_widget->currentIndex(); } + void setCurrentIndex(int index) override; - void addWidget(QWidget *widget) Q_DECL_OVERRIDE; - void insertWidget(int index, QWidget *widget) Q_DECL_OVERRIDE; - void remove(int index) Q_DECL_OVERRIDE; + void addWidget(QWidget *widget) override; + void insertWidget(int index, QWidget *widget) override; + void remove(int index) override; private: QToolBox *m_widget; @@ -118,16 +118,16 @@ class SingleChildContainer: public QDesignerContainerExtension protected: explicit SingleChildContainer(Container *widget, bool active = true); public: - 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 {} - - bool canAddWidget() const Q_DECL_OVERRIDE { return false; } - bool canRemove(int) const Q_DECL_OVERRIDE { return false; } + int count() const override; + QWidget *widget(int index) const override; + int currentIndex() const override; + void setCurrentIndex(int /*index*/) override {} + void addWidget(QWidget *widget) override; + void insertWidget(int index, QWidget *widget) override; + void remove(int /*index*/) override {} + + bool canAddWidget() const override { return false; } + bool canRemove(int) const override { return false; } private: const bool m_active; diff --git a/src/designer/src/components/formeditor/default_layoutdecoration.h b/src/designer/src/components/formeditor/default_layoutdecoration.h index 3fcf7590d..674056578 100644 --- a/src/designer/src/components/formeditor/default_layoutdecoration.h +++ b/src/designer/src/components/formeditor/default_layoutdecoration.h @@ -46,7 +46,7 @@ public: explicit QDesignerLayoutDecorationFactory(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; }; } // namespace qdesigner_internal diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp index 15b88f0a4..b03be6c82 100644 --- a/src/designer/src/components/formeditor/formwindow.cpp +++ b/src/designer/src/components/formeditor/formwindow.cpp @@ -1472,7 +1472,7 @@ public: QDesignerPropertySheetExtension *s, int i) : PropertyHelper(o, sp, s, i) {} - Value setValue(QDesignerFormWindowInterface *fw, const QVariant &value, bool changed, unsigned subPropertyMask) Q_DECL_OVERRIDE; + Value setValue(QDesignerFormWindowInterface *fw, const QVariant &value, bool changed, unsigned subPropertyMask) override; }; PropertyHelper::Value ArrowKeyPropertyHelper::setValue(QDesignerFormWindowInterface *fw, const QVariant &value, bool changed, unsigned subPropertyMask) @@ -1496,9 +1496,9 @@ public: protected: PropertyHelper *createPropertyHelper(QObject *o, SpecialProperty sp, - QDesignerPropertySheetExtension *s, int i) const Q_DECL_OVERRIDE + QDesignerPropertySheetExtension *s, int i) const override { return new ArrowKeyPropertyHelper(o, sp, s, i); } - QVariant mergeValue(const QVariant &newValue) Q_DECL_OVERRIDE; + QVariant mergeValue(const QVariant &newValue) override; }; ArrowKeyPropertyCommand::ArrowKeyPropertyCommand(QDesignerFormWindowInterface *fw, diff --git a/src/designer/src/components/formeditor/formwindow.h b/src/designer/src/components/formeditor/formwindow.h index aca354728..d535134bd 100644 --- a/src/designer/src/components/formeditor/formwindow.h +++ b/src/designer/src/components/formeditor/formwindow.h @@ -80,55 +80,55 @@ public: explicit FormWindow(FormEditor *core, QWidget *parent = 0, Qt::WindowFlags flags = 0); virtual ~FormWindow(); - QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; + QDesignerFormEditorInterface *core() const override; - QDesignerFormWindowCursorInterface *cursor() const Q_DECL_OVERRIDE; + QDesignerFormWindowCursorInterface *cursor() const override; // Overwritten: FormWindowBase - QWidget *formContainer() const Q_DECL_OVERRIDE; + QWidget *formContainer() const override; - 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; + int toolCount() const override; + int currentTool() const override; + void setCurrentTool(int index) override; + QDesignerFormWindowToolInterface *tool(int index) const override; + void registerTool(QDesignerFormWindowToolInterface *tool) override; - QString author() const Q_DECL_OVERRIDE; - void setAuthor(const QString &author) Q_DECL_OVERRIDE; + QString author() const override; + void setAuthor(const QString &author) override; - QString comment() const Q_DECL_OVERRIDE; - void setComment(const QString &comment) Q_DECL_OVERRIDE; + QString comment() const override; + void setComment(const QString &comment) override; - void layoutDefault(int *margin, int *spacing) Q_DECL_OVERRIDE; - void setLayoutDefault(int margin, int spacing) Q_DECL_OVERRIDE; + void layoutDefault(int *margin, int *spacing) override; + void setLayoutDefault(int margin, int spacing) override; - void layoutFunction(QString *margin, QString *spacing) Q_DECL_OVERRIDE; - void setLayoutFunction(const QString &margin, const QString &spacing) Q_DECL_OVERRIDE; + void layoutFunction(QString *margin, QString *spacing) override; + void setLayoutFunction(const QString &margin, const QString &spacing) override; - QString pixmapFunction() const Q_DECL_OVERRIDE; - void setPixmapFunction(const QString &pixmapFunction) Q_DECL_OVERRIDE; + QString pixmapFunction() const override; + void setPixmapFunction(const QString &pixmapFunction) override; - QString exportMacro() const Q_DECL_OVERRIDE; - void setExportMacro(const QString &exportMacro) Q_DECL_OVERRIDE; + QString exportMacro() const override; + void setExportMacro(const QString &exportMacro) override; - QStringList includeHints() const Q_DECL_OVERRIDE; - void setIncludeHints(const QStringList &includeHints) Q_DECL_OVERRIDE; + QStringList includeHints() const override; + void setIncludeHints(const QStringList &includeHints) override; - QString fileName() const Q_DECL_OVERRIDE; - void setFileName(const QString &fileName) Q_DECL_OVERRIDE; + QString fileName() const override; + void setFileName(const QString &fileName) override; - QString contents() const Q_DECL_OVERRIDE; - bool setContents(QIODevice *dev, QString *errorMessage = 0) Q_DECL_OVERRIDE; - bool setContents(const QString &) Q_DECL_OVERRIDE; + QString contents() const override; + bool setContents(QIODevice *dev, QString *errorMessage = 0) override; + bool setContents(const QString &) override; - QDir absoluteDir() const Q_DECL_OVERRIDE; + QDir absoluteDir() const override; - void simplifySelection(QWidgetList *sel) const Q_DECL_OVERRIDE; + void simplifySelection(QWidgetList *sel) const override; - void ensureUniqueObjectName(QObject *object) Q_DECL_OVERRIDE; + void ensureUniqueObjectName(QObject *object) override; - QWidget *mainContainer() const Q_DECL_OVERRIDE; - void setMainContainer(QWidget *mainContainer) Q_DECL_OVERRIDE; + QWidget *mainContainer() const override; + void setMainContainer(QWidget *mainContainer) override; bool isMainContainer(const QWidget *w) const; QWidget *currentWidget() const; @@ -136,9 +136,9 @@ public: bool hasInsertedChildren(QWidget *w) const; QWidgetList selectedWidgets() const; - void clearSelection(bool changePropertyDisplay = true) Q_DECL_OVERRIDE; + void clearSelection(bool changePropertyDisplay = true) override; bool isWidgetSelected(QWidget *w) const; - void selectWidget(QWidget *w, bool select = true) Q_DECL_OVERRIDE; + void selectWidget(QWidget *w, bool select = true) override; void selectWidgets(); void repaintSelection(); @@ -155,56 +155,56 @@ public: QWidget *createWidget(DomUI *ui, const QRect &rect, QWidget *target); - bool isManaged(QWidget *w) const Q_DECL_OVERRIDE; + bool isManaged(QWidget *w) const override; - void manageWidget(QWidget *w) Q_DECL_OVERRIDE; - void unmanageWidget(QWidget *w) Q_DECL_OVERRIDE; + void manageWidget(QWidget *w) override; + void unmanageWidget(QWidget *w) override; - QUndoStack *commandHistory() const Q_DECL_OVERRIDE; - void beginCommand(const QString &description) Q_DECL_OVERRIDE; - void endCommand() Q_DECL_OVERRIDE; + QUndoStack *commandHistory() const override; + void beginCommand(const QString &description) override; + void endCommand() override; - bool blockSelectionChanged(bool blocked) Q_DECL_OVERRIDE; - void emitSelectionChanged() Q_DECL_OVERRIDE; + bool blockSelectionChanged(bool blocked) override; + void emitSelectionChanged() override; bool unify(QObject *w, QString &s, bool changeIt); - bool isDirty() const Q_DECL_OVERRIDE; - void setDirty(bool dirty) Q_DECL_OVERRIDE; + bool isDirty() const override; + void setDirty(bool dirty) override; static FormWindow *findFormWindow(QWidget *w); virtual QWidget *containerAt(const QPoint &pos); - QWidget *widgetAt(const QPoint &pos) Q_DECL_OVERRIDE; - void highlightWidget(QWidget *w, const QPoint &pos, HighlightMode mode = Highlight) Q_DECL_OVERRIDE; + QWidget *widgetAt(const QPoint &pos) override; + void highlightWidget(QWidget *w, const QPoint &pos, HighlightMode mode = Highlight) override; void updateOrderIndicators(); bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event); - QStringList resourceFiles() const Q_DECL_OVERRIDE; - void addResourceFile(const QString &path) Q_DECL_OVERRIDE; - void removeResourceFile(const QString &path) Q_DECL_OVERRIDE; + QStringList resourceFiles() const override; + void addResourceFile(const QString &path) override; + void removeResourceFile(const QString &path) override; void resizeWidget(QWidget *widget, const QRect &geometry); bool dropDockWidget(QDesignerDnDItemInterface *item, const QPoint &global_mouse_pos); bool dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, QWidget *target, - const QPoint &global_mouse_pos) Q_DECL_OVERRIDE; + const QPoint &global_mouse_pos) override; - QWidget *findContainer(QWidget *w, bool excludeLayout) const Q_DECL_OVERRIDE; + QWidget *findContainer(QWidget *w, bool excludeLayout) const override; // for WidgetSelection only. QWidget *designerWidget(QWidget *w) const; // Initialize and return a popup menu for a managed widget - QMenu *initializePopupMenu(QWidget *managedWidget) Q_DECL_OVERRIDE; + QMenu *initializePopupMenu(QWidget *managedWidget) override; #ifndef QT_NO_CLIPBOARD - void paste(PasteMode pasteMode) Q_DECL_OVERRIDE; + void paste(PasteMode pasteMode) override; #endif - virtual QEditorFormBuilder *createFormBuilder() Q_DECL_OVERRIDE; + QEditorFormBuilder *createFormBuilder() override; - bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *watched, QEvent *event) override; HandleOperation handleOperation() const { return m_handleOperation; } void setHandleOperation(HandleOperation o) { m_handleOperation = o; } @@ -231,7 +231,7 @@ public slots: protected: virtual QMenu *createPopupMenu(QWidget *w); - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *e) override; void insertWidget(QWidget *w, const QRect &rect, QWidget *target, bool already_in_form = false); @@ -303,7 +303,7 @@ private: static int widgetDepth(const QWidget *w); static bool isChildOf(const QWidget *c, const QWidget *p); - void editWidgets() Q_DECL_OVERRIDE; + void editWidgets() override; void updateWidgets(); diff --git a/src/designer/src/components/formeditor/formwindow_dnditem.h b/src/designer/src/components/formeditor/formwindow_dnditem.h index aac9e5f6a..9ff1b0fb9 100644 --- a/src/designer/src/components/formeditor/formwindow_dnditem.h +++ b/src/designer/src/components/formeditor/formwindow_dnditem.h @@ -42,7 +42,7 @@ class FormWindowDnDItem : public QDesignerDnDItem public: FormWindowDnDItem(QDesignerDnDItemInterface::DropType type, FormWindow *form, QWidget *widget, const QPoint &global_mouse_pos); - DomUI *domUi() const Q_DECL_OVERRIDE; + DomUI *domUi() const override; }; } // namespace qdesigner_internal diff --git a/src/designer/src/components/formeditor/formwindowcursor.h b/src/designer/src/components/formeditor/formwindowcursor.h index 17e33e1b1..b2045c779 100644 --- a/src/designer/src/components/formeditor/formwindowcursor.h +++ b/src/designer/src/components/formeditor/formwindowcursor.h @@ -46,25 +46,25 @@ public: explicit FormWindowCursor(FormWindow *fw, QObject *parent = 0); virtual ~FormWindowCursor(); - QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE; + QDesignerFormWindowInterface *formWindow() const override; - bool movePosition(MoveOperation op, MoveMode mode) Q_DECL_OVERRIDE; + bool movePosition(MoveOperation op, MoveMode mode) override; - int position() const Q_DECL_OVERRIDE; - void setPosition(int pos, MoveMode mode) Q_DECL_OVERRIDE; + int position() const override; + void setPosition(int pos, MoveMode mode) override; - QWidget *current() const Q_DECL_OVERRIDE; + QWidget *current() const override; - int widgetCount() const Q_DECL_OVERRIDE; - QWidget *widget(int index) const Q_DECL_OVERRIDE; + int widgetCount() const override; + QWidget *widget(int index) const override; - bool hasSelection() const Q_DECL_OVERRIDE; - int selectedWidgetCount() const Q_DECL_OVERRIDE; - QWidget *selectedWidget(int index) const Q_DECL_OVERRIDE; + bool hasSelection() const override; + int selectedWidgetCount() const override; + QWidget *selectedWidget(int index) const override; - 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; + void setProperty(const QString &name, const QVariant &value) override; + void setWidgetProperty(QWidget *widget, const QString &name, const QVariant &value) override; + void resetWidgetProperty(QWidget *widget, const QString &name) override; public slots: void update(); diff --git a/src/designer/src/components/formeditor/formwindowmanager.h b/src/designer/src/components/formeditor/formwindowmanager.h index 89841dc7a..ffd708b0d 100644 --- a/src/designer/src/components/formeditor/formwindowmanager.h +++ b/src/designer/src/components/formeditor/formwindowmanager.h @@ -60,33 +60,33 @@ public: explicit FormWindowManager(QDesignerFormEditorInterface *core, QObject *parent = 0); virtual ~FormWindowManager(); - QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; + QDesignerFormEditorInterface *core() const override; - QAction *action(Action action) const Q_DECL_OVERRIDE; - QActionGroup *actionGroup(ActionGroup actionGroup) const Q_DECL_OVERRIDE; + QAction *action(Action action) const override; + QActionGroup *actionGroup(ActionGroup actionGroup) const override; - QDesignerFormWindowInterface *activeFormWindow() const Q_DECL_OVERRIDE; + QDesignerFormWindowInterface *activeFormWindow() const override; - int formWindowCount() const Q_DECL_OVERRIDE; - QDesignerFormWindowInterface *formWindow(int index) const Q_DECL_OVERRIDE; + int formWindowCount() const override; + QDesignerFormWindowInterface *formWindow(int index) const override; - QDesignerFormWindowInterface *createFormWindow(QWidget *parentWidget = 0, Qt::WindowFlags flags = 0) Q_DECL_OVERRIDE; + QDesignerFormWindowInterface *createFormWindow(QWidget *parentWidget = 0, Qt::WindowFlags flags = 0) override; - QPixmap createPreviewPixmap() const Q_DECL_OVERRIDE; + QPixmap createPreviewPixmap() const override; - bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; + bool eventFilter(QObject *o, QEvent *e) override; - void dragItems(const QList<QDesignerDnDItemInterface*> &item_list) Q_DECL_OVERRIDE; + void dragItems(const QList<QDesignerDnDItemInterface*> &item_list) override; QUndoGroup *undoGroup() const; - PreviewManager *previewManager() const Q_DECL_OVERRIDE { return m_previewManager; } + PreviewManager *previewManager() const override { return m_previewManager; } public slots: - void addFormWindow(QDesignerFormWindowInterface *formWindow) Q_DECL_OVERRIDE; - void removeFormWindow(QDesignerFormWindowInterface *formWindow) Q_DECL_OVERRIDE; - void setActiveFormWindow(QDesignerFormWindowInterface *formWindow) Q_DECL_OVERRIDE; - void closeAllPreviews() Q_DECL_OVERRIDE; + void addFormWindow(QDesignerFormWindowInterface *formWindow) override; + void removeFormWindow(QDesignerFormWindowInterface *formWindow) override; + void setActiveFormWindow(QDesignerFormWindowInterface *formWindow) override; + void closeAllPreviews() override; void deviceProfilesChanged(); private slots: @@ -103,7 +103,7 @@ private slots: void slotActionBreakLayoutActivated(); void slotActionAdjustSizeActivated(); void slotActionSimplifyLayoutActivated(); - void showPreview() Q_DECL_OVERRIDE; + void showPreview() override; void slotActionGroupPreviewInStyle(const QString &style, int deviceProfileIndex); void slotActionShowFormWindowSettingsDialog(); diff --git a/src/designer/src/components/formeditor/itemview_propertysheet.h b/src/designer/src/components/formeditor/itemview_propertysheet.h index a65fe68ab..64492341a 100644 --- a/src/designer/src/components/formeditor/itemview_propertysheet.h +++ b/src/designer/src/components/formeditor/itemview_propertysheet.h @@ -53,14 +53,14 @@ public: QHash<QString,QString> propertyNameMap() const; // QDesignerPropertySheet - QVariant property(int index) const Q_DECL_OVERRIDE; - void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE; + QVariant property(int index) const override; + void setProperty(int index, const QVariant &value) override; - void setChanged(int index, bool changed) Q_DECL_OVERRIDE; - bool isChanged(int index) const Q_DECL_OVERRIDE; + void setChanged(int index, bool changed) override; + bool isChanged(int index) const override; - bool hasReset(int index) const Q_DECL_OVERRIDE; - bool reset(int index) Q_DECL_OVERRIDE; + bool hasReset(int index) const override; + bool reset(int index) 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 0609fbb2f..788cf2edf 100644 --- a/src/designer/src/components/formeditor/layout_propertysheet.h +++ b/src/designer/src/components/formeditor/layout_propertysheet.h @@ -49,10 +49,10 @@ public: explicit LayoutPropertySheet(QLayout *object, QObject *parent = 0); virtual ~LayoutPropertySheet(); - 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) Q_DECL_OVERRIDE; + void setProperty(int index, const QVariant &value) override; + QVariant property(int index) const override; + bool reset(int index) override; + void setChanged(int index, bool changed) override; static void stretchAttributesToDom(QDesignerFormEditorInterface *core, QLayout *lt, DomLayout *domLayout); static void markChangedStretchProperties(QDesignerFormEditorInterface *core, QLayout *lt, const DomLayout *domLayout); diff --git a/src/designer/src/components/formeditor/line_propertysheet.h b/src/designer/src/components/formeditor/line_propertysheet.h index 7df6f20c6..f5ff443ed 100644 --- a/src/designer/src/components/formeditor/line_propertysheet.h +++ b/src/designer/src/components/formeditor/line_propertysheet.h @@ -45,9 +45,9 @@ public: explicit LinePropertySheet(Line *object, QObject *parent = 0); virtual ~LinePropertySheet(); - 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; + void setProperty(int index, const QVariant &value) override; + bool isVisible(int index) const override; + QString propertyGroup(int index) const 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 c2a6c250a..4da1e7b4c 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.cpp +++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp @@ -133,13 +133,13 @@ public: QStringList loadedQrcFiles() const { return m_loadedQrcFiles.keys(); } // needed only for loading old resource attribute of <iconset> tag. #endif - QVariant loadResource(const QDir &workingDirectory, const DomProperty *icon) const Q_DECL_OVERRIDE; + QVariant loadResource(const QDir &workingDirectory, const DomProperty *icon) const override; - QVariant toNativeValue(const QVariant &value) const Q_DECL_OVERRIDE; + QVariant toNativeValue(const QVariant &value) const override; - DomProperty *saveResource(const QDir &workingDirectory, const QVariant &value) const Q_DECL_OVERRIDE; + DomProperty *saveResource(const QDir &workingDirectory, const QVariant &value) const override; - bool isResourceType(const QVariant &value) const Q_DECL_OVERRIDE; + bool isResourceType(const QVariant &value) const override; private: QDesignerFormEditorInterface *m_core; @@ -361,11 +361,11 @@ class QDesignerTextBuilder : public QTextBuilder public: QDesignerTextBuilder() {} - QVariant loadText(const DomProperty *icon) const Q_DECL_OVERRIDE; + QVariant loadText(const DomProperty *icon) const override; - QVariant toNativeValue(const QVariant &value) const Q_DECL_OVERRIDE; + QVariant toNativeValue(const QVariant &value) const override; - DomProperty *saveText(const QVariant &value) const Q_DECL_OVERRIDE; + DomProperty *saveText(const QVariant &value) const 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 746943928..f444f6334 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.h +++ b/src/designer/src/components/formeditor/qdesigner_resource.h @@ -65,57 +65,57 @@ public: explicit QDesignerResource(FormWindow *fw); virtual ~QDesignerResource(); - void save(QIODevice *dev, QWidget *widget) Q_DECL_OVERRIDE; + void save(QIODevice *dev, QWidget *widget) override; - bool copy(QIODevice *dev, const FormBuilderClipboard &selection) Q_DECL_OVERRIDE; - DomUI *copy(const FormBuilderClipboard &selection) Q_DECL_OVERRIDE; + bool copy(QIODevice *dev, const FormBuilderClipboard &selection) override; + DomUI *copy(const FormBuilderClipboard &selection) override; - FormBuilderClipboard paste(DomUI *ui, QWidget *widgetParent, QObject *actionParent = 0) Q_DECL_OVERRIDE; - FormBuilderClipboard paste(QIODevice *dev, QWidget *widgetParent, QObject *actionParent = 0) Q_DECL_OVERRIDE; + FormBuilderClipboard paste(DomUI *ui, QWidget *widgetParent, QObject *actionParent = 0) override; + FormBuilderClipboard paste(QIODevice *dev, QWidget *widgetParent, QObject *actionParent = 0) override; bool saveRelative() const; void setSaveRelative(bool relative); - QWidget *load(QIODevice *dev, QWidget *parentWidget) Q_DECL_OVERRIDE; + QWidget *load(QIODevice *dev, QWidget *parentWidget) override; protected: using QEditorFormBuilder::create; using QEditorFormBuilder::createDom; - 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; + void saveDom(DomUI *ui, QWidget *widget) override; + QWidget *create(DomUI *ui, QWidget *parentWidget) override; + QWidget *create(DomWidget *ui_widget, QWidget *parentWidget) override; + QLayout *create(DomLayout *ui_layout, QLayout *layout, QWidget *parentWidget) override; + QLayoutItem *create(DomLayoutItem *ui_layoutItem, QLayout *layout, QWidget *parentWidget) override; + void applyProperties(QObject *o, const QList<DomProperty*> &properties) override; + QList<DomProperty*> computeProperties(QObject *obj) override; + DomProperty *createProperty(QObject *object, const QString &propertyName, const QVariant &value) override; - 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; + QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name) override; + QLayout *createLayout(const QString &layoutName, QObject *parent, const QString &name) override; + void createCustomWidgets(DomCustomWidgets *) override; + void createResources(DomResources*) override; + void applyTabStops(QWidget *widget, DomTabStops *tabStops) override; - bool addItem(DomLayoutItem *ui_item, QLayoutItem *item, QLayout *layout) Q_DECL_OVERRIDE; - bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) Q_DECL_OVERRIDE; + bool addItem(DomLayoutItem *ui_item, QLayoutItem *item, QLayout *layout) override; + bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) override; - 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; + DomWidget *createDom(QWidget *widget, DomWidget *ui_parentWidget, bool recursive = true) override; + DomLayout *createDom(QLayout *layout, DomLayout *ui_layout, DomWidget *ui_parentWidget) override; + DomLayoutItem *createDom(QLayoutItem *item, DomLayout *ui_layout, DomWidget *ui_parentWidget) override; - 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; + QAction *create(DomAction *ui_action, QObject *parent) override; + QActionGroup *create(DomActionGroup *ui_action_group, QObject *parent) override; + void addMenuAction(QAction *action) override; - DomAction *createDom(QAction *action) Q_DECL_OVERRIDE; - DomActionGroup *createDom(QActionGroup *actionGroup) Q_DECL_OVERRIDE; - DomActionRef *createActionRefDom(QAction *action) Q_DECL_OVERRIDE; + DomAction *createDom(QAction *action) override; + DomActionGroup *createDom(QActionGroup *actionGroup) override; + DomActionRef *createActionRefDom(QAction *action) override; - QAction *createAction(QObject *parent, const QString &name) Q_DECL_OVERRIDE; - QActionGroup *createActionGroup(QObject *parent, const QString &name) Q_DECL_OVERRIDE; + QAction *createAction(QObject *parent, const QString &name) override; + QActionGroup *createActionGroup(QObject *parent, const QString &name) override; - bool checkProperty(QObject *obj, const QString &prop) const Q_DECL_OVERRIDE; + bool checkProperty(QObject *obj, const QString &prop) const override; DomWidget *saveWidget(QTabWidget *widget, DomWidget *ui_parentWidget); DomWidget *saveWidget(QStackedWidget *widget, DomWidget *ui_parentWidget); @@ -125,13 +125,13 @@ protected: DomWidget *saveWidget(QDesignerDockWidget *dockWidget, DomWidget *ui_parentWidget); DomWidget *saveWidget(QWizardPage *wizardPage, DomWidget *ui_parentWidget); - DomCustomWidgets *saveCustomWidgets() Q_DECL_OVERRIDE; - DomTabStops *saveTabStops() Q_DECL_OVERRIDE; - DomResources *saveResources() Q_DECL_OVERRIDE; + DomCustomWidgets *saveCustomWidgets() override; + DomTabStops *saveTabStops() override; + DomResources *saveResources() override; - void layoutInfo(DomLayout *layout, QObject *parent, int *margin, int *spacing) Q_DECL_OVERRIDE; + void layoutInfo(DomLayout *layout, QObject *parent, int *margin, int *spacing) override; - void loadExtraInfo(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) Q_DECL_OVERRIDE; + void loadExtraInfo(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) 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 dba1e0f05..1bc374cf7 100644 --- a/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.h +++ b/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.h @@ -45,10 +45,10 @@ public: explicit QLayoutWidgetPropertySheet(QLayoutWidget *object, QObject *parent = 0); virtual ~QLayoutWidgetPropertySheet(); - void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE; - bool isVisible(int index) const Q_DECL_OVERRIDE; + void setProperty(int index, const QVariant &value) override; + bool isVisible(int index) const override; - bool dynamicPropertiesAllowed() const Q_DECL_OVERRIDE; + bool dynamicPropertiesAllowed() const 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 b0c2d1677..d6a91e743 100644 --- a/src/designer/src/components/formeditor/qmainwindow_container.h +++ b/src/designer/src/components/formeditor/qmainwindow_container.h @@ -47,13 +47,13 @@ class QMainWindowContainer: public QObject, public QDesignerContainerExtension public: explicit QMainWindowContainer(QMainWindow *widget, QObject *parent = 0); - 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; + int count() const override; + QWidget *widget(int index) const override; + int currentIndex() const override; + void setCurrentIndex(int index) override; + void addWidget(QWidget *widget) override; + void insertWidget(int index, QWidget *widget) override; + void remove(int index) 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 0dfb4489f..bc2f5814b 100644 --- a/src/designer/src/components/formeditor/qmdiarea_container.h +++ b/src/designer/src/components/formeditor/qmdiarea_container.h @@ -49,13 +49,13 @@ class QMdiAreaContainer: public QObject, public QDesignerContainerExtension public: explicit QMdiAreaContainer(QMdiArea *widget, QObject *parent = 0); - 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; + int count() const override; + QWidget *widget(int index) const override; + int currentIndex() const override; + void setCurrentIndex(int index) override; + void addWidget(QWidget *widget) override; + void insertWidget(int index, QWidget *widget) override; + void remove(int index) override; // Semismart positioning of a new MDI child after cascading static void positionNewMdiChild(const QWidget *area, QWidget *mdiChild); @@ -73,11 +73,11 @@ class QMdiAreaPropertySheet: public QDesignerPropertySheet public: explicit QMdiAreaPropertySheet(QWidget *mdiArea, QObject *parent = 0); - 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; + void setProperty(int index, const QVariant &value) override; + bool reset(int index) override; + bool isEnabled(int index) const override; + bool isChanged(int index) const override; + QVariant property(int index) const 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 544093be9..6cd371486 100644 --- a/src/designer/src/components/formeditor/qwizard_container.h +++ b/src/designer/src/components/formeditor/qwizard_container.h @@ -53,13 +53,13 @@ class QWizardContainer: public QObject, public QDesignerContainerExtension public: explicit QWizardContainer(QWizard *widget, QObject *parent = 0); - 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; + int count() const override; + QWidget *widget(int index) const override; + int currentIndex() const override; + void setCurrentIndex(int index) override; + void addWidget(QWidget *widget) override; + void insertWidget(int index, QWidget *widget) override; + void remove(int index) override; private: QWizard *m_wizard; @@ -76,7 +76,7 @@ class QWizardPagePropertySheet: public QDesignerPropertySheet public: explicit QWizardPagePropertySheet(QWizardPage *object, QObject *parent = 0); - bool reset(int index) Q_DECL_OVERRIDE; + bool reset(int index) override; static const char *pageIdProperty; @@ -93,7 +93,7 @@ class QWizardPropertySheet: public QDesignerPropertySheet Q_OBJECT public: explicit QWizardPropertySheet(QWizard *object, QObject *parent = 0); - bool isVisible(int index) const Q_DECL_OVERRIDE; + bool isVisible(int index) const 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 134d4100f..351fa1c38 100644 --- a/src/designer/src/components/formeditor/spacer_propertysheet.h +++ b/src/designer/src/components/formeditor/spacer_propertysheet.h @@ -45,10 +45,10 @@ public: explicit SpacerPropertySheet(Spacer *object, QObject *parent = 0); virtual ~SpacerPropertySheet(); - void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE; - bool isVisible(int index) const Q_DECL_OVERRIDE; + void setProperty(int index, const QVariant &value) override; + bool isVisible(int index) const override; - bool dynamicPropertiesAllowed() const Q_DECL_OVERRIDE; + bool dynamicPropertiesAllowed() const 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 16220b9e7..65bd00e34 100644 --- a/src/designer/src/components/formeditor/templateoptionspage.h +++ b/src/designer/src/components/formeditor/templateoptionspage.h @@ -79,10 +79,10 @@ class TemplateOptionsPage : public QDesignerOptionsPageInterface public: explicit TemplateOptionsPage(QDesignerFormEditorInterface *core); - QString name() const Q_DECL_OVERRIDE; - QWidget *createPage(QWidget *parent) Q_DECL_OVERRIDE; - void apply() Q_DECL_OVERRIDE; - void finish() Q_DECL_OVERRIDE; + QString name() const override; + QWidget *createPage(QWidget *parent) override; + void apply() override; + void finish() override; private: QDesignerFormEditorInterface *m_core; diff --git a/src/designer/src/components/formeditor/tool_widgeteditor.h b/src/designer/src/components/formeditor/tool_widgeteditor.h index f892e03e3..5fe1492e1 100644 --- a/src/designer/src/components/formeditor/tool_widgeteditor.h +++ b/src/designer/src/components/formeditor/tool_widgeteditor.h @@ -51,15 +51,15 @@ public: explicit WidgetEditorTool(FormWindow *formWindow); virtual ~WidgetEditorTool(); - QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; - QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE; - QWidget *editor() const Q_DECL_OVERRIDE; - QAction *action() const Q_DECL_OVERRIDE; + QDesignerFormEditorInterface *core() const override; + QDesignerFormWindowInterface *formWindow() const override; + QWidget *editor() const override; + QAction *action() const override; - void activated() Q_DECL_OVERRIDE; - void deactivated() Q_DECL_OVERRIDE; + void activated() override; + void deactivated() override; - bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event) Q_DECL_OVERRIDE; + bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event) 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 ddd3bce39..6bf97527f 100644 --- a/src/designer/src/components/formeditor/widgetselection.h +++ b/src/designer/src/components/formeditor/widgetselection.h @@ -114,7 +114,7 @@ public: QDesignerFormEditorInterface *core() const; - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *event) 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 50813f5e2..202c0dd3b 100644 --- a/src/designer/src/components/objectinspector/objectinspector.cpp +++ b/src/designer/src/components/objectinspector/objectinspector.cpp @@ -118,7 +118,7 @@ class ObjectInspectorDelegate : public QStyledItemDelegate { public: explicit ObjectInspectorDelegate(QObject *parent = 0); - QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; + QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const override; }; ObjectInspectorDelegate::ObjectInspectorDelegate(QObject *parent) : @@ -146,8 +146,8 @@ public: ObjectInspectorTreeView(QWidget *parent = 0) : QTreeView(parent) {} protected: - void mouseMoveEvent (QMouseEvent * event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void mouseMoveEvent (QMouseEvent * event) override; + void keyPressEvent(QKeyEvent *event) override; }; diff --git a/src/designer/src/components/objectinspector/objectinspector.h b/src/designer/src/components/objectinspector/objectinspector.h index aeb96140b..a5aa5220e 100644 --- a/src/designer/src/components/objectinspector/objectinspector.h +++ b/src/designer/src/components/objectinspector/objectinspector.h @@ -48,16 +48,16 @@ public: explicit ObjectInspector(QDesignerFormEditorInterface *core, QWidget *parent = 0); virtual ~ObjectInspector(); - QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; + QDesignerFormEditorInterface *core() const override; - void getSelection(Selection &s) const Q_DECL_OVERRIDE; - bool selectObject(QObject *o) Q_DECL_OVERRIDE; - void clearSelection() Q_DECL_OVERRIDE; + void getSelection(Selection &s) const override; + bool selectObject(QObject *o) override; + void clearSelection() override; - void setFormWindow(QDesignerFormWindowInterface *formWindow) Q_DECL_OVERRIDE; + void setFormWindow(QDesignerFormWindowInterface *formWindow) override; public slots: - void mainContainerChanged() Q_DECL_OVERRIDE; + void mainContainerChanged() override; private slots: void slotSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected); @@ -65,10 +65,10 @@ private slots: void slotHeaderDoubleClicked(int column); protected: - 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; + void dragEnterEvent (QDragEnterEvent * event) override; + void dragMoveEvent(QDragMoveEvent * event) override; + void dragLeaveEvent(QDragLeaveEvent * event) override; + void dropEvent (QDropEvent * event) 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 2268535bd..29a0ef6ce 100644 --- a/src/designer/src/components/objectinspector/objectinspectormodel_p.h +++ b/src/designer/src/components/objectinspector/objectinspectormodel_p.h @@ -132,8 +132,8 @@ namespace qdesigner_internal { const QModelIndexList indexesOf(QObject *o) const { return m_objectIndexMultiMap.values(o); } QObject *objectAt(const QModelIndex &index) const; - 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; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) 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 582242a4a..8b6229a8e 100644 --- a/src/designer/src/components/propertyeditor/designerpropertymanager.h +++ b/src/designer/src/components/propertyeditor/designerpropertymanager.h @@ -123,15 +123,15 @@ public: explicit DesignerPropertyManager(QDesignerFormEditorInterface *core, QObject *parent = 0); ~DesignerPropertyManager(); - QStringList attributes(int propertyType) const Q_DECL_OVERRIDE; - int attributeType(int propertyType, const QString &attribute) const Q_DECL_OVERRIDE; + QStringList attributes(int propertyType) const override; + int attributeType(int propertyType, const QString &attribute) const override; - 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; + QVariant attributeValue(const QtProperty *property, const QString &attribute) const override; + bool isPropertyTypeSupported(int propertyType) const override; + QVariant value(const QtProperty *property) const override; + int valueType(int propertyType) const override; + QString valueText(const QtProperty *property) const override; + QIcon valueIcon(const QtProperty *property) const override; bool resetFontSubProperty(QtProperty *property); bool resetIconSubProperty(QtProperty *subProperty); @@ -150,15 +150,15 @@ public: void setObject(QObject *object) { m_object = object; } public Q_SLOTS: - void setAttribute(QtProperty *property, const QString &attribute, const QVariant &value) Q_DECL_OVERRIDE; - void setValue(QtProperty *property, const QVariant &value) Q_DECL_OVERRIDE; + void setAttribute(QtProperty *property, const QString &attribute, const QVariant &value) override; + void setValue(QtProperty *property, const QVariant &value) 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: - void initializeProperty(QtProperty *property) Q_DECL_OVERRIDE; - void uninitializeProperty(QtProperty *property) Q_DECL_OVERRIDE; + void initializeProperty(QtProperty *property) override; + void uninitializeProperty(QtProperty *property) 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 7c5f67f32..1868c256e 100644 --- a/src/designer/src/components/propertyeditor/paletteeditor.h +++ b/src/designer/src/components/propertyeditor/paletteeditor.h @@ -168,18 +168,18 @@ public: explicit ColorDelegate(QDesignerFormEditorInterface *core, QObject *parent = 0); QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; - void setEditorData(QWidget *ed, const QModelIndex &index) const Q_DECL_OVERRIDE; + void setEditorData(QWidget *ed, const QModelIndex &index) const override; void setModelData(QWidget *ed, QAbstractItemModel *model, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; void updateEditorGeometry(QWidget *ed, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; void paint(QPainter *painter, const QStyleOptionViewItem &opt, - const QModelIndex &index) const Q_DECL_OVERRIDE; - QSize sizeHint(const QStyleOptionViewItem &opt, const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; + QSize sizeHint(const QStyleOptionViewItem &opt, const QModelIndex &index) const override; private: QDesignerFormEditorInterface *m_core; }; diff --git a/src/designer/src/components/propertyeditor/propertyeditor.h b/src/designer/src/components/propertyeditor/propertyeditor.h index 784b5ccb9..ac66bda96 100644 --- a/src/designer/src/components/propertyeditor/propertyeditor.h +++ b/src/designer/src/components/propertyeditor/propertyeditor.h @@ -66,25 +66,25 @@ public: explicit PropertyEditor(QDesignerFormEditorInterface *core, QWidget *parent = 0, Qt::WindowFlags flags = 0); virtual ~PropertyEditor(); - QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; + QDesignerFormEditorInterface *core() const override; - 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; - void updatePropertySheet() Q_DECL_OVERRIDE; + bool isReadOnly() const override; + void setReadOnly(bool readOnly) override; + void setPropertyValue(const QString &name, const QVariant &value, bool changed = true) override; + void updatePropertySheet() override; - void setObject(QObject *object) Q_DECL_OVERRIDE; + void setObject(QObject *object) override; - void reloadResourceProperties() Q_DECL_OVERRIDE; + void reloadResourceProperties() override; - QObject *object() const Q_DECL_OVERRIDE + QObject *object() const override { return m_object; } - QString currentPropertyName() const Q_DECL_OVERRIDE; + QString currentPropertyName() const override; protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; private slots: void slotResetProperty(QtProperty *property); diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor.h b/src/designer/src/components/signalsloteditor/signalsloteditor.h index cc3d6f8ff..c235c1d94 100644 --- a/src/designer/src/components/signalsloteditor/signalsloteditor.h +++ b/src/designer/src/components/signalsloteditor/signalsloteditor.h @@ -50,8 +50,8 @@ public: virtual void setSignal(SignalSlotConnection *con, const QString &member); virtual void setSlot(SignalSlotConnection *con, const QString &member); - void setSource(Connection *con, const QString &obj_name) Q_DECL_OVERRIDE; - void setTarget(Connection *con, const QString &obj_name) Q_DECL_OVERRIDE; + void setSource(Connection *con, const QString &obj_name) override; + void setTarget(Connection *con, const QString &obj_name) override; DomConnections *toUi() const; void fromUi(const DomConnections *connections, QWidget *parent); @@ -63,11 +63,11 @@ public: void addEmptyConnection(); protected: - QWidget *widgetAt(const QPoint &pos) const Q_DECL_OVERRIDE; + QWidget *widgetAt(const QPoint &pos) const override; private: - Connection *createConnection(QWidget *source, QWidget *destination) Q_DECL_OVERRIDE; - void modifyConnection(Connection *con) Q_DECL_OVERRIDE; + Connection *createConnection(QWidget *source, QWidget *destination) override; + void modifyConnection(Connection *con) 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 2a00e0998..5230f77f7 100644 --- a/src/designer/src/components/signalsloteditor/signalsloteditor_p.h +++ b/src/designer/src/components/signalsloteditor/signalsloteditor_p.h @@ -92,14 +92,14 @@ public: explicit ConnectionModel(QObject *parent = 0); void setEditor(SignalSlotEditor *editor = 0); - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - 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; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &child) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &data, int role = Qt::DisplayRole) override; + Qt::ItemFlags flags(const QModelIndex &index) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; QModelIndex connectionToIndex(Connection *con) const; Connection *indexToConnection(const QModelIndex &index) const; diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.h b/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.h index 376ad56f1..0e98d4561 100644 --- a/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.h +++ b/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.h @@ -53,11 +53,11 @@ public: SignalSlotEditorPlugin(); virtual ~SignalSlotEditorPlugin(); - bool isInitialized() const Q_DECL_OVERRIDE; - void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE; - QAction *action() const Q_DECL_OVERRIDE; + bool isInitialized() const override; + void initialize(QDesignerFormEditorInterface *core) override; + QAction *action() const override; - QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; + QDesignerFormEditorInterface *core() const 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 51684abc6..ac35b07ce 100644 --- a/src/designer/src/components/signalsloteditor/signalsloteditor_tool.h +++ b/src/designer/src/components/signalsloteditor/signalsloteditor_tool.h @@ -52,20 +52,20 @@ public: explicit SignalSlotEditorTool(QDesignerFormWindowInterface *formWindow, QObject *parent = 0); virtual ~SignalSlotEditorTool(); - QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; - QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE; + QDesignerFormEditorInterface *core() const override; + QDesignerFormWindowInterface *formWindow() const override; - QWidget *editor() const Q_DECL_OVERRIDE; + QWidget *editor() const override; - QAction *action() const Q_DECL_OVERRIDE; + QAction *action() const override; - void activated() Q_DECL_OVERRIDE; - void deactivated() Q_DECL_OVERRIDE; + void activated() override; + void deactivated() override; - bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event) Q_DECL_OVERRIDE; + bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event) override; - void saveToDom(DomUI *ui, QWidget *mainContainer) Q_DECL_OVERRIDE; - void loadFromDom(DomUI *ui, QWidget *mainContainer) Q_DECL_OVERRIDE; + void saveToDom(DomUI *ui, QWidget *mainContainer) override; + void loadFromDom(DomUI *ui, QWidget *mainContainer) override; private: QDesignerFormWindowInterface *m_formWindow; diff --git a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp index 0bb375fcf..b3118f69c 100644 --- a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp +++ b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp @@ -415,7 +415,7 @@ public: int findText(const QString &text) const; - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + Qt::ItemFlags flags(const QModelIndex &index) const 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 bfd4606c4..5af32baab 100644 --- a/src/designer/src/components/tabordereditor/tabordereditor.h +++ b/src/designer/src/components/tabordereditor/tabordereditor.h @@ -63,13 +63,13 @@ private slots: void showTabOrderDialog(); protected: - 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; + void paintEvent(QPaintEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseDoubleClickEvent(QMouseEvent *e) override; + void contextMenuEvent(QContextMenuEvent *e) override; + void resizeEvent(QResizeEvent *e) override; + void showEvent(QShowEvent *e) 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 4031cefc4..862e8980d 100644 --- a/src/designer/src/components/tabordereditor/tabordereditor_plugin.h +++ b/src/designer/src/components/tabordereditor/tabordereditor_plugin.h @@ -54,11 +54,11 @@ public: TabOrderEditorPlugin(); virtual ~TabOrderEditorPlugin(); - bool isInitialized() const Q_DECL_OVERRIDE; - void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE; - QAction *action() const Q_DECL_OVERRIDE; + bool isInitialized() const override; + void initialize(QDesignerFormEditorInterface *core) override; + QAction *action() const override; - QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; + QDesignerFormEditorInterface *core() const 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 e9d5abb05..78e7f116f 100644 --- a/src/designer/src/components/tabordereditor/tabordereditor_tool.h +++ b/src/designer/src/components/tabordereditor/tabordereditor_tool.h @@ -52,16 +52,16 @@ public: explicit TabOrderEditorTool(QDesignerFormWindowInterface *formWindow, QObject *parent = 0); virtual ~TabOrderEditorTool(); - QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; - QDesignerFormWindowInterface *formWindow() const Q_DECL_OVERRIDE; + QDesignerFormEditorInterface *core() const override; + QDesignerFormWindowInterface *formWindow() const override; - QWidget *editor() const Q_DECL_OVERRIDE; - QAction *action() const Q_DECL_OVERRIDE; + QWidget *editor() const override; + QAction *action() const override; - void activated() Q_DECL_OVERRIDE; - void deactivated() Q_DECL_OVERRIDE; + void activated() override; + void deactivated() override; - bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event) Q_DECL_OVERRIDE; + bool handleEvent(QWidget *widget, QWidget *managedWidget, QEvent *event) 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 791346aba..9e6380630 100644 --- a/src/designer/src/components/taskmenu/button_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/button_taskmenu.cpp @@ -379,7 +379,7 @@ public: ButtonTextTaskMenuInlineEditor(QAbstractButton *button, QObject *parent); protected: - QRect editRectangle() const Q_DECL_OVERRIDE; + QRect editRectangle() const override; }; ButtonTextTaskMenuInlineEditor::ButtonTextTaskMenuInlineEditor(QAbstractButton *button, QObject *parent) : @@ -402,7 +402,7 @@ public: LinkDescriptionTaskMenuInlineEditor(QAbstractButton *button, QObject *parent); protected: - QRect editRectangle() const Q_DECL_OVERRIDE; + QRect editRectangle() const 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 aff42b10e..bb33d0a81 100644 --- a/src/designer/src/components/taskmenu/button_taskmenu.h +++ b/src/designer/src/components/taskmenu/button_taskmenu.h @@ -83,8 +83,8 @@ class ButtonGroupTaskMenu : public QObject, public QDesignerTaskMenuExtension public: explicit ButtonGroupTaskMenu(QButtonGroup *buttonGroup, QObject *parent = 0); - QAction *preferredEditAction() const Q_DECL_OVERRIDE; - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QAction *preferredEditAction() const override; + QList<QAction*> taskActions() const override; private: QButtonGroup *m_buttonGroup; @@ -101,8 +101,8 @@ public: explicit ButtonTaskMenu(QAbstractButton *button, QObject *parent = 0); virtual ~ButtonTaskMenu(); - QAction *preferredEditAction() const Q_DECL_OVERRIDE; - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QAction *preferredEditAction() const override; + QList<QAction*> taskActions() const 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 f1e000a1a..103812e57 100644 --- a/src/designer/src/components/taskmenu/combobox_taskmenu.h +++ b/src/designer/src/components/taskmenu/combobox_taskmenu.h @@ -50,8 +50,8 @@ public: QObject *parent = 0); virtual ~ComboBoxTaskMenu(); - QAction *preferredEditAction() const Q_DECL_OVERRIDE; - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QAction *preferredEditAction() const override; + QList<QAction*> taskActions() const override; private slots: void editItems(); @@ -71,7 +71,7 @@ public: explicit ComboBoxTaskMenuFactory(const QString &iid, QExtensionManager *extensionManager); private: - QComboBox *checkObject(QObject *qObject) const Q_DECL_OVERRIDE; + QComboBox *checkObject(QObject *qObject) const 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 941709b1d..6803ce48e 100644 --- a/src/designer/src/components/taskmenu/containerwidget_taskmenu.h +++ b/src/designer/src/components/taskmenu/containerwidget_taskmenu.h @@ -59,8 +59,8 @@ public: explicit ContainerWidgetTaskMenu(QWidget *widget, ContainerType type, QObject *parent = 0); virtual ~ContainerWidgetTaskMenu(); - QAction *preferredEditAction() const Q_DECL_OVERRIDE; - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QAction *preferredEditAction() const override; + QList<QAction*> taskActions() const override; private slots: void removeCurrentPage(); @@ -99,7 +99,7 @@ class WizardContainerWidgetTaskMenu : public ContainerWidgetTaskMenu { public: explicit WizardContainerWidgetTaskMenu(QWizard *w, QObject *parent = 0); - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const override; private: QAction *m_nextAction; @@ -114,7 +114,7 @@ class MdiContainerWidgetTaskMenu : public ContainerWidgetTaskMenu { public: explicit MdiContainerWidgetTaskMenu(QMdiArea *m, QObject *parent = 0); - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const override; private: void initializeActions(); @@ -131,7 +131,7 @@ public: explicit ContainerWidgetTaskMenuFactory(QDesignerFormEditorInterface *core, QExtensionManager *extensionManager = 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/components/taskmenu/groupbox_taskmenu.cpp b/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp index f36ac4eef..58a50f0ce 100644 --- a/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp @@ -46,7 +46,7 @@ public: GroupBoxTaskMenuInlineEditor(QGroupBox *button, QObject *parent); protected: - QRect editRectangle() const Q_DECL_OVERRIDE; + QRect editRectangle() const 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 5501a66e0..f6bf9ce28 100644 --- a/src/designer/src/components/taskmenu/groupbox_taskmenu.h +++ b/src/designer/src/components/taskmenu/groupbox_taskmenu.h @@ -48,8 +48,8 @@ class GroupBoxTaskMenu: public QDesignerTaskMenu public: explicit GroupBoxTaskMenu(QGroupBox *groupbox, QObject *parent = 0); - QAction *preferredEditAction() const Q_DECL_OVERRIDE; - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QAction *preferredEditAction() const override; + QList<QAction*> taskActions() const 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 5e13c81f8..5de16a4ad 100644 --- a/src/designer/src/components/taskmenu/inplace_widget_helper.h +++ b/src/designer/src/components/taskmenu/inplace_widget_helper.h @@ -57,7 +57,7 @@ namespace qdesigner_internal { InPlaceWidgetHelper(QWidget *editorWidget, QWidget *parentWidget, QDesignerFormWindowInterface *fw); virtual ~InPlaceWidgetHelper(); - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *event) 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 eaaf3d780..1c773b3fe 100644 --- a/src/designer/src/components/taskmenu/itemlisteditor.h +++ b/src/designer/src/components/taskmenu/itemlisteditor.h @@ -136,8 +136,8 @@ private slots: void cacheReloaded(); protected: - void setItemData(int role, const QVariant &v) Q_DECL_OVERRIDE; - QVariant getItemData(int role) const Q_DECL_OVERRIDE; + void setItemData(int role, const QVariant &v) override; + QVariant getItemData(int role) const 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 4c1828e97..1880dadd4 100644 --- a/src/designer/src/components/taskmenu/label_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/label_taskmenu.cpp @@ -49,7 +49,7 @@ public: LabelTaskMenuInlineEditor(QLabel *button, QObject *parent); protected: - QRect editRectangle() const Q_DECL_OVERRIDE; + QRect editRectangle() const 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 34113e2da..e43763797 100644 --- a/src/designer/src/components/taskmenu/label_taskmenu.h +++ b/src/designer/src/components/taskmenu/label_taskmenu.h @@ -47,8 +47,8 @@ class LabelTaskMenu: public QDesignerTaskMenu public: explicit LabelTaskMenu(QLabel *button, QObject *parent = 0); - QAction *preferredEditAction() const Q_DECL_OVERRIDE; - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QAction *preferredEditAction() const override; + QList<QAction*> taskActions() const override; private slots: void editRichText(); diff --git a/src/designer/src/components/taskmenu/layouttaskmenu.h b/src/designer/src/components/taskmenu/layouttaskmenu.h index 635d12431..77f487a0f 100644 --- a/src/designer/src/components/taskmenu/layouttaskmenu.h +++ b/src/designer/src/components/taskmenu/layouttaskmenu.h @@ -50,8 +50,8 @@ class LayoutWidgetTaskMenu : public QObject, public QDesignerTaskMenuExtension public: explicit LayoutWidgetTaskMenu(QLayoutWidget *w, QObject *parent = 0); - QAction *preferredEditAction() const Q_DECL_OVERRIDE; - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QAction *preferredEditAction() const override; + QList<QAction*> taskActions() const override; private: QLayoutWidget *m_widget; @@ -67,8 +67,8 @@ class SpacerTaskMenu : public QObject, public QDesignerTaskMenuExtension public: explicit SpacerTaskMenu(Spacer *bar, QObject *parent = 0); - QAction *preferredEditAction() const Q_DECL_OVERRIDE; - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QAction *preferredEditAction() const override; + QList<QAction*> taskActions() const override; }; diff --git a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp index 66fbafcd8..1fc642992 100644 --- a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp +++ b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp @@ -46,7 +46,7 @@ public: LineEditTaskMenuInlineEditor(QLineEdit *button, QObject *parent); protected: - QRect editRectangle() const Q_DECL_OVERRIDE; + QRect editRectangle() const 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 82d40a4dd..78d4bd970 100644 --- a/src/designer/src/components/taskmenu/lineedit_taskmenu.h +++ b/src/designer/src/components/taskmenu/lineedit_taskmenu.h @@ -45,8 +45,8 @@ class LineEditTaskMenu: public QDesignerTaskMenu public: explicit LineEditTaskMenu(QLineEdit *button, QObject *parent = 0); - QAction *preferredEditAction() const Q_DECL_OVERRIDE; - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QAction *preferredEditAction() const override; + QList<QAction*> taskActions() const 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 1c4fd0896..a74d5a68a 100644 --- a/src/designer/src/components/taskmenu/listwidget_taskmenu.h +++ b/src/designer/src/components/taskmenu/listwidget_taskmenu.h @@ -49,8 +49,8 @@ public: explicit ListWidgetTaskMenu(QListWidget *button, QObject *parent = 0); virtual ~ListWidgetTaskMenu(); - QAction *preferredEditAction() const Q_DECL_OVERRIDE; - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QAction *preferredEditAction() const override; + QList<QAction*> taskActions() const override; private slots: void editItems(); diff --git a/src/designer/src/components/taskmenu/menutaskmenu.h b/src/designer/src/components/taskmenu/menutaskmenu.h index 24c40a44d..3a47c72c6 100644 --- a/src/designer/src/components/taskmenu/menutaskmenu.h +++ b/src/designer/src/components/taskmenu/menutaskmenu.h @@ -54,8 +54,8 @@ class MenuTaskMenu : public QObject, public QDesignerTaskMenuExtension public: explicit MenuTaskMenu(QDesignerMenu *menu, QObject *parent = 0); - QAction *preferredEditAction() const Q_DECL_OVERRIDE; - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QAction *preferredEditAction() const override; + QList<QAction*> taskActions() const override; private slots: void removeMenu(); @@ -76,8 +76,8 @@ class MenuBarTaskMenu : public QObject, public QDesignerTaskMenuExtension public: explicit MenuBarTaskMenu(QDesignerMenuBar *bar, QObject *parent = 0); - QAction *preferredEditAction() const Q_DECL_OVERRIDE; - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QAction *preferredEditAction() const override; + QList<QAction*> taskActions() const 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 8df46f632..aa101c79a 100644 --- a/src/designer/src/components/taskmenu/tablewidget_taskmenu.h +++ b/src/designer/src/components/taskmenu/tablewidget_taskmenu.h @@ -49,8 +49,8 @@ public: explicit TableWidgetTaskMenu(QTableWidget *button, QObject *parent = 0); virtual ~TableWidgetTaskMenu(); - QAction *preferredEditAction() const Q_DECL_OVERRIDE; - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QAction *preferredEditAction() const override; + QList<QAction*> taskActions() const override; private slots: void editItems(); diff --git a/src/designer/src/components/taskmenu/tablewidgeteditor.h b/src/designer/src/components/taskmenu/tablewidgeteditor.h index 8e5cbb326..5698d744c 100644 --- a/src/designer/src/components/taskmenu/tablewidgeteditor.h +++ b/src/designer/src/components/taskmenu/tablewidgeteditor.h @@ -80,8 +80,8 @@ private slots: void cacheReloaded(); protected: - void setItemData(int role, const QVariant &v) Q_DECL_OVERRIDE; - QVariant getItemData(int role) const Q_DECL_OVERRIDE; + void setItemData(int role, const QVariant &v) override; + QVariant getItemData(int role) const 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 397853afd..b5b12ddd5 100644 --- a/src/designer/src/components/taskmenu/textedit_taskmenu.h +++ b/src/designer/src/components/taskmenu/textedit_taskmenu.h @@ -50,8 +50,8 @@ public: virtual ~TextEditTaskMenu(); - QAction *preferredEditAction() const Q_DECL_OVERRIDE; - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QAction *preferredEditAction() const override; + QList<QAction*> taskActions() const 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 b73ef336d..98c82ab97 100644 --- a/src/designer/src/components/taskmenu/toolbar_taskmenu.h +++ b/src/designer/src/components/taskmenu/toolbar_taskmenu.h @@ -49,8 +49,8 @@ class ToolBarTaskMenu : public QObject, public QDesignerTaskMenuExtension public: explicit ToolBarTaskMenu(QToolBar *tb, QObject *parent = 0); - QAction *preferredEditAction() const Q_DECL_OVERRIDE; - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QAction *preferredEditAction() const override; + QList<QAction*> taskActions() const override; private: QToolBar *m_toolBar; @@ -64,8 +64,8 @@ class StatusBarTaskMenu : public QObject, public QDesignerTaskMenuExtension public: explicit StatusBarTaskMenu(QStatusBar *tb, QObject *parent = 0); - QAction *preferredEditAction() const Q_DECL_OVERRIDE; - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QAction *preferredEditAction() const override; + QList<QAction*> taskActions() const 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 8878b8805..3a7d9d974 100644 --- a/src/designer/src/components/taskmenu/treewidget_taskmenu.h +++ b/src/designer/src/components/taskmenu/treewidget_taskmenu.h @@ -49,8 +49,8 @@ public: explicit TreeWidgetTaskMenu(QTreeWidget *button, QObject *parent = 0); virtual ~TreeWidgetTaskMenu(); - QAction *preferredEditAction() const Q_DECL_OVERRIDE; - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QAction *preferredEditAction() const override; + QList<QAction*> taskActions() const override; private slots: void editItems(); diff --git a/src/designer/src/components/taskmenu/treewidgeteditor.h b/src/designer/src/components/taskmenu/treewidgeteditor.h index f71b4a571..d3f91488a 100644 --- a/src/designer/src/components/taskmenu/treewidgeteditor.h +++ b/src/designer/src/components/taskmenu/treewidgeteditor.h @@ -78,8 +78,8 @@ private slots: void cacheReloaded(); protected: - void setItemData(int role, const QVariant &v) Q_DECL_OVERRIDE; - QVariant getItemData(int role) const Q_DECL_OVERRIDE; + void setItemData(int role, const QVariant &v) override; + QVariant getItemData(int role) const 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 9fb6342df..a1f8727ef 100644 --- a/src/designer/src/components/widgetbox/widgetbox.cpp +++ b/src/designer/src/components/widgetbox/widgetbox.cpp @@ -59,8 +59,8 @@ public: { setFocusPolicy(Qt::NoFocus); } protected: - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void focusInEvent(QFocusEvent *e) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *event) override; + void focusInEvent(QFocusEvent *e) 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 257eec2ad..a17eebd2f 100644 --- a/src/designer/src/components/widgetbox/widgetbox.h +++ b/src/designer/src/components/widgetbox/widgetbox.h @@ -50,30 +50,30 @@ public: QDesignerFormEditorInterface *core() const; - 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; + int categoryCount() const override; + Category category(int cat_idx) const override; + void addCategory(const Category &cat) override; + void removeCategory(int cat_idx) override; - 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; + int widgetCount(int cat_idx) const override; + Widget widget(int cat_idx, int wgt_idx) const override; + void addWidget(int cat_idx, const Widget &wgt) override; + void removeWidget(int cat_idx, int wgt_idx) override; - void dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, const QPoint &global_mouse_pos) Q_DECL_OVERRIDE; + void dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, const QPoint &global_mouse_pos) override; - void setFileName(const QString &file_name) Q_DECL_OVERRIDE; - QString fileName() const Q_DECL_OVERRIDE; - bool load() Q_DECL_OVERRIDE; - bool save() Q_DECL_OVERRIDE; + void setFileName(const QString &file_name) override; + QString fileName() const override; + bool load() override; + bool save() override; - bool loadContents(const QString &contents) Q_DECL_OVERRIDE; - QIcon iconForWidget(const QString &className, const QString &category = QString()) const Q_DECL_OVERRIDE; + bool loadContents(const QString &contents) override; + QIcon iconForWidget(const QString &className, const QString &category = QString()) const override; protected: - void dragEnterEvent (QDragEnterEvent * event) Q_DECL_OVERRIDE; - void dragMoveEvent(QDragMoveEvent * event) Q_DECL_OVERRIDE; - void dropEvent (QDropEvent * event) Q_DECL_OVERRIDE; + void dragEnterEvent (QDragEnterEvent * event) override; + void dragMoveEvent(QDragMoveEvent * event) override; + void dropEvent (QDropEvent * event) 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 6e704b7c1..c3fe46457 100644 --- a/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp +++ b/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp @@ -70,9 +70,9 @@ public: protected: - 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; + QWidget *create(DomWidget *ui_widget, QWidget *parents) override; + QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name) override; + void createCustomWidgets(DomCustomWidgets *) override; }; WidgetBoxResource::WidgetBoxResource(QDesignerFormEditorInterface *core) : diff --git a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp index e278ac417..74a5dfd9a 100644 --- a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp +++ b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp @@ -108,11 +108,11 @@ public: explicit WidgetBoxCategoryModel(QDesignerFormEditorInterface *core, QObject *parent = 0); // QAbstractListModel - 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; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole) override; + Qt::ItemFlags flags (const QModelIndex & index ) const override; + bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; // The model returns no text in icon mode, so, it also needs to know it QListView::ViewMode viewMode() const; diff --git a/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp b/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp index 97209a77b..295dcf4fd 100644 --- a/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp +++ b/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp @@ -246,7 +246,7 @@ class MyCustomWidgets: public QObject, public QDesignerCustomWidgetCollectionInt public: MyCustomWidgets(QObject *parent = 0); - QList<QDesignerCustomWidgetInterface*> customWidgets() const Q_DECL_OVERRIDE; + QList<QDesignerCustomWidgetInterface*> customWidgets() const override; private: QList<QDesignerCustomWidgetInterface*> widgets; diff --git a/src/designer/src/designer/mainwindow.h b/src/designer/src/designer/mainwindow.h index 5420e619d..b94b57a58 100644 --- a/src/designer/src/designer/mainwindow.h +++ b/src/designer/src/designer/mainwindow.h @@ -80,7 +80,7 @@ signals: void closeEventReceived(QCloseEvent *e); protected: - void closeEvent(QCloseEvent *e) Q_DECL_OVERRIDE; + void closeEvent(QCloseEvent *e) override; private: CloseEventPolicy m_policy; }; diff --git a/src/designer/src/designer/qdesigner_formwindow.h b/src/designer/src/designer/qdesigner_formwindow.h index 27280e75f..4c6db524d 100644 --- a/src/designer/src/designer/qdesigner_formwindow.h +++ b/src/designer/src/designer/qdesigner_formwindow.h @@ -66,9 +66,9 @@ signals: void triggerAction(); protected: - void changeEvent(QEvent *e) Q_DECL_OVERRIDE; - void closeEvent(QCloseEvent *ev) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent* rev) Q_DECL_OVERRIDE; + void changeEvent(QEvent *e) override; + void closeEvent(QCloseEvent *ev) override; + void resizeEvent(QResizeEvent* rev) override; private: int getNumberOfUntitledWindows() const; diff --git a/src/designer/src/designer/qdesigner_toolwindow.cpp b/src/designer/src/designer/qdesigner_toolwindow.cpp index 3655fd64e..22446e91f 100644 --- a/src/designer/src/designer/qdesigner_toolwindow.cpp +++ b/src/designer/src/designer/qdesigner_toolwindow.cpp @@ -158,10 +158,10 @@ class PropertyEditorToolWindow : public QDesignerToolWindow public: explicit PropertyEditorToolWindow(QDesignerWorkbench *workbench); - QRect geometryHint() const Q_DECL_OVERRIDE; + QRect geometryHint() const override; protected: - void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *event) override; }; PropertyEditorToolWindow::PropertyEditorToolWindow(QDesignerWorkbench *workbench) : @@ -215,7 +215,7 @@ class ActionEditorToolWindow: public QDesignerToolWindow public: explicit ActionEditorToolWindow(QDesignerWorkbench *workbench); - QRect geometryHint() const Q_DECL_OVERRIDE; + QRect geometryHint() const override; }; ActionEditorToolWindow::ActionEditorToolWindow(QDesignerWorkbench *workbench) : @@ -257,7 +257,7 @@ class ObjectInspectorToolWindow: public QDesignerToolWindow public: explicit ObjectInspectorToolWindow(QDesignerWorkbench *workbench); - QRect geometryHint() const Q_DECL_OVERRIDE; + QRect geometryHint() const override; }; ObjectInspectorToolWindow::ObjectInspectorToolWindow(QDesignerWorkbench *workbench) : @@ -292,7 +292,7 @@ class ResourceEditorToolWindow: public QDesignerToolWindow public: explicit ResourceEditorToolWindow(QDesignerWorkbench *workbench); - QRect geometryHint() const Q_DECL_OVERRIDE; + QRect geometryHint() const override; }; ResourceEditorToolWindow::ResourceEditorToolWindow(QDesignerWorkbench *workbench) : @@ -326,7 +326,7 @@ class SignalSlotEditorToolWindow: public QDesignerToolWindow public: explicit SignalSlotEditorToolWindow(QDesignerWorkbench *workbench); - QRect geometryHint() const Q_DECL_OVERRIDE; + QRect geometryHint() const override; }; SignalSlotEditorToolWindow::SignalSlotEditorToolWindow(QDesignerWorkbench *workbench) : @@ -367,7 +367,7 @@ class WidgetBoxToolWindow: public QDesignerToolWindow public: explicit WidgetBoxToolWindow(QDesignerWorkbench *workbench); - QRect geometryHint() const Q_DECL_OVERRIDE; + QRect geometryHint() const override; }; WidgetBoxToolWindow::WidgetBoxToolWindow(QDesignerWorkbench *workbench) : diff --git a/src/designer/src/designer/qdesigner_toolwindow.h b/src/designer/src/designer/qdesigner_toolwindow.h index 741e8a6bd..4ad6797c7 100644 --- a/src/designer/src/designer/qdesigner_toolwindow.h +++ b/src/designer/src/designer/qdesigner_toolwindow.h @@ -92,9 +92,9 @@ private slots: void showMe(bool); protected: - void showEvent(QShowEvent *e) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent *e) Q_DECL_OVERRIDE; - void changeEvent(QEvent *e) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *e) override; + void hideEvent(QHideEvent *e) override; + void changeEvent(QEvent *e) override; QRect availableToolWindowGeometry() const; diff --git a/src/designer/src/lib/extension/default_extensionfactory.h b/src/designer/src/lib/extension/default_extensionfactory.h index 4e0af3daa..83382eecd 100644 --- a/src/designer/src/lib/extension/default_extensionfactory.h +++ b/src/designer/src/lib/extension/default_extensionfactory.h @@ -47,7 +47,7 @@ class QDESIGNER_EXTENSION_EXPORT QExtensionFactory : public QObject, public QAbs public: explicit QExtensionFactory(QExtensionManager *parent = Q_NULLPTR); - QObject *extension(QObject *object, const QString &iid) const Q_DECL_OVERRIDE; + QObject *extension(QObject *object, const QString &iid) const override; QExtensionManager *extensionManager() const; private Q_SLOTS: diff --git a/src/designer/src/lib/extension/qextensionmanager.h b/src/designer/src/lib/extension/qextensionmanager.h index d40925db1..fced6a1a9 100644 --- a/src/designer/src/lib/extension/qextensionmanager.h +++ b/src/designer/src/lib/extension/qextensionmanager.h @@ -45,10 +45,10 @@ public: explicit QExtensionManager(QObject *parent = Q_NULLPTR); ~QExtensionManager(); - void registerExtensions(QAbstractExtensionFactory *factory, const QString &iid = QString()) Q_DECL_OVERRIDE; - void unregisterExtensions(QAbstractExtensionFactory *factory, const QString &iid = QString()) Q_DECL_OVERRIDE; + void registerExtensions(QAbstractExtensionFactory *factory, const QString &iid = QString()) override; + void unregisterExtensions(QAbstractExtensionFactory *factory, const QString &iid = QString()) override; - QObject *extension(QObject *object, const QString &iid) const Q_DECL_OVERRIDE; + QObject *extension(QObject *object, const QString &iid) const override; private: typedef QList<QAbstractExtensionFactory*> FactoryList; diff --git a/src/designer/src/lib/shared/actioneditor_p.h b/src/designer/src/lib/shared/actioneditor_p.h index d97e2ef00..7ce095311 100644 --- a/src/designer/src/lib/shared/actioneditor_p.h +++ b/src/designer/src/lib/shared/actioneditor_p.h @@ -71,17 +71,17 @@ public: virtual ~ActionEditor(); QDesignerFormWindowInterface *formWindow() const; - void setFormWindow(QDesignerFormWindowInterface *formWindow) Q_DECL_OVERRIDE; + void setFormWindow(QDesignerFormWindowInterface *formWindow) override; - QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; + QDesignerFormEditorInterface *core() const override; QAction *actionNew() const; QAction *actionDelete() const; QString filter() const; - void manageAction(QAction *action) Q_DECL_OVERRIDE; - void unmanageAction(QAction *action) Q_DECL_OVERRIDE; + void manageAction(QAction *action) override; + void unmanageAction(QAction *action) override; static ObjectNamingMode objectNamingMode() { return m_objectNamingMode; } static void setObjectNamingMode(ObjectNamingMode n) { m_objectNamingMode = n; } diff --git a/src/designer/src/lib/shared/actionrepository_p.h b/src/designer/src/lib/shared/actionrepository_p.h index 2f1d3454a..d488fb150 100644 --- a/src/designer/src/lib/shared/actionrepository_p.h +++ b/src/designer/src/lib/shared/actionrepository_p.h @@ -83,9 +83,9 @@ public: QString actionName(int row) const; QAction *actionAt(const QModelIndex &index) const; - QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; - QStringList mimeTypes() const Q_DECL_OVERRIDE; - bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; + QMimeData *mimeData(const QModelIndexList &indexes) const override; + QStringList mimeTypes() const override; + bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override; // Find the associated menus and toolbars, ignore toolbuttons static QWidgetList associatedWidgets(const QAction *action); @@ -127,15 +127,15 @@ signals: void actionActivated(QAction *action); protected slots: - void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) Q_DECL_OVERRIDE; + void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) override; protected: - void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE; - void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE; - void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; - void startDrag(Qt::DropActions supportedActions) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void dropEvent(QDropEvent *event) override; + void focusInEvent(QFocusEvent *event) override; + void contextMenuEvent(QContextMenuEvent *event) override; + void startDrag(Qt::DropActions supportedActions) override; private slots: void slotActivated(const QModelIndex &); @@ -161,15 +161,15 @@ signals: void actionActivated(QAction *action); protected slots: - void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) Q_DECL_OVERRIDE; + void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) override; protected: - void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE; - void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE; - void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; - void startDrag(Qt::DropActions supportedActions) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void dropEvent(QDropEvent *event) override; + void focusInEvent(QFocusEvent *event) override; + void contextMenuEvent(QContextMenuEvent *event) override; + void startDrag(Qt::DropActions supportedActions) override; private slots: void slotActivated(const QModelIndex &); @@ -238,7 +238,7 @@ public: ActionRepositoryMimeData(QAction *, Qt::DropAction dropAction); const ActionList &actionList() const { return m_actionList; } - QStringList formats() const Q_DECL_OVERRIDE; + QStringList formats() const override; static QPixmap actionDragPixmap(const QAction *action); diff --git a/src/designer/src/lib/shared/connectionedit_p.h b/src/designer/src/lib/shared/connectionedit_p.h index 023d165d5..799295789 100644 --- a/src/designer/src/lib/shared/connectionedit_p.h +++ b/src/designer/src/lib/shared/connectionedit_p.h @@ -173,7 +173,7 @@ public: void clear(); - void showEvent(QShowEvent * /*e*/) Q_DECL_OVERRIDE + void showEvent(QShowEvent * /*e*/) override { updateBackground(); } @@ -200,14 +200,14 @@ public slots: void enableUpdateBackground(bool enable); protected: - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; - void contextMenuEvent(QContextMenuEvent * event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void keyPressEvent(QKeyEvent *e) override; + void mouseDoubleClickEvent(QMouseEvent *e) override; + void resizeEvent(QResizeEvent *e) override; + void contextMenuEvent(QContextMenuEvent * event) override; virtual Connection *createConnection(QWidget *source, QWidget *target); virtual void modifyConnection(Connection *con); diff --git a/src/designer/src/lib/shared/dialoggui.cpp b/src/designer/src/lib/shared/dialoggui.cpp index be5f3a7f3..ea3bf65be 100644 --- a/src/designer/src/lib/shared/dialoggui.cpp +++ b/src/designer/src/lib/shared/dialoggui.cpp @@ -53,7 +53,7 @@ class IconProvider : public QFileIconProvider { public: IconProvider(); - QIcon icon (const QFileInfo &info) const Q_DECL_OVERRIDE; + QIcon icon (const QFileInfo &info) const override; inline bool loadCheck(const QFileInfo &info) const; QImage loadImage(const QString &fileName) const; diff --git a/src/designer/src/lib/shared/dialoggui_p.h b/src/designer/src/lib/shared/dialoggui_p.h index aa5c4a10d..a33068ecc 100644 --- a/src/designer/src/lib/shared/dialoggui_p.h +++ b/src/designer/src/lib/shared/dialoggui_p.h @@ -58,27 +58,27 @@ public: QMessageBox::StandardButton message(QWidget *parent, Message context, QMessageBox::Icon icon, const QString &title, const QString &text, QMessageBox::StandardButtons buttons = QMessageBox::Ok, - QMessageBox::StandardButton defaultButton = QMessageBox::NoButton) Q_DECL_OVERRIDE; + QMessageBox::StandardButton defaultButton = QMessageBox::NoButton) override; QMessageBox::StandardButton message(QWidget *parent, Message context, QMessageBox::Icon icon, const QString &title, const QString &text, const QString &informativeText, QMessageBox::StandardButtons buttons = QMessageBox::Ok, - QMessageBox::StandardButton defaultButton = QMessageBox::NoButton) Q_DECL_OVERRIDE; + QMessageBox::StandardButton defaultButton = QMessageBox::NoButton) override; QMessageBox::StandardButton message(QWidget *parent, Message context, QMessageBox::Icon icon, const QString &title, const QString &text, const QString &informativeText, const QString &detailedText, QMessageBox::StandardButtons buttons = QMessageBox::Ok, - QMessageBox::StandardButton defaultButton = QMessageBox::NoButton) Q_DECL_OVERRIDE; + QMessageBox::StandardButton defaultButton = QMessageBox::NoButton) override; - QString getExistingDirectory(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), QFileDialog::Options options = QFileDialog::ShowDirsOnly) Q_DECL_OVERRIDE; - QString getOpenFileName(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0) Q_DECL_OVERRIDE; - QStringList getOpenFileNames(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0) Q_DECL_OVERRIDE; - QString getSaveFileName(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0) Q_DECL_OVERRIDE; + QString getExistingDirectory(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), QFileDialog::Options options = QFileDialog::ShowDirsOnly) override; + QString getOpenFileName(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0) override; + QStringList getOpenFileNames(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0) override; + QString getSaveFileName(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0) override; - QString getOpenImageFileName(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0) Q_DECL_OVERRIDE; - QStringList getOpenImageFileNames(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0) Q_DECL_OVERRIDE; + QString getOpenImageFileName(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0) override; + QStringList getOpenImageFileNames(QWidget *parent = 0, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = 0, QFileDialog::Options options = 0) override; private: QFileIconProvider *ensureIconProvider(); diff --git a/src/designer/src/lib/shared/extensionfactory_p.h b/src/designer/src/lib/shared/extensionfactory_p.h index 02aeef356..683d4627d 100644 --- a/src/designer/src/lib/shared/extensionfactory_p.h +++ b/src/designer/src/lib/shared/extensionfactory_p.h @@ -58,7 +58,7 @@ public: static void registerExtension(QExtensionManager *mgr, const QString &iid); protected: - QObject *createExtension(QObject *qObject, const QString &iid, QObject *parent) const Q_DECL_OVERRIDE; + QObject *createExtension(QObject *qObject, const QString &iid, QObject *parent) const override; private: // Can be overwritten to perform checks on the object. diff --git a/src/designer/src/lib/shared/formwindowbase_p.h b/src/designer/src/lib/shared/formwindowbase_p.h index ceb8beb80..55fe299af 100644 --- a/src/designer/src/lib/shared/formwindowbase_p.h +++ b/src/designer/src/lib/shared/formwindowbase_p.h @@ -76,17 +76,17 @@ public: QVariantMap formData(); void setFormData(const QVariantMap &vm); - QStringList checkContents() const Q_DECL_OVERRIDE; + QStringList checkContents() const override; // Deprecated - QPoint grid() const Q_DECL_OVERRIDE; + QPoint grid() const override; // Deprecated - void setGrid(const QPoint &grid) Q_DECL_OVERRIDE; + void setGrid(const QPoint &grid) override; - bool hasFeature(Feature f) const Q_DECL_OVERRIDE; - Feature features() const Q_DECL_OVERRIDE; - void setFeatures(Feature f) Q_DECL_OVERRIDE; + bool hasFeature(Feature f) const override; + Feature features() const override; + void setFeatures(Feature f) override; const Grid &designerGrid() const; void setDesignerGrid(const Grid& grid); @@ -96,8 +96,8 @@ public: bool gridVisible() const; - ResourceFileSaveMode resourceFileSaveMode() const Q_DECL_OVERRIDE; - void setResourceFileSaveMode(ResourceFileSaveMode behavior) Q_DECL_OVERRIDE; + ResourceFileSaveMode resourceFileSaveMode() const override; + void setResourceFileSaveMode(ResourceFileSaveMode behavior) override; static const Grid &defaultDesignerGrid(); static void setDefaultDesignerGrid(const Grid& grid); @@ -133,8 +133,8 @@ public: DesignerPixmapCache *pixmapCache() const; DesignerIconCache *iconCache() const; - QtResourceSet *resourceSet() const Q_DECL_OVERRIDE; - void setResourceSet(QtResourceSet *resourceSet) Q_DECL_OVERRIDE; + QtResourceSet *resourceSet() const override; + void setResourceSet(QtResourceSet *resourceSet) override; void addReloadableProperty(QDesignerPropertySheet *sheet, int index); void removeReloadableProperty(QDesignerPropertySheet *sheet, int index); void addReloadablePropertySheet(QDesignerPropertySheet *sheet, QObject *object); diff --git a/src/designer/src/lib/shared/metadatabase_p.h b/src/designer/src/lib/shared/metadatabase_p.h index 5770b4201..ab0dc8615 100644 --- a/src/designer/src/lib/shared/metadatabase_p.h +++ b/src/designer/src/lib/shared/metadatabase_p.h @@ -58,14 +58,14 @@ public: explicit MetaDataBaseItem(QObject *object); virtual ~MetaDataBaseItem(); - QString name() const Q_DECL_OVERRIDE; - void setName(const QString &name) Q_DECL_OVERRIDE; + QString name() const override; + void setName(const QString &name) override; - QWidgetList tabOrder() const Q_DECL_OVERRIDE; - void setTabOrder(const QWidgetList &tabOrder) Q_DECL_OVERRIDE; + QWidgetList tabOrder() const override; + void setTabOrder(const QWidgetList &tabOrder) override; - bool enabled() const Q_DECL_OVERRIDE; - void setEnabled(bool b) Q_DECL_OVERRIDE; + bool enabled() const override; + void setEnabled(bool b) override; QString customClassName() const; void setCustomClassName(const QString &customClassName); @@ -92,14 +92,14 @@ public: explicit MetaDataBase(QDesignerFormEditorInterface *core, QObject *parent = 0); virtual ~MetaDataBase(); - QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; + QDesignerFormEditorInterface *core() const override; - QDesignerMetaDataBaseItemInterface *item(QObject *object) const Q_DECL_OVERRIDE { return metaDataBaseItem(object); } + QDesignerMetaDataBaseItemInterface *item(QObject *object) const override { return metaDataBaseItem(object); } virtual MetaDataBaseItem *metaDataBaseItem(QObject *object) const; - void add(QObject *object) Q_DECL_OVERRIDE; - void remove(QObject *object) Q_DECL_OVERRIDE; + void add(QObject *object) override; + void remove(QObject *object) override; - QObjectList objects() const Q_DECL_OVERRIDE; + QObjectList objects() const override; private slots: void slotDestroyed(QObject *object); diff --git a/src/designer/src/lib/shared/newformwidget_p.h b/src/designer/src/lib/shared/newformwidget_p.h index 1ffd2cd2b..7dc5d88e7 100644 --- a/src/designer/src/lib/shared/newformwidget_p.h +++ b/src/designer/src/lib/shared/newformwidget_p.h @@ -76,8 +76,8 @@ public: explicit NewFormWidget(QDesignerFormEditorInterface *core, QWidget *parentWidget); virtual ~NewFormWidget(); - bool hasCurrentTemplate() const Q_DECL_OVERRIDE; - QString currentTemplate(QString *errorMessage = 0) Q_DECL_OVERRIDE; + bool hasCurrentTemplate() const override; + QString currentTemplate(QString *errorMessage = 0) override; // Convenience for implementing file dialogs with preview static QImage grabForm(QDesignerFormEditorInterface *core, diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp index 63520b0ec..b4c76993b 100644 --- a/src/designer/src/lib/shared/previewmanager.cpp +++ b/src/designer/src/lib/shared/previewmanager.cpp @@ -103,7 +103,7 @@ class DesignerZoomProxyWidget : public ZoomProxyWidget { public: DesignerZoomProxyWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0); protected: - QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const Q_DECL_OVERRIDE; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF() ) const override; }; DesignerZoomProxyWidget::DesignerZoomProxyWidget(QGraphicsItem *parent, Qt::WindowFlags wFlags) : @@ -124,7 +124,7 @@ class DesignerZoomWidget : public ZoomWidget { public: DesignerZoomWidget(QWidget *parent = 0); private: - QGraphicsProxyWidget *createProxyWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0) const Q_DECL_OVERRIDE; + QGraphicsProxyWidget *createProxyWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0) const override; }; DesignerZoomWidget::DesignerZoomWidget(QWidget *parent) : @@ -328,7 +328,7 @@ class ZoomablePreviewDeviceSkin : public PreviewDeviceSkin Q_OBJECT public: explicit ZoomablePreviewDeviceSkin(const DeviceSkinParameters ¶meters, QWidget *parent); - void setPreview(QWidget *w) Q_DECL_OVERRIDE; + void setPreview(QWidget *w) override; int zoomPercent() const; // Device Skins have a double 'zoom' property @@ -339,9 +339,9 @@ signals: void zoomPercentChanged(int); protected: - void populateContextMenu(QMenu *m) Q_DECL_OVERRIDE; - QMatrix skinTransform() const Q_DECL_OVERRIDE; - void fitWidget(const QSize &size) Q_DECL_OVERRIDE; + void populateContextMenu(QMenu *m) override; + QMatrix skinTransform() const override; + void fitWidget(const QSize &size) override; private: ZoomMenu *m_zoomMenu; diff --git a/src/designer/src/lib/shared/previewmanager_p.h b/src/designer/src/lib/shared/previewmanager_p.h index 08d67e37f..271df5d1e 100644 --- a/src/designer/src/lib/shared/previewmanager_p.h +++ b/src/designer/src/lib/shared/previewmanager_p.h @@ -132,7 +132,7 @@ public: QPixmap createPreviewPixmap(const QDesignerFormWindowInterface *fw, const QString &style, int deviceProfileIndex /*=-1*/, QString *errorMessage); QPixmap createPreviewPixmap(const QDesignerFormWindowInterface *fw, const QString &style, QString *errorMessage); - bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *watched, QEvent *event) override; public slots: void closeAllPreviews(); diff --git a/src/designer/src/lib/shared/qdesigner_command_p.h b/src/designer/src/lib/shared/qdesigner_command_p.h index 7b9d4ed71..2cccea04b 100644 --- a/src/designer/src/lib/shared/qdesigner_command_p.h +++ b/src/designer/src/lib/shared/qdesigner_command_p.h @@ -139,8 +139,8 @@ public: void init(QWidget *widget); protected: - QWidgetList reorderWidget(const QWidgetList &list, QWidget *widget) const Q_DECL_OVERRIDE; - void reorder(QWidget *widget) const Q_DECL_OVERRIDE; + QWidgetList reorderWidget(const QWidgetList &list, QWidget *widget) const override; + void reorder(QWidget *widget) const override; }; class QDESIGNER_SHARED_EXPORT LowerWidgetCommand: public ChangeZOrderCommand @@ -152,8 +152,8 @@ public: void init(QWidget *widget); protected: - QWidgetList reorderWidget(const QWidgetList &list, QWidget *widget) const Q_DECL_OVERRIDE; - void reorder(QWidget *widget) const Q_DECL_OVERRIDE; + QWidgetList reorderWidget(const QWidgetList &list, QWidget *widget) const override; + void reorder(QWidget *widget) const override; }; class QDESIGNER_SHARED_EXPORT AdjustWidgetSizeCommand: public QDesignerFormWindowCommand diff --git a/src/designer/src/lib/shared/qdesigner_dnditem_p.h b/src/designer/src/lib/shared/qdesigner_dnditem_p.h index d4ce2f678..f8bc9124f 100644 --- a/src/designer/src/lib/shared/qdesigner_dnditem_p.h +++ b/src/designer/src/lib/shared/qdesigner_dnditem_p.h @@ -61,13 +61,13 @@ public: explicit QDesignerDnDItem(DropType type, QWidget *source = 0); virtual ~QDesignerDnDItem(); - DomUI *domUi() const Q_DECL_OVERRIDE; - QWidget *decoration() const Q_DECL_OVERRIDE; - QWidget *widget() const Q_DECL_OVERRIDE; - QPoint hotSpot() const Q_DECL_OVERRIDE; - QWidget *source() const Q_DECL_OVERRIDE; + DomUI *domUi() const override; + QWidget *decoration() const override; + QWidget *widget() const override; + QPoint hotSpot() const override; + QWidget *source() const override; - DropType type() const Q_DECL_OVERRIDE; + DropType type() const override; protected: void setDomUi(DomUI *dom_ui); diff --git a/src/designer/src/lib/shared/qdesigner_formbuilder_p.h b/src/designer/src/lib/shared/qdesigner_formbuilder_p.h index 8dc2efb94..5ea570520 100644 --- a/src/designer/src/lib/shared/qdesigner_formbuilder_p.h +++ b/src/designer/src/lib/shared/qdesigner_formbuilder_p.h @@ -98,22 +98,22 @@ protected: using QFormBuilder::createDom; using QFormBuilder::create; - QWidget *create(DomUI *ui, QWidget *parentWidget) Q_DECL_OVERRIDE; - DomWidget *createDom(QWidget *widget, DomWidget *ui_parentWidget, bool recursive = true) 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; - void createResources(DomResources *resources) Q_DECL_OVERRIDE; + QWidget *create(DomUI *ui, QWidget *parentWidget) override; + DomWidget *createDom(QWidget *widget, DomWidget *ui_parentWidget, bool recursive = true) override; + QWidget *create(DomWidget *ui_widget, QWidget *parentWidget) override; + QLayout *create(DomLayout *ui_layout, QLayout *layout, QWidget *parentWidget) override; + void createResources(DomResources *resources) override; - QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name) Q_DECL_OVERRIDE; - bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) Q_DECL_OVERRIDE; - bool addItem(DomLayoutItem *ui_item, QLayoutItem *item, QLayout *layout) Q_DECL_OVERRIDE; + QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name) override; + bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) override; + bool addItem(DomLayoutItem *ui_item, QLayoutItem *item, QLayout *layout) override; virtual QIcon nameToIcon(const QString &filePath, const QString &qrcPath); virtual QPixmap nameToPixmap(const QString &filePath, const QString &qrcPath); - void applyProperties(QObject *o, const QList<DomProperty*> &properties) Q_DECL_OVERRIDE; + void applyProperties(QObject *o, const QList<DomProperty*> &properties) override; - void loadExtraInfo(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) Q_DECL_OVERRIDE; + void loadExtraInfo(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) override; QtResourceSet *internalResourceSet() const { return m_tempResourceSet; } @@ -144,7 +144,7 @@ public: const DeviceProfile &deviceProfile = DeviceProfile()); protected: - void createCustomWidgets(DomCustomWidgets *) Q_DECL_OVERRIDE; + void createCustomWidgets(DomCustomWidgets *) override; }; diff --git a/src/designer/src/lib/shared/qdesigner_introspection.cpp b/src/designer/src/lib/shared/qdesigner_introspection.cpp index 2304db4d5..321140c8c 100644 --- a/src/designer/src/lib/shared/qdesigner_introspection.cpp +++ b/src/designer/src/lib/shared/qdesigner_introspection.cpp @@ -59,17 +59,17 @@ namespace { class QDesignerMetaEnum : public QDesignerMetaEnumInterface { public: QDesignerMetaEnum(const QMetaEnum &qEnum); - bool isFlag() const Q_DECL_OVERRIDE { return m_enum.isFlag(); } - QString key(int index) const Q_DECL_OVERRIDE { return charToQString(m_enum.key(index)); } - int keyCount() const Q_DECL_OVERRIDE { return m_enum.keyCount(); } - int keyToValue(const QString &key) const Q_DECL_OVERRIDE { return m_enum.keyToValue(key.toUtf8()); } - int keysToValue(const QString &keys) const Q_DECL_OVERRIDE { return m_enum.keysToValue(keys.toUtf8()); } - QString name() const Q_DECL_OVERRIDE { return m_name; } - QString scope() const Q_DECL_OVERRIDE { return m_scope; } - QString separator() const Q_DECL_OVERRIDE; - int value(int index) const Q_DECL_OVERRIDE { return m_enum.value(index); } - QString valueToKey(int value) const Q_DECL_OVERRIDE { return charToQString(m_enum.valueToKey(value)); } - QString valueToKeys(int value) const Q_DECL_OVERRIDE { return charToQString(m_enum.valueToKeys(value)); } + bool isFlag() const override { return m_enum.isFlag(); } + QString key(int index) const override { return charToQString(m_enum.key(index)); } + int keyCount() const override { return m_enum.keyCount(); } + int keyToValue(const QString &key) const override { return m_enum.keyToValue(key.toUtf8()); } + int keysToValue(const QString &keys) const override { return m_enum.keysToValue(keys.toUtf8()); } + QString name() const override { return m_name; } + QString scope() const override { return m_scope; } + QString separator() const override; + int value(int index) const override { return m_enum.value(index); } + QString valueToKey(int value) const override { return charToQString(m_enum.valueToKey(value)); } + QString valueToKeys(int value) const override { return charToQString(m_enum.valueToKeys(value)); } private: const QMetaEnum m_enum; @@ -96,22 +96,22 @@ namespace { QDesignerMetaProperty(const QMetaProperty &property); virtual ~QDesignerMetaProperty(); - const QDesignerMetaEnumInterface *enumerator() const Q_DECL_OVERRIDE { return m_enumerator; } + const QDesignerMetaEnumInterface *enumerator() const override { return m_enumerator; } - Kind kind() const Q_DECL_OVERRIDE { return m_kind; } + Kind kind() const override { return m_kind; } - AccessFlags accessFlags() const Q_DECL_OVERRIDE { return m_access; } - Attributes attributes(const QObject *object = 0) const Q_DECL_OVERRIDE; + AccessFlags accessFlags() const override { return m_access; } + Attributes attributes(const QObject *object = 0) const override; - QVariant::Type type() const Q_DECL_OVERRIDE { return m_property.type(); } - QString name() const Q_DECL_OVERRIDE { return m_name; } - QString typeName() const Q_DECL_OVERRIDE { return m_typeName; } - int userType() const Q_DECL_OVERRIDE { return m_property.userType(); } - bool hasSetter() const Q_DECL_OVERRIDE { return m_property.hasStdCppSet(); } + QVariant::Type type() const override { return m_property.type(); } + QString name() const override { return m_name; } + QString typeName() const override { return m_typeName; } + int userType() const override { return m_property.userType(); } + bool hasSetter() const override { return m_property.hasStdCppSet(); } - QVariant read(const QObject *object) const Q_DECL_OVERRIDE { return m_property.read(object); } - bool reset(QObject *object) const Q_DECL_OVERRIDE { return m_property.reset(object); } - bool write(QObject *object, const QVariant &value) const Q_DECL_OVERRIDE { return m_property.write(object, value); } + QVariant read(const QObject *object) const override { return m_property.read(object); } + bool reset(QObject *object) const override { return m_property.reset(object); } + bool write(QObject *object, const QVariant &value) const override { return m_property.write(object, value); } private: const QMetaProperty m_property; diff --git a/src/designer/src/lib/shared/qdesigner_introspection_p.h b/src/designer/src/lib/shared/qdesigner_introspection_p.h index d3e1b86b7..75d6206b6 100644 --- a/src/designer/src/lib/shared/qdesigner_introspection_p.h +++ b/src/designer/src/lib/shared/qdesigner_introspection_p.h @@ -56,7 +56,7 @@ namespace qdesigner_internal { QDesignerIntrospection(); virtual ~QDesignerIntrospection(); - const QDesignerMetaObjectInterface* metaObject(const QObject *object) const Q_DECL_OVERRIDE; + const QDesignerMetaObjectInterface* metaObject(const QObject *object) const override; const QDesignerMetaObjectInterface* metaObjectForQMetaObject(const QMetaObject *metaObject) const; private: diff --git a/src/designer/src/lib/shared/qdesigner_membersheet_p.h b/src/designer/src/lib/shared/qdesigner_membersheet_p.h index 93b0eac92..78776d75c 100644 --- a/src/designer/src/lib/shared/qdesigner_membersheet_p.h +++ b/src/designer/src/lib/shared/qdesigner_membersheet_p.h @@ -59,29 +59,29 @@ public: explicit QDesignerMemberSheet(QObject *object, QObject *parent = 0); virtual ~QDesignerMemberSheet(); - int indexOf(const QString &name) const Q_DECL_OVERRIDE; + int indexOf(const QString &name) const override; - int count() const Q_DECL_OVERRIDE; - QString memberName(int index) const Q_DECL_OVERRIDE; + int count() const override; + QString memberName(int index) const override; - QString memberGroup(int index) const Q_DECL_OVERRIDE; - void setMemberGroup(int index, const QString &group) Q_DECL_OVERRIDE; + QString memberGroup(int index) const override; + void setMemberGroup(int index, const QString &group) override; - bool isVisible(int index) const Q_DECL_OVERRIDE; - void setVisible(int index, bool b) Q_DECL_OVERRIDE; + bool isVisible(int index) const override; + void setVisible(int index, bool b) override; - bool isSignal(int index) const Q_DECL_OVERRIDE; - bool isSlot(int index) const Q_DECL_OVERRIDE; + bool isSignal(int index) const override; + bool isSlot(int index) const override; - bool inheritedFromWidget(int index) const Q_DECL_OVERRIDE; + bool inheritedFromWidget(int index) const override; static bool signalMatchesSlot(const QString &signal, const QString &slot); - QString declaredInClass(int index) const Q_DECL_OVERRIDE; + QString declaredInClass(int index) const override; - QString signature(int index) const Q_DECL_OVERRIDE; - QList<QByteArray> parameterTypes(int index) const Q_DECL_OVERRIDE; - QList<QByteArray> parameterNames(int index) const Q_DECL_OVERRIDE; + QString signature(int index) const override; + QList<QByteArray> parameterTypes(int index) const override; + QList<QByteArray> parameterNames(int index) const override; private: QDesignerMemberSheetPrivate *d; @@ -96,7 +96,7 @@ public: QDesignerMemberSheetFactory(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; }; QT_END_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_menu_p.h b/src/designer/src/lib/shared/qdesigner_menu_p.h index e8811a225..f868bf3b9 100644 --- a/src/designer/src/lib/shared/qdesigner_menu_p.h +++ b/src/designer/src/lib/shared/qdesigner_menu_p.h @@ -71,7 +71,7 @@ public: QDesignerMenu(QWidget *parent = 0); virtual ~QDesignerMenu(); - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *event) override; QDesignerFormWindowInterface *formWindow() const; QDesignerActionProviderExtension *actionProvider(); @@ -79,7 +79,7 @@ public: QDesignerMenu *parentMenu() const; QDesignerMenuBar *parentMenuBar() const; - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setVisible(bool visible) override; void adjustSpecialActions(); @@ -109,15 +109,15 @@ private slots: void slotAdjustSizeNow(); protected: - void actionEvent(QActionEvent *event) Q_DECL_OVERRIDE; - 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; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + void actionEvent(QActionEvent *event) override; + void dragEnterEvent(QDragEnterEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; + void dropEvent(QDropEvent *event) override; + void paintEvent(QPaintEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void showEvent(QShowEvent *event) override; bool handleEvent(QWidget *widget, QEvent *event); bool handleMouseDoubleClickEvent(QWidget *widget, QMouseEvent *event); diff --git a/src/designer/src/lib/shared/qdesigner_menubar_p.h b/src/designer/src/lib/shared/qdesigner_menubar_p.h index 2ea794ae7..0045c4f71 100644 --- a/src/designer/src/lib/shared/qdesigner_menubar_p.h +++ b/src/designer/src/lib/shared/qdesigner_menubar_p.h @@ -76,7 +76,7 @@ public: QDesignerMenuBar(QWidget *parent = 0); virtual ~QDesignerMenuBar(); - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *event) override; QDesignerFormWindowInterface *formWindow() const; QDesignerActionProviderExtension *actionProvider(); @@ -99,15 +99,15 @@ private slots: void slotRemoveMenuBar(); protected: - void actionEvent(QActionEvent *event) Q_DECL_OVERRIDE; - 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; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void actionEvent(QActionEvent *event) override; + void dragEnterEvent(QDragEnterEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; + void dropEvent(QDropEvent *event) override; + void paintEvent(QPaintEvent *event) override; + void focusOutEvent(QFocusEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; bool handleEvent(QWidget *widget, QEvent *event); bool handleMouseDoubleClickEvent(QWidget *widget, QMouseEvent *event); diff --git a/src/designer/src/lib/shared/qdesigner_promotion_p.h b/src/designer/src/lib/shared/qdesigner_promotion_p.h index e8165926b..9017d6de4 100644 --- a/src/designer/src/lib/shared/qdesigner_promotion_p.h +++ b/src/designer/src/lib/shared/qdesigner_promotion_p.h @@ -55,22 +55,22 @@ namespace qdesigner_internal { public: explicit QDesignerPromotion(QDesignerFormEditorInterface *core); - PromotedClasses promotedClasses() const Q_DECL_OVERRIDE; + PromotedClasses promotedClasses() const override; - QSet<QString> referencedPromotedClassNames() const Q_DECL_OVERRIDE; + QSet<QString> referencedPromotedClassNames() const override; virtual bool addPromotedClass(const QString &baseClass, const QString &className, const QString &includeFile, - QString *errorMessage) Q_DECL_OVERRIDE; + QString *errorMessage) override; - bool removePromotedClass(const QString &className, QString *errorMessage) Q_DECL_OVERRIDE; + bool removePromotedClass(const QString &className, QString *errorMessage) override; - bool changePromotedClassName(const QString &oldclassName, const QString &newClassName, QString *errorMessage) Q_DECL_OVERRIDE; + bool changePromotedClassName(const QString &oldclassName, const QString &newClassName, QString *errorMessage) override; - bool setPromotedClassIncludeFile(const QString &className, const QString &includeFile, QString *errorMessage) Q_DECL_OVERRIDE; + bool setPromotedClassIncludeFile(const QString &className, const QString &includeFile, QString *errorMessage) override; - QList<QDesignerWidgetDataBaseItemInterface *> promotionBaseClasses() const Q_DECL_OVERRIDE; + QList<QDesignerWidgetDataBaseItemInterface *> promotionBaseClasses() const override; private: bool canBePromoted(const QDesignerWidgetDataBaseItemInterface *) const; diff --git a/src/designer/src/lib/shared/qdesigner_propertysheet_p.h b/src/designer/src/lib/shared/qdesigner_propertysheet_p.h index b44398bc8..70557a798 100644 --- a/src/designer/src/lib/shared/qdesigner_propertysheet_p.h +++ b/src/designer/src/lib/shared/qdesigner_propertysheet_p.h @@ -72,35 +72,35 @@ public: explicit QDesignerPropertySheet(QObject *object, QObject *parent = 0); virtual ~QDesignerPropertySheet(); - int indexOf(const QString &name) const Q_DECL_OVERRIDE; + int indexOf(const QString &name) const override; - int count() const Q_DECL_OVERRIDE; - QString propertyName(int index) const Q_DECL_OVERRIDE; + int count() const override; + QString propertyName(int index) const override; - QString propertyGroup(int index) const Q_DECL_OVERRIDE; - void setPropertyGroup(int index, const QString &group) Q_DECL_OVERRIDE; + QString propertyGroup(int index) const override; + void setPropertyGroup(int index, const QString &group) override; - bool hasReset(int index) const Q_DECL_OVERRIDE; - bool reset(int index) Q_DECL_OVERRIDE; + bool hasReset(int index) const override; + bool reset(int index) override; - bool isAttribute(int index) const Q_DECL_OVERRIDE; - void setAttribute(int index, bool b) Q_DECL_OVERRIDE; + bool isAttribute(int index) const override; + void setAttribute(int index, bool b) override; - bool isVisible(int index) const Q_DECL_OVERRIDE; - void setVisible(int index, bool b) Q_DECL_OVERRIDE; + bool isVisible(int index) const override; + void setVisible(int index, bool b) override; - QVariant property(int index) const Q_DECL_OVERRIDE; - void setProperty(int index, const QVariant &value) Q_DECL_OVERRIDE; + QVariant property(int index) const override; + void setProperty(int index, const QVariant &value) override; - bool isChanged(int index) const Q_DECL_OVERRIDE; + bool isChanged(int index) const override; - void setChanged(int index, bool changed) Q_DECL_OVERRIDE; + void setChanged(int index, bool changed) override; - bool dynamicPropertiesAllowed() const Q_DECL_OVERRIDE; - int addDynamicProperty(const QString &propertyName, const QVariant &value) Q_DECL_OVERRIDE; - bool removeDynamicProperty(int index) Q_DECL_OVERRIDE; - bool isDynamicProperty(int index) const Q_DECL_OVERRIDE; - bool canAddDynamicProperty(const QString &propertyName) const Q_DECL_OVERRIDE; + bool dynamicPropertiesAllowed() const override; + int addDynamicProperty(const QString &propertyName, const QVariant &value) override; + bool removeDynamicProperty(int index) override; + bool isDynamicProperty(int index) const override; + bool canAddDynamicProperty(const QString &propertyName) const override; bool isDefaultDynamicProperty(int index) const; @@ -113,7 +113,7 @@ public: void setIconCache(qdesigner_internal::DesignerIconCache *cache); int createFakeProperty(const QString &propertyName, const QVariant &value = QVariant()); - bool isEnabled(int index) const Q_DECL_OVERRIDE; + bool isEnabled(int index) const override; QObject *object() const; static bool internalDynamicPropertiesEnabled(); @@ -218,7 +218,7 @@ public: private: // Does a qobject_cast on the object. - QObject *createPropertySheet(QObject *qObject, QObject *parent) const Q_DECL_OVERRIDE; + QObject *createPropertySheet(QObject *qObject, QObject *parent) const override; }; template <class Object, class PropertySheet> diff --git a/src/designer/src/lib/shared/qdesigner_qsettings_p.h b/src/designer/src/lib/shared/qdesigner_qsettings_p.h index 7ee554666..9135bd241 100644 --- a/src/designer/src/lib/shared/qdesigner_qsettings_p.h +++ b/src/designer/src/lib/shared/qdesigner_qsettings_p.h @@ -54,13 +54,13 @@ class QDESIGNER_SHARED_EXPORT QDesignerQSettings : public QDesignerSettingsInter public: QDesignerQSettings(); - void beginGroup(const QString &prefix) Q_DECL_OVERRIDE; - void endGroup() Q_DECL_OVERRIDE; + void beginGroup(const QString &prefix) override; + void endGroup() override; - bool contains(const QString &key) const Q_DECL_OVERRIDE; - void setValue(const QString &key, const QVariant &value) Q_DECL_OVERRIDE; - QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const Q_DECL_OVERRIDE; - void remove(const QString &key) Q_DECL_OVERRIDE; + bool contains(const QString &key) const override; + void setValue(const QString &key, const QVariant &value) override; + QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const override; + void remove(const QString &key) override; // The application name to be used for settings. Allows for including // the Qt version to prevent settings of different Qt versions from diff --git a/src/designer/src/lib/shared/qdesigner_stackedbox_p.h b/src/designer/src/lib/shared/qdesigner_stackedbox_p.h index 8abc4c117..991bb86c1 100644 --- a/src/designer/src/lib/shared/qdesigner_stackedbox_p.h +++ b/src/designer/src/lib/shared/qdesigner_stackedbox_p.h @@ -114,7 +114,7 @@ private slots: void changeOrder(); protected: - void gotoPage(int page) Q_DECL_OVERRIDE; + void gotoPage(int page) override; private: QAction *m_actionPreviousPage; @@ -131,10 +131,10 @@ class QDESIGNER_SHARED_EXPORT QStackedWidgetPropertySheet : public QDesignerProp public: explicit QStackedWidgetPropertySheet(QStackedWidget *object, QObject *parent = 0); - 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; - bool isEnabled(int index) const Q_DECL_OVERRIDE; + void setProperty(int index, const QVariant &value) override; + QVariant property(int index) const override; + bool reset(int index) override; + bool isEnabled(int index) const 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/lib/shared/qdesigner_tabwidget_p.h b/src/designer/src/lib/shared/qdesigner_tabwidget_p.h index 5c94d5425..e9419eb30 100644 --- a/src/designer/src/lib/shared/qdesigner_tabwidget_p.h +++ b/src/designer/src/lib/shared/qdesigner_tabwidget_p.h @@ -75,7 +75,7 @@ public: // Add context menu and return page submenu or 0. QMenu *addContextMenuActions(QMenu *popup); - bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; + bool eventFilter(QObject *o, QEvent *e) override; QDesignerFormWindowInterface *formWindow() const; @@ -108,10 +108,10 @@ class QDESIGNER_SHARED_EXPORT QTabWidgetPropertySheet : public QDesignerProperty public: explicit QTabWidgetPropertySheet(QTabWidget *object, QObject *parent = 0); - 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; - bool isEnabled(int index) const Q_DECL_OVERRIDE; + void setProperty(int index, const QVariant &value) override; + QVariant property(int index) const override; + bool reset(int index) override; + bool isEnabled(int index) const 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/lib/shared/qdesigner_taskmenu_p.h b/src/designer/src/lib/shared/qdesigner_taskmenu_p.h index 5893114d6..0d3061e84 100644 --- a/src/designer/src/lib/shared/qdesigner_taskmenu_p.h +++ b/src/designer/src/lib/shared/qdesigner_taskmenu_p.h @@ -68,7 +68,7 @@ public: QWidget *widget() const; - QList<QAction*> taskActions() const Q_DECL_OVERRIDE; + QList<QAction*> taskActions() const override; enum PropertyMode { CurrentWidgetMode, MultiSelectionMode }; diff --git a/src/designer/src/lib/shared/qdesigner_toolbar_p.h b/src/designer/src/lib/shared/qdesigner_toolbar_p.h index 7d0fecbce..d5173dc66 100644 --- a/src/designer/src/lib/shared/qdesigner_toolbar_p.h +++ b/src/designer/src/lib/shared/qdesigner_toolbar_p.h @@ -82,7 +82,7 @@ public: // Utility to create an action static QAction *createAction(QDesignerFormWindowInterface *fw, const QString &objectName, bool separator); - bool eventFilter (QObject *watched, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter (QObject *watched, QEvent *event) override; // Helper for task menu extension QList<QAction *> contextMenuActions(const QPoint &globalPos = QPoint(-1, -1)); diff --git a/src/designer/src/lib/shared/qdesigner_toolbox_p.h b/src/designer/src/lib/shared/qdesigner_toolbox_p.h index ae46ffd98..a41df57e2 100644 --- a/src/designer/src/lib/shared/qdesigner_toolbox_p.h +++ b/src/designer/src/lib/shared/qdesigner_toolbox_p.h @@ -96,10 +96,10 @@ class QDESIGNER_SHARED_EXPORT QToolBoxWidgetPropertySheet : public QDesignerProp public: explicit QToolBoxWidgetPropertySheet(QToolBox *object, QObject *parent = 0); - 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; - bool isEnabled(int index) const Q_DECL_OVERRIDE; + void setProperty(int index, const QVariant &value) override; + QVariant property(int index) const override; + bool reset(int index) override; + bool isEnabled(int index) const 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/lib/shared/qdesigner_widget_p.h b/src/designer/src/lib/shared/qdesigner_widget_p.h index 28ac54115..6efdcbbf2 100644 --- a/src/designer/src/lib/shared/qdesigner_widget_p.h +++ b/src/designer/src/lib/shared/qdesigner_widget_p.h @@ -63,11 +63,11 @@ public: void updatePixmap(); - QSize minimumSizeHint() const Q_DECL_OVERRIDE + QSize minimumSizeHint() const override { return QWidget::minimumSizeHint().expandedTo(QSize(16, 16)); } protected: - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *e) override; private: qdesigner_internal::FormWindowBase* m_formWindow; diff --git a/src/designer/src/lib/shared/qdesigner_widgetitem_p.h b/src/designer/src/lib/shared/qdesigner_widgetitem_p.h index 14dc88c82..8f9ab7816 100644 --- a/src/designer/src/lib/shared/qdesigner_widgetitem_p.h +++ b/src/designer/src/lib/shared/qdesigner_widgetitem_p.h @@ -76,8 +76,8 @@ public: inline QWidget *constWidget() const { return const_cast<QDesignerWidgetItem*>(this)->widget(); } - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize minimumSize() const override; + QSize sizeHint() const override; // Resize: Takes effect if the contained widget does not have a layout QSize nonLaidOutMinSize() const; @@ -98,7 +98,7 @@ public: static bool subjectToStretch(const QLayout *layout, QWidget *w); - bool eventFilter(QObject * watched, QEvent * event) Q_DECL_OVERRIDE; + bool eventFilter(QObject * watched, QEvent * event) override; private slots: void layoutChanged(); diff --git a/src/designer/src/lib/shared/qlayout_widget.cpp b/src/designer/src/lib/shared/qlayout_widget.cpp index 948364276..a7bec9180 100644 --- a/src/designer/src/lib/shared/qlayout_widget.cpp +++ b/src/designer/src/lib/shared/qlayout_widget.cpp @@ -451,16 +451,16 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const public: BoxLayoutHelper(const Qt::Orientation orientation) : m_orientation(orientation) {} - QRect itemInfo(QLayout *lt, int index) const Q_DECL_OVERRIDE; - void insertWidget(QLayout *lt, const QRect &info, QWidget *w) Q_DECL_OVERRIDE; - void removeWidget(QLayout *lt, QWidget *widget) Q_DECL_OVERRIDE; - void replaceWidget(QLayout *lt, QWidget *before, QWidget *after) Q_DECL_OVERRIDE; + QRect itemInfo(QLayout *lt, int index) const override; + void insertWidget(QLayout *lt, const QRect &info, QWidget *w) override; + void removeWidget(QLayout *lt, QWidget *widget) override; + void replaceWidget(QLayout *lt, QWidget *before, QWidget *after) override; - void pushState(const QDesignerFormEditorInterface *, const QWidget *) Q_DECL_OVERRIDE; - void popState(const QDesignerFormEditorInterface *, QWidget *) Q_DECL_OVERRIDE; + void pushState(const QDesignerFormEditorInterface *, const QWidget *) override; + void popState(const QDesignerFormEditorInterface *, QWidget *) override; - bool canSimplify(const QDesignerFormEditorInterface *, const QWidget *, const QRect &) const Q_DECL_OVERRIDE { return false; } - void simplify(const QDesignerFormEditorInterface *, QWidget *, const QRect &) Q_DECL_OVERRIDE {} + bool canSimplify(const QDesignerFormEditorInterface *, const QWidget *, const QRect &) const override { return false; } + void simplify(const QDesignerFormEditorInterface *, QWidget *, const QRect &) override {} // Helper for restoring layout states typedef QVector <QLayoutItem *> LayoutItemVector; @@ -867,16 +867,16 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const public: GridLayoutHelper() {} - QRect itemInfo(QLayout *lt, int index) const Q_DECL_OVERRIDE; - void insertWidget(QLayout *lt, const QRect &info, QWidget *w) Q_DECL_OVERRIDE; - void removeWidget(QLayout *lt, QWidget *widget) Q_DECL_OVERRIDE; - void replaceWidget(QLayout *lt, QWidget *before, QWidget *after) Q_DECL_OVERRIDE; + QRect itemInfo(QLayout *lt, int index) const override; + void insertWidget(QLayout *lt, const QRect &info, QWidget *w) override; + void removeWidget(QLayout *lt, QWidget *widget) override; + void replaceWidget(QLayout *lt, QWidget *before, QWidget *after) override; - void pushState(const QDesignerFormEditorInterface *core, const QWidget *widgetWithManagedLayout) Q_DECL_OVERRIDE; - void popState(const QDesignerFormEditorInterface *core, QWidget *widgetWithManagedLayout) Q_DECL_OVERRIDE; + void pushState(const QDesignerFormEditorInterface *core, const QWidget *widgetWithManagedLayout) override; + void popState(const QDesignerFormEditorInterface *core, QWidget *widgetWithManagedLayout) override; - bool canSimplify(const QDesignerFormEditorInterface *core, const QWidget *widgetWithManagedLayout, const QRect &restrictionArea) const Q_DECL_OVERRIDE; - void simplify(const QDesignerFormEditorInterface *core, QWidget *widgetWithManagedLayout, const QRect &restrictionArea) Q_DECL_OVERRIDE; + bool canSimplify(const QDesignerFormEditorInterface *core, const QWidget *widgetWithManagedLayout, const QRect &restrictionArea) const override; + void simplify(const QDesignerFormEditorInterface *core, QWidget *widgetWithManagedLayout, const QRect &restrictionArea) override; static void insertRow(QGridLayout *grid, int row); @@ -1024,16 +1024,16 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const FormLayoutHelper() {} - QRect itemInfo(QLayout *lt, int index) const Q_DECL_OVERRIDE; - void insertWidget(QLayout *lt, const QRect &info, QWidget *w) Q_DECL_OVERRIDE; - void removeWidget(QLayout *lt, QWidget *widget) Q_DECL_OVERRIDE; - void replaceWidget(QLayout *lt, QWidget *before, QWidget *after) Q_DECL_OVERRIDE; + QRect itemInfo(QLayout *lt, int index) const override; + void insertWidget(QLayout *lt, const QRect &info, QWidget *w) override; + void removeWidget(QLayout *lt, QWidget *widget) override; + void replaceWidget(QLayout *lt, QWidget *before, QWidget *after) override; - void pushState(const QDesignerFormEditorInterface *core, const QWidget *widgetWithManagedLayout) Q_DECL_OVERRIDE; - void popState(const QDesignerFormEditorInterface *core, QWidget *widgetWithManagedLayout) Q_DECL_OVERRIDE; + void pushState(const QDesignerFormEditorInterface *core, const QWidget *widgetWithManagedLayout) override; + void popState(const QDesignerFormEditorInterface *core, QWidget *widgetWithManagedLayout) override; - bool canSimplify(const QDesignerFormEditorInterface *core, const QWidget *, const QRect &) const Q_DECL_OVERRIDE; - void simplify(const QDesignerFormEditorInterface *, QWidget *, const QRect &) Q_DECL_OVERRIDE; + bool canSimplify(const QDesignerFormEditorInterface *core, const QWidget *, const QRect &) const override; + void simplify(const QDesignerFormEditorInterface *, QWidget *, const QRect &) override; private: static FormLayoutState state(const QFormLayout *lt); @@ -1546,20 +1546,20 @@ class QBoxLayoutSupport: public QLayoutSupport public: QBoxLayoutSupport(QDesignerFormWindowInterface *formWindow, QWidget *widget, Qt::Orientation orientation, QObject *parent = 0); - void insertWidget(QWidget *widget, const QPair<int, int> &cell) Q_DECL_OVERRIDE; - void removeWidget(QWidget *widget) Q_DECL_OVERRIDE; - void simplify() Q_DECL_OVERRIDE {} - void insertRow(int /*row*/) Q_DECL_OVERRIDE {} - void insertColumn(int /*column*/) Q_DECL_OVERRIDE {} + void insertWidget(QWidget *widget, const QPair<int, int> &cell) override; + void removeWidget(QWidget *widget) override; + void simplify() override {} + void insertRow(int /*row*/) override {} + void insertColumn(int /*column*/) override {} - int findItemAt(int /*at_row*/, int /*at_column*/) const Q_DECL_OVERRIDE { return -1; } + int findItemAt(int /*at_row*/, int /*at_column*/) const override { return -1; } using QLayoutSupport::findItemAt; private: - void setCurrentCellFromIndicatorOnEmptyCell(int index) Q_DECL_OVERRIDE; - void setCurrentCellFromIndicator(Qt::Orientation indicatorOrientation, int index, int increment) Q_DECL_OVERRIDE; - bool supportsIndicatorOrientation(Qt::Orientation indicatorOrientation) const Q_DECL_OVERRIDE; - QRect extendedGeometry(int index) const Q_DECL_OVERRIDE; + void setCurrentCellFromIndicatorOnEmptyCell(int index) override; + void setCurrentCellFromIndicator(Qt::Orientation indicatorOrientation, int index, int increment) override; + bool supportsIndicatorOrientation(Qt::Orientation indicatorOrientation) const override; + QRect extendedGeometry(int index) const override; const Qt::Orientation m_orientation; }; @@ -1678,9 +1678,9 @@ public: GridLikeLayoutSupportBase(QDesignerFormWindowInterface *formWindow, QWidget *widget, LayoutHelper *helper, QObject *parent = 0) : QLayoutSupport(formWindow, widget, helper, parent) {} - void insertWidget(QWidget *widget, const QPair<int, int> &cell) Q_DECL_OVERRIDE; - void removeWidget(QWidget *widget) Q_DECL_OVERRIDE { helper()->removeWidget(layout(), widget); } - int findItemAt(int row, int column) const Q_DECL_OVERRIDE; + void insertWidget(QWidget *widget, const QPair<int, int> &cell) override; + void removeWidget(QWidget *widget) override { helper()->removeWidget(layout(), widget); } + int findItemAt(int row, int column) const override; using QLayoutSupport::findItemAt; protected: @@ -1690,11 +1690,11 @@ protected: private: - void setCurrentCellFromIndicatorOnEmptyCell(int index) Q_DECL_OVERRIDE; - void setCurrentCellFromIndicator(Qt::Orientation indicatorOrientation, int index, int increment) Q_DECL_OVERRIDE; - bool supportsIndicatorOrientation(Qt::Orientation) const Q_DECL_OVERRIDE { return true; } + void setCurrentCellFromIndicatorOnEmptyCell(int index) override; + void setCurrentCellFromIndicator(Qt::Orientation indicatorOrientation, int index, int increment) override; + bool supportsIndicatorOrientation(Qt::Orientation) const override { return true; } - QRect extendedGeometry(int index) const Q_DECL_OVERRIDE; + QRect extendedGeometry(int index) const override; // Overwrite to check the insertion position (if there are limits) virtual void checkCellForInsertion(int * /*row*/, int * /*col*/) const {} @@ -1792,9 +1792,9 @@ public: QGridLayoutSupport(QDesignerFormWindowInterface *formWindow, QWidget *widget, QObject *parent = 0); - void simplify() Q_DECL_OVERRIDE; - void insertRow(int row) Q_DECL_OVERRIDE; - void insertColumn(int column) Q_DECL_OVERRIDE; + void simplify() override; + void insertRow(int row) override; + void insertColumn(int column) override; private: }; @@ -1839,12 +1839,12 @@ class QFormLayoutSupport: public GridLikeLayoutSupportBase<QFormLayout> public: QFormLayoutSupport(QDesignerFormWindowInterface *formWindow, QWidget *widget, QObject *parent = 0); - void simplify() Q_DECL_OVERRIDE {} - void insertRow(int /*row*/) Q_DECL_OVERRIDE {} - void insertColumn(int /*column*/) Q_DECL_OVERRIDE {} + void simplify() override {} + void insertRow(int /*row*/) override {} + void insertColumn(int /*column*/) override {} private: - void checkCellForInsertion(int * row, int *col) const Q_DECL_OVERRIDE; + void checkCellForInsertion(int * row, int *col) const override; }; QFormLayoutSupport::QFormLayoutSupport(QDesignerFormWindowInterface *formWindow, QWidget *widget, QObject *parent) : diff --git a/src/designer/src/lib/shared/qlayout_widget_p.h b/src/designer/src/lib/shared/qlayout_widget_p.h index 2ff849d24..2aa91f1c4 100644 --- a/src/designer/src/lib/shared/qlayout_widget_p.h +++ b/src/designer/src/lib/shared/qlayout_widget_p.h @@ -176,19 +176,19 @@ public: LayoutHelper* helper() const { return m_helper; } // DecorationExtension - int currentIndex() const Q_DECL_OVERRIDE { return m_currentIndex; } + int currentIndex() const override { return m_currentIndex; } - InsertMode currentInsertMode() const Q_DECL_OVERRIDE { return m_currentInsertMode; } + InsertMode currentInsertMode() const override { return m_currentInsertMode; } - QPair<int, int> currentCell() const Q_DECL_OVERRIDE { return m_currentCell; } + QPair<int, int> currentCell() const override { return m_currentCell; } - int findItemAt(const QPoint &pos) const Q_DECL_OVERRIDE; - int indexOf(QWidget *widget) const Q_DECL_OVERRIDE; - int indexOf(QLayoutItem *item) const Q_DECL_OVERRIDE; + int findItemAt(const QPoint &pos) const override; + int indexOf(QWidget *widget) const override; + int indexOf(QLayoutItem *item) const override; - void adjustIndicator(const QPoint &pos, int index) Q_DECL_OVERRIDE; + void adjustIndicator(const QPoint &pos, int index) override; - QWidgetList widgets(QLayout *layout) const Q_DECL_OVERRIDE; + QWidgetList widgets(QLayout *layout) const override; // Pad empty cells with dummy spacers. Called by layouting commands. static void createEmptyCells(QGridLayout *gridLayout); @@ -216,7 +216,7 @@ protected: virtual QRect extendedGeometry(int index) const = 0; virtual bool supportsIndicatorOrientation(Qt::Orientation indicatorOrientation) const = 0; - QRect itemInfo(int index) const Q_DECL_OVERRIDE; + QRect itemInfo(int index) const override; QLayout *layout() const; QGridLayout *gridLayout() const; QWidget *widget() const { return m_widget; } @@ -263,8 +263,8 @@ public: inline QDesignerFormWindowInterface *formWindow() const { return m_formWindow; } protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void paintEvent(QPaintEvent *e) override; private: QDesignerFormWindowInterface *m_formWindow; diff --git a/src/designer/src/lib/shared/qtresourceview.cpp b/src/designer/src/lib/shared/qtresourceview.cpp index a64b99000..ce43d7239 100644 --- a/src/designer/src/lib/shared/qtresourceview.cpp +++ b/src/designer/src/lib/shared/qtresourceview.cpp @@ -79,7 +79,7 @@ public: ResourceListWidget(QWidget *parent = 0); protected: - void startDrag(Qt::DropActions supportedActions) Q_DECL_OVERRIDE; + void startDrag(Qt::DropActions supportedActions) override; }; ResourceListWidget::ResourceListWidget(QWidget *parent) : diff --git a/src/designer/src/lib/shared/sheet_delegate_p.h b/src/designer/src/lib/shared/sheet_delegate_p.h index ab0aa20c5..b10a4222e 100644 --- a/src/designer/src/lib/shared/sheet_delegate_p.h +++ b/src/designer/src/lib/shared/sheet_delegate_p.h @@ -58,8 +58,8 @@ class QDESIGNER_SHARED_EXPORT SheetDelegate: public QItemDelegate public: SheetDelegate(QTreeView *view, QWidget *parent); - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; - QSize sizeHint(const QStyleOptionViewItem &opt, const QModelIndex &index) const Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; + QSize sizeHint(const QStyleOptionViewItem &opt, const QModelIndex &index) const override; private: QTreeView *m_view; diff --git a/src/designer/src/lib/shared/signalslotdialog.cpp b/src/designer/src/lib/shared/signalslotdialog.cpp index 2dd11f11b..6734cad56 100644 --- a/src/designer/src/lib/shared/signalslotdialog.cpp +++ b/src/designer/src/lib/shared/signalslotdialog.cpp @@ -121,8 +121,8 @@ namespace { class SignatureDelegate : public QItemDelegate { public: SignatureDelegate(QObject * parent = 0); - QWidget * createEditor (QWidget * parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const Q_DECL_OVERRIDE; - void setModelData (QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const Q_DECL_OVERRIDE; + QWidget * createEditor (QWidget * parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const override; + void setModelData (QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override; private: const QRegularExpression m_signatureRegexp; diff --git a/src/designer/src/lib/shared/signalslotdialog_p.h b/src/designer/src/lib/shared/signalslotdialog_p.h index d89c0aac9..a106aeb72 100644 --- a/src/designer/src/lib/shared/signalslotdialog_p.h +++ b/src/designer/src/lib/shared/signalslotdialog_p.h @@ -75,7 +75,7 @@ class SignatureModel : public QStandardItemModel { public: SignatureModel(QObject *parent = 0); - bool setData (const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; + bool setData (const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; signals: void checkSignature(const QString &signature, bool *ok); diff --git a/src/designer/src/lib/shared/spacer_widget_p.h b/src/designer/src/lib/shared/spacer_widget_p.h index 3858c644e..1c4b4353b 100644 --- a/src/designer/src/lib/shared/spacer_widget_p.h +++ b/src/designer/src/lib/shared/spacer_widget_p.h @@ -64,7 +64,7 @@ class QDESIGNER_SHARED_EXPORT Spacer: public QWidget public: Spacer(QWidget *parent = 0); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; QSize sizeHintProperty() const; void setSizeHintProperty(const QSize &s); @@ -78,11 +78,11 @@ public: void setOrientation(Qt::Orientation o); void setInteractiveMode(bool b) { m_interactive = b; }; - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; protected: - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent* e) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *e) override; + void resizeEvent(QResizeEvent* e) override; void updateMask(); private: diff --git a/src/designer/src/lib/shared/textpropertyeditor.cpp b/src/designer/src/lib/shared/textpropertyeditor.cpp index d24c06e68..afd9bf4e8 100644 --- a/src/designer/src/lib/shared/textpropertyeditor.cpp +++ b/src/designer/src/lib/shared/textpropertyeditor.cpp @@ -52,8 +52,8 @@ namespace { ReplacementValidator (QObject * parent, const QString &offending, const QString &replacement); - void fixup ( QString & input ) const Q_DECL_OVERRIDE; - State validate ( QString & input, int &pos) const Q_DECL_OVERRIDE; + void fixup ( QString & input ) const override; + State validate ( QString & input, int &pos) const override; private: const QString m_offending; const QString m_replacement; @@ -81,7 +81,7 @@ namespace { class StyleSheetValidator : public ReplacementValidator { public: StyleSheetValidator (QObject * parent); - State validate(QString & input, int &pos) const Q_DECL_OVERRIDE; + State validate(QString & input, int &pos) const override; }; StyleSheetValidator::StyleSheetValidator (QObject * parent) : @@ -107,8 +107,8 @@ namespace { public: UrlValidator(QCompleter *completer, QObject *parent); - State validate(QString &input, int &pos) const Q_DECL_OVERRIDE; - void fixup(QString &input) const Q_DECL_OVERRIDE; + State validate(QString &input, int &pos) const override; + void fixup(QString &input) const override; private: QUrl guessUrlFromString(const QString &string) const; QCompleter *m_completer; diff --git a/src/designer/src/lib/shared/textpropertyeditor_p.h b/src/designer/src/lib/shared/textpropertyeditor_p.h index c81b77f10..eb9389253 100644 --- a/src/designer/src/lib/shared/textpropertyeditor_p.h +++ b/src/designer/src/lib/shared/textpropertyeditor_p.h @@ -87,8 +87,8 @@ namespace qdesigner_internal { QString text() const; - QSize sizeHint () const Q_DECL_OVERRIDE; - QSize minimumSizeHint () const Q_DECL_OVERRIDE; + QSize sizeHint () const override; + QSize minimumSizeHint () const override; void setAlignment(Qt::Alignment alignment); @@ -117,7 +117,7 @@ namespace qdesigner_internal { void clear(); protected: - void resizeEvent(QResizeEvent * event ) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent * event ) override; private slots: void slotTextChanged(const QString &text); diff --git a/src/designer/src/lib/shared/widgetdatabase_p.h b/src/designer/src/lib/shared/widgetdatabase_p.h index a76df1edc..58c5850e1 100644 --- a/src/designer/src/lib/shared/widgetdatabase_p.h +++ b/src/designer/src/lib/shared/widgetdatabase_p.h @@ -148,9 +148,9 @@ public: explicit WidgetDataBase(QDesignerFormEditorInterface *core, QObject *parent = 0); virtual ~WidgetDataBase(); - QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; + QDesignerFormEditorInterface *core() const override; - int indexOfObject(QObject *o, bool resolveName = true) const Q_DECL_OVERRIDE; + int indexOfObject(QObject *o, bool resolveName = true) const override; void remove(int index); diff --git a/src/designer/src/lib/shared/widgetfactory.cpp b/src/designer/src/lib/shared/widgetfactory.cpp index bbd4bac16..0692916bc 100644 --- a/src/designer/src/lib/shared/widgetfactory.cpp +++ b/src/designer/src/lib/shared/widgetfactory.cpp @@ -103,7 +103,7 @@ public: class ComboEventFilter : public QObject { public: explicit ComboEventFilter(QComboBox *parent) : QObject(parent) {} - bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *watched, QEvent *event) override; }; bool ComboEventFilter::eventFilter(QObject *watched, QEvent *event) diff --git a/src/designer/src/lib/shared/widgetfactory_p.h b/src/designer/src/lib/shared/widgetfactory_p.h index b95d0ff7e..4f4ce90a5 100644 --- a/src/designer/src/lib/shared/widgetfactory_p.h +++ b/src/designer/src/lib/shared/widgetfactory_p.h @@ -70,21 +70,21 @@ public: explicit WidgetFactory(QDesignerFormEditorInterface *core, QObject *parent = 0); ~WidgetFactory(); - QWidget* containerOfWidget(QWidget *widget) const Q_DECL_OVERRIDE; - QWidget* widgetOfContainer(QWidget *widget) const Q_DECL_OVERRIDE; + QWidget* containerOfWidget(QWidget *widget) const override; + QWidget* widgetOfContainer(QWidget *widget) const override; QObject* createObject(const QString &className, QObject* parent) const; - QWidget *createWidget(const QString &className, QWidget *parentWidget) const Q_DECL_OVERRIDE; - QLayout *createLayout(QWidget *widget, QLayout *layout, int type) const Q_DECL_OVERRIDE; + QWidget *createWidget(const QString &className, QWidget *parentWidget) const override; + QLayout *createLayout(QWidget *widget, QLayout *layout, int type) const override; - bool isPassiveInteractor(QWidget *widget) Q_DECL_OVERRIDE; - void initialize(QObject *object) const Q_DECL_OVERRIDE; + bool isPassiveInteractor(QWidget *widget) override; + void initialize(QObject *object) const override; void initializeCommon(QWidget *object) const; void initializePreview(QWidget *object) const; - QDesignerFormEditorInterface *core() const Q_DECL_OVERRIDE; + QDesignerFormEditorInterface *core() const override; static QString classNameOf(QDesignerFormEditorInterface *core, const QObject* o); diff --git a/src/designer/src/lib/shared/zoomwidget.cpp b/src/designer/src/lib/shared/zoomwidget.cpp index 12346955c..b79f81156 100644 --- a/src/designer/src/lib/shared/zoomwidget.cpp +++ b/src/designer/src/lib/shared/zoomwidget.cpp @@ -265,7 +265,7 @@ class ZoomedEventFilterRedirector : public QObject { public: explicit ZoomedEventFilterRedirector(ZoomWidget *zw, QObject *parent); - bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *watched, QEvent *event) override; private: ZoomWidget *m_zw; diff --git a/src/designer/src/lib/shared/zoomwidget_p.h b/src/designer/src/lib/shared/zoomwidget_p.h index f9724a2ad..f1062ae63 100644 --- a/src/designer/src/lib/shared/zoomwidget_p.h +++ b/src/designer/src/lib/shared/zoomwidget_p.h @@ -144,7 +144,7 @@ public: explicit ZoomProxyWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0); protected: - QVariant itemChange(GraphicsItemChange change, const QVariant &value) Q_DECL_OVERRIDE; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; }; /* Zoom widget: A QGraphicsView-based container for a widget that allows for @@ -178,8 +178,8 @@ public: void setItemAcceptDrops(bool); bool itemAcceptDrops() const; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize minimumSizeHint() const override; + QSize sizeHint() const override; bool zoomedEventFilter(QObject *watched, QEvent *event); @@ -188,10 +188,10 @@ public slots: void dump() const; protected: - void resizeEvent(QResizeEvent * event) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent * event) override; // Overwritten from ZoomView - void applyZoom() Q_DECL_OVERRIDE; + void applyZoom() override; // Overwrite to actually perform a resize. This is required if we are in a layout. Default does resize(). virtual void doResize(const QSize &s); diff --git a/src/designer/src/lib/uilib/formbuilder.h b/src/designer/src/lib/uilib/formbuilder.h index cde7690ea..ec0fa23c3 100644 --- a/src/designer/src/lib/uilib/formbuilder.h +++ b/src/designer/src/lib/uilib/formbuilder.h @@ -72,23 +72,23 @@ public: QList<QDesignerCustomWidgetInterface*> customWidgets() const; protected: - 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; - QAction *create(DomAction *ui_action, QObject *parent) Q_DECL_OVERRIDE; - QActionGroup *create(DomActionGroup *ui_action_group, QObject *parent) Q_DECL_OVERRIDE; + QWidget *create(DomUI *ui, QWidget *parentWidget) override; + QWidget *create(DomWidget *ui_widget, QWidget *parentWidget) override; + QLayout *create(DomLayout *ui_layout, QLayout *layout, QWidget *parentWidget) override; + QLayoutItem *create(DomLayoutItem *ui_layoutItem, QLayout *layout, QWidget *parentWidget) override; + QAction *create(DomAction *ui_action, QObject *parent) override; + QActionGroup *create(DomActionGroup *ui_action_group, QObject *parent) override; - 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; + QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name) override; + QLayout *createLayout(const QString &layoutName, QObject *parent, const QString &name) override; - void createConnections(DomConnections *connections, QWidget *widget) Q_DECL_OVERRIDE; + void createConnections(DomConnections *connections, QWidget *widget) override; - bool addItem(DomLayoutItem *ui_item, QLayoutItem *item, QLayout *layout) Q_DECL_OVERRIDE; - bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) Q_DECL_OVERRIDE; + bool addItem(DomLayoutItem *ui_item, QLayoutItem *item, QLayout *layout) override; + bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) override; virtual void updateCustomWidgets(); - void applyProperties(QObject *o, const QList<DomProperty*> &properties) Q_DECL_OVERRIDE; + void applyProperties(QObject *o, const QList<DomProperty*> &properties) override; static QWidget *widgetByName(QWidget *topLevel, const QString &name); 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; diff --git a/src/designer/src/uitools/quiloader.cpp b/src/designer/src/uitools/quiloader.cpp index 74a03e3a9..586986508 100644 --- a/src/designer/src/uitools/quiloader.cpp +++ b/src/designer/src/uitools/quiloader.cpp @@ -101,9 +101,9 @@ public: TranslatingTextBuilder(bool trEnabled, const QByteArray &className) : m_trEnabled(trEnabled), m_className(className) {} - QVariant loadText(const DomProperty *icon) const Q_DECL_OVERRIDE; + QVariant loadText(const DomProperty *icon) const override; - QVariant toNativeValue(const QVariant &value) const Q_DECL_OVERRIDE; + QVariant toNativeValue(const QVariant &value) const override; private: bool m_trEnabled; @@ -346,7 +346,7 @@ public: return ParentClass::createActionGroup(parent, name); } - QWidget *createWidget(const QString &className, QWidget *parent, const QString &name) Q_DECL_OVERRIDE + QWidget *createWidget(const QString &className, QWidget *parent, const QString &name) override { if (QWidget *widget = loader->createWidget(className, parent, name)) { widget->setObjectName(name); @@ -356,7 +356,7 @@ public: return 0; } - QLayout *createLayout(const QString &className, QObject *parent, const QString &name) Q_DECL_OVERRIDE + QLayout *createLayout(const QString &className, QObject *parent, const QString &name) override { if (QLayout *layout = loader->createLayout(className, parent, name)) { layout->setObjectName(name); @@ -366,7 +366,7 @@ public: return 0; } - QActionGroup *createActionGroup(QObject *parent, const QString &name) Q_DECL_OVERRIDE + QActionGroup *createActionGroup(QObject *parent, const QString &name) override { if (QActionGroup *actionGroup = loader->createActionGroup(parent, name)) { actionGroup->setObjectName(name); @@ -376,7 +376,7 @@ public: return 0; } - QAction *createAction(QObject *parent, const QString &name) Q_DECL_OVERRIDE + QAction *createAction(QObject *parent, const QString &name) override { if (QAction *action = loader->createAction(parent, name)) { action->setObjectName(name); @@ -386,10 +386,10 @@ public: return 0; } - void applyProperties(QObject *o, const QList<DomProperty*> &properties) Q_DECL_OVERRIDE; - QWidget *create(DomUI *ui, QWidget *parentWidget) Q_DECL_OVERRIDE; - QWidget *create(DomWidget *ui_widget, QWidget *parentWidget) Q_DECL_OVERRIDE; - bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) Q_DECL_OVERRIDE; + void applyProperties(QObject *o, const QList<DomProperty*> &properties) override; + QWidget *create(DomUI *ui, QWidget *parentWidget) override; + QWidget *create(DomWidget *ui_widget, QWidget *parentWidget) override; + bool addItem(DomWidget *ui_widget, QWidget *widget, QWidget *parentWidget) override; private: QByteArray m_class; |