diff options
Diffstat (limited to 'src/designer/src/lib')
46 files changed, 318 insertions, 318 deletions
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); |