Qt Designer: Fix clang warnings about class structure/definitions

- Add missing override
- Use "= default" for trivial constructors/destructors
- Use Q_DISABLE_COPY/MOVE
- Fix some function parameters

Change-Id: Iaed3b6a85bdfd9e9e431746f77589a9e2029120a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
 

49 files changed, 127 insertions, 199 deletions

diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.h b/src/designer/src/components/propertyeditor/designerpropertymanager.h
index 8fa974117..abc6e385c 100644
--- a/src/designer/src/components/propertyeditor/designerpropertymanager.h
+++ b/src/designer/src/components/propertyeditor/designerpropertymanager.h
@@ -259,10 +259,10 @@ public:
 signals:
     void resetProperty(QtProperty *property);
 protected:
-    void connectPropertyManager(QtVariantPropertyManager *manager);
+    void connectPropertyManager(QtVariantPropertyManager *manager) override;
     QWidget *createEditor(QtVariantPropertyManager *manager, QtProperty *property,
-                QWidget *parent);
-    void disconnectPropertyManager(QtVariantPropertyManager *manager);
+                QWidget *parent) override;
+    void disconnectPropertyManager(QtVariantPropertyManager *manager) override;
 private slots:
     void slotEditorDestroyed(QObject *object);
     void slotAttributeChanged(QtProperty *property, const QString &attribute, const QVariant &value);
diff --git a/src/designer/src/components/propertyeditor/paletteeditor.h b/src/designer/src/components/propertyeditor/paletteeditor.h
index 1c45d1e54..6124340dc 100644
--- a/src/designer/src/components/propertyeditor/paletteeditor.h
+++ b/src/designer/src/components/propertyeditor/paletteeditor.h
@@ -97,13 +97,13 @@ class PaletteModel : public QAbstractTableModel
 public:
     explicit PaletteModel(QObject *parent = nullptr);
 
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const;
-    QVariant data(const QModelIndex &index, int role) const;
-    bool setData(const QModelIndex &index, const QVariant &value, int role);
-    Qt::ItemFlags flags(const QModelIndex &index) const;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role) const override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
     QVariant headerData(int section, Qt::Orientation orientation,
-                int role = Qt::DisplayRole) const;
+                int role = Qt::DisplayRole) const override;
 
     QPalette getPalette() const;
     void setPalette(const QPalette &palette, const QPalette &parentPalette);
diff --git a/src/designer/src/components/propertyeditor/stringlisteditor.cpp b/src/designer/src/components/propertyeditor/stringlisteditor.cpp
index 4ab3dad19..1cfdb1f3c 100644
--- a/src/designer/src/components/propertyeditor/stringlisteditor.cpp
+++ b/src/designer/src/components/propertyeditor/stringlisteditor.cpp
@@ -60,9 +60,7 @@ StringListEditor::StringListEditor(QWidget *parent)
     updateUi();
 }
 
-StringListEditor::~StringListEditor()
-{
-}
+StringListEditor::~StringListEditor() = default;
 
 QStringList StringListEditor::getStringList(QWidget *parent, const QStringList &init, int *result)
 {
diff --git a/src/designer/src/components/signalsloteditor/signalslot_utils_p.h b/src/designer/src/components/signalsloteditor/signalslot_utils_p.h
index acc240a43..7ab98c3d4 100644
--- a/src/designer/src/components/signalsloteditor/signalslot_utils_p.h
+++ b/src/designer/src/components/signalsloteditor/signalslot_utils_p.h
@@ -64,7 +64,7 @@ bool memberFunctionListContains(QDesignerFormEditorInterface *core, QObject *obj
 // Members functions listed by class they were inherited from
 struct ClassMemberFunctions
 {
-    ClassMemberFunctions() {}
+    ClassMemberFunctions() = default;
     ClassMemberFunctions(const QString &_class_name);
 
     QString m_className;
diff --git a/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp b/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp
index 5ea24f98a..74bff711d 100644
--- a/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp
@@ -60,9 +60,7 @@ ListWidgetTaskMenu::ListWidgetTaskMenu(QListWidget *button, QObject *parent)
     m_taskActions.append(sep);
 }
 
-ListWidgetTaskMenu::~ListWidgetTaskMenu()
-{
-}
+ListWidgetTaskMenu::~ListWidgetTaskMenu() = default;
 
 QAction *ListWidgetTaskMenu::preferredEditAction() const
 {
diff --git a/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp b/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp
index bb002380e..25bc6ce40 100644
--- a/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp
@@ -59,9 +59,7 @@ TableWidgetTaskMenu::TableWidgetTaskMenu(QTableWidget *button, QObject *parent)
 }
 
 
-TableWidgetTaskMenu::~TableWidgetTaskMenu()
-{
-}
+TableWidgetTaskMenu::~TableWidgetTaskMenu() = default;
 
 QAction *TableWidgetTaskMenu::preferredEditAction() const
 {
diff --git a/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp b/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp
index 9584be1a3..c4ffd4ca5 100644
--- a/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp
@@ -58,9 +58,7 @@ TreeWidgetTaskMenu::TreeWidgetTaskMenu(QTreeWidget *button, QObject *parent)
 }
 
 
-TreeWidgetTaskMenu::~TreeWidgetTaskMenu()
-{
-}
+TreeWidgetTaskMenu::~TreeWidgetTaskMenu() = default;
 
 QAction *TreeWidgetTaskMenu::preferredEditAction() const
 {
diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.h b/src/designer/src/components/widgetbox/widgetboxtreewidget.h
index 99d15314f..0961e658d 100644
--- a/src/designer/src/components/widgetbox/widgetboxtreewidget.h
+++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.h
@@ -82,14 +82,14 @@ public:
     QIcon iconForWidget(const QString &iconName) const;
 
 signals:
-    void pressed(const QString name, const QString dom_xml, const QPoint &global_mouse_pos);
+    void pressed(const QString &name, const QString &dom_xml, const QPoint &global_mouse_pos);
 
 public slots:
     void filter(const QString &);
 
 protected:
-    void contextMenuEvent(QContextMenuEvent *e);
-    void resizeEvent(QResizeEvent *e);
+    void contextMenuEvent(QContextMenuEvent *e) override;
+    void resizeEvent(QResizeEvent *e) override;
 
 private slots:
     void slotSave();
diff --git a/src/designer/src/designer/appfontdialog.cpp b/src/designer/src/designer/appfontdialog.cpp
index c7608acad..b1a3942df 100644
--- a/src/designer/src/designer/appfontdialog.cpp
+++ b/src/designer/src/designer/appfontdialog.cpp
@@ -89,9 +89,7 @@ private:
     FileNameFontIdPairs m_fonts;
 };
 
-AppFontManager::AppFontManager()
-{
-}
+AppFontManager::AppFontManager() = default;
 
 AppFontManager &AppFontManager::instance()
 {
diff --git a/src/designer/src/designer/versiondialog.cpp b/src/designer/src/designer/versiondialog.cpp
index 9350fa397..767d25171 100644
--- a/src/designer/src/designer/versiondialog.cpp
+++ b/src/designer/src/designer/versiondialog.cpp
@@ -49,10 +49,10 @@ signals:
     void triggered();
 
 protected:
-    void mousePressEvent(QMouseEvent *me);
-    void mouseMoveEvent(QMouseEvent *me);
-    void mouseReleaseEvent(QMouseEvent *me);
-    void paintEvent(QPaintEvent *pe);
+    void mousePressEvent(QMouseEvent *me) override;
+    void mouseMoveEvent(QMouseEvent *me) override;
+    void mouseReleaseEvent(QMouseEvent *me) override;
+    void paintEvent(QPaintEvent *pe) override;
 private:
     QVector<QPoint> hitPoints;
     QVector<QPoint> missPoints;
diff --git a/src/designer/src/lib/extension/qextensionmanager.cpp b/src/designer/src/lib/extension/qextensionmanager.cpp
index a5b3a6cc5..e6e0451c2 100644
--- a/src/designer/src/lib/extension/qextensionmanager.cpp
+++ b/src/designer/src/lib/extension/qextensionmanager.cpp
@@ -93,9 +93,7 @@ QExtensionManager::QExtensionManager(QObject *parent)
 /*!
   Destroys the extension manager
 */
-QExtensionManager::~QExtensionManager()
-{
-}
+QExtensionManager::~QExtensionManager() = default;
 
 /*!
     Register the extension specified by the given \a factory and
diff --git a/src/designer/src/lib/sdk/abstractactioneditor.cpp b/src/designer/src/lib/sdk/abstractactioneditor.cpp
index c9510347e..badce0062 100644
--- a/src/designer/src/lib/sdk/abstractactioneditor.cpp
+++ b/src/designer/src/lib/sdk/abstractactioneditor.cpp
@@ -69,9 +69,7 @@ QDesignerActionEditorInterface::QDesignerActionEditorInterface(QWidget *parent,
 /*!
     Destroys the action editor interface.
 */
-QDesignerActionEditorInterface::~QDesignerActionEditorInterface()
-{
-}
+QDesignerActionEditorInterface::~QDesignerActionEditorInterface() = default;
 
 /*!
     Returns a pointer to \QD's current QDesignerFormEditorInterface
diff --git a/src/designer/src/lib/sdk/abstractdialoggui.cpp b/src/designer/src/lib/sdk/abstractdialoggui.cpp
index 7427ae0c7..5907999e7 100644
--- a/src/designer/src/lib/sdk/abstractdialoggui.cpp
+++ b/src/designer/src/lib/sdk/abstractdialoggui.cpp
@@ -69,16 +69,12 @@ QT_BEGIN_NAMESPACE
     Constructs a QDesignerDialogGuiInterface object.
 */
 
-QDesignerDialogGuiInterface::QDesignerDialogGuiInterface()
-{
-}
+QDesignerDialogGuiInterface::QDesignerDialogGuiInterface() = default;
 
 /*!
     Destroys the QDesignerDialogGuiInterface object.
 */
-QDesignerDialogGuiInterface::~QDesignerDialogGuiInterface()
-{
-}
+QDesignerDialogGuiInterface::~QDesignerDialogGuiInterface() = default;
 
 /*!
     \fn QMessageBox::StandardButton QDesignerDialogGuiInterface::message(QWidget *parent, Message context, QMessageBox::Icon icon, const QString &title, const QString &text, QMessageBox::StandardButtons buttons, QMessageBox::StandardButton defaultButton)
diff --git a/src/designer/src/lib/sdk/abstractformeditor.cpp b/src/designer/src/lib/sdk/abstractformeditor.cpp
index 40e4bb931..9c5b1e29e 100644
--- a/src/designer/src/lib/sdk/abstractformeditor.cpp
+++ b/src/designer/src/lib/sdk/abstractformeditor.cpp
@@ -169,9 +169,7 @@ QDesignerFormEditorInterface::QDesignerFormEditorInterface(QObject *parent)
 /*!
     Destroys the QDesignerFormEditorInterface object.
 */
-QDesignerFormEditorInterface::~QDesignerFormEditorInterface()
-{
-}
+QDesignerFormEditorInterface::~QDesignerFormEditorInterface() = default;
 
 /*!
     Returns an interface to \QD's widget box.
diff --git a/src/designer/src/lib/sdk/abstractformwindow.cpp b/src/designer/src/lib/sdk/abstractformwindow.cpp
index 585a92024..39a14f49a 100644
--- a/src/designer/src/lib/sdk/abstractformwindow.cpp
+++ b/src/designer/src/lib/sdk/abstractformwindow.cpp
@@ -161,9 +161,7 @@ QDesignerFormWindowInterface::QDesignerFormWindowInterface(QWidget *parent, Qt::
 /*!
     Destroys the form window interface.
 */
-QDesignerFormWindowInterface::~QDesignerFormWindowInterface()
-{
-}
+QDesignerFormWindowInterface::~QDesignerFormWindowInterface() = default;
 
 /*!
     Returns a pointer to \QD's current QDesignerFormEditorInterface
diff --git a/src/designer/src/lib/sdk/abstractformwindowmanager.cpp b/src/designer/src/lib/sdk/abstractformwindowmanager.cpp
index 0810ddb39..387f0665c 100644
--- a/src/designer/src/lib/sdk/abstractformwindowmanager.cpp
+++ b/src/designer/src/lib/sdk/abstractformwindowmanager.cpp
@@ -136,9 +136,7 @@ QDesignerFormWindowManagerInterface::QDesignerFormWindowManagerInterface(QObject
 /*!
     Destroys the interface for the form window manager.
 */
-QDesignerFormWindowManagerInterface::~QDesignerFormWindowManagerInterface()
-{
-}
+QDesignerFormWindowManagerInterface::~QDesignerFormWindowManagerInterface() = default;
 
 /*!
     Allows you to intervene and control \QD's "cut" action. The function
diff --git a/src/designer/src/lib/sdk/abstractformwindowtool.cpp b/src/designer/src/lib/sdk/abstractformwindowtool.cpp
index e596458e0..62ca42375 100644
--- a/src/designer/src/lib/sdk/abstractformwindowtool.cpp
+++ b/src/designer/src/lib/sdk/abstractformwindowtool.cpp
@@ -50,9 +50,7 @@ QDesignerFormWindowToolInterface::QDesignerFormWindowToolInterface(QObject *pare
 
 /*!
 */
-QDesignerFormWindowToolInterface::~QDesignerFormWindowToolInterface()
-{
-}
+QDesignerFormWindowToolInterface::~QDesignerFormWindowToolInterface() = default;
 
 /*!
     \fn virtual QDesignerFormEditorInterface *QDesignerFormWindowToolInterface::core() const = 0
diff --git a/src/designer/src/lib/sdk/abstractintegration.cpp b/src/designer/src/lib/sdk/abstractintegration.cpp
index ce37e8a4b..6e6100a79 100644
--- a/src/designer/src/lib/sdk/abstractintegration.cpp
+++ b/src/designer/src/lib/sdk/abstractintegration.cpp
@@ -233,9 +233,7 @@ QDesignerIntegrationInterface::QDesignerIntegrationInterface(QDesignerFormEditor
     core->setIntegration(this);
 }
 
-QDesignerIntegrationInterface::~QDesignerIntegrationInterface()
-{
-}
+QDesignerIntegrationInterface::~QDesignerIntegrationInterface() = default;
 
 QDesignerFormEditorInterface *QDesignerIntegrationInterface::core() const
 {
diff --git a/src/designer/src/lib/sdk/abstractintegration.h b/src/designer/src/lib/sdk/abstractintegration.h
index 2c4aa7936..f2572a7ab 100644
--- a/src/designer/src/lib/sdk/abstractintegration.h
+++ b/src/designer/src/lib/sdk/abstractintegration.h
@@ -134,39 +134,39 @@ public:
     explicit QDesignerIntegration(QDesignerFormEditorInterface *core, QObject *parent = nullptr);
     virtual ~QDesignerIntegration();
 
-    QString headerSuffix() const;
-    void setHeaderSuffix(const QString &headerSuffix);
+    QString headerSuffix() const override;
+    void setHeaderSuffix(const QString &headerSuffix) override;
 
-    bool isHeaderLowercase() const;
-    void setHeaderLowercase(bool headerLowerCase);
+    bool isHeaderLowercase() const override;
+    void setHeaderLowercase(bool headerLowerCase) override;
 
-    Feature features() const;
-    virtual void setFeatures(Feature f);
+    Feature features() const override;
+    virtual void setFeatures(Feature f) override;
 
-    ResourceFileWatcherBehaviour resourceFileWatcherBehaviour() const;
-    void setResourceFileWatcherBehaviour(ResourceFileWatcherBehaviour behaviour);
+    ResourceFileWatcherBehaviour resourceFileWatcherBehaviour() const override;
+    void setResourceFileWatcherBehaviour(ResourceFileWatcherBehaviour behaviour) override;
 
-    virtual QWidget *containerWindow(QWidget *widget) const;
+    virtual QWidget *containerWindow(QWidget *widget) const override;
 
     // Load plugins into widget database and factory.
     static void initializePlugins(QDesignerFormEditorInterface *formEditor);
 
     // Create a resource browser specific to integration. Language integration takes precedence
-    virtual QDesignerResourceBrowserInterface *createResourceBrowser(QWidget *parent = nullptr);
+    QDesignerResourceBrowserInterface *createResourceBrowser(QWidget *parent = nullptr) override;
 
-    virtual QString contextHelpId() const;
+    QString contextHelpId() const override;
 
-    virtual void updateProperty(const QString &name, const QVariant &value, bool enableSubPropertyHandling);
-    virtual void updateProperty(const QString &name, const QVariant &value);
+    void updateProperty(const QString &name, const QVariant &value, bool enableSubPropertyHandling) override;
+    void updateProperty(const QString &name, const QVariant &value) override;
     // Additional signals of designer property editor
-    virtual void resetProperty(const QString &name);
-    virtual void addDynamicProperty(const QString &name, const QVariant &value);
-    virtual void removeDynamicProperty(const QString &name);
-
-    virtual void updateActiveFormWindow(QDesignerFormWindowInterface *formWindow);
-    virtual void setupFormWindow(QDesignerFormWindowInterface *formWindow);
-    virtual void updateSelection();
-    virtual void updateCustomWidgetPlugins();
+    void resetProperty(const QString &name) override;
+    void addDynamicProperty(const QString &name, const QVariant &value) override;
+    void removeDynamicProperty(const QString &name) override;
+
+    void updateActiveFormWindow(QDesignerFormWindowInterface *formWindow) override;
+    void setupFormWindow(QDesignerFormWindowInterface *formWindow) override;
+    void updateSelection() override;
+    void updateCustomWidgetPlugins() override;
 
 private:
     QScopedPointer<qdesigner_internal::QDesignerIntegrationPrivate> d;
diff --git a/src/designer/src/lib/sdk/abstractintrospection.cpp b/src/designer/src/lib/sdk/abstractintrospection.cpp
index 7ac530618..c4e12635a 100644
--- a/src/designer/src/lib/sdk/abstractintrospection.cpp
+++ b/src/designer/src/lib/sdk/abstractintrospection.cpp
@@ -48,16 +48,12 @@ QT_BEGIN_NAMESPACE
     Constructs a QDesignerMetaEnumInterface object.
 */
 
-QDesignerMetaEnumInterface::QDesignerMetaEnumInterface()
-{
-}
+QDesignerMetaEnumInterface::QDesignerMetaEnumInterface() = default;
 
 /*!
     Destroys the QDesignerMetaEnumInterface object.
 */
-QDesignerMetaEnumInterface::~QDesignerMetaEnumInterface()
-{
-}
+QDesignerMetaEnumInterface::~QDesignerMetaEnumInterface() = default;
 
 /*!
     \fn bool QDesignerMetaEnumInterface::isFlag() const
@@ -143,17 +139,13 @@ QDesignerMetaEnumInterface::~QDesignerMetaEnumInterface()
     Constructs a QDesignerMetaPropertyInterface object.
 */
 
-QDesignerMetaPropertyInterface::QDesignerMetaPropertyInterface()
-{
-}
+QDesignerMetaPropertyInterface::QDesignerMetaPropertyInterface() = default;
 
 /*!
     Destroys the QDesignerMetaPropertyInterface object.
 */
 
-QDesignerMetaPropertyInterface::~QDesignerMetaPropertyInterface()
-{
-}
+QDesignerMetaPropertyInterface::~QDesignerMetaPropertyInterface() = default;
 
 /*!
     \enum QDesignerMetaPropertyInterface::Kind
@@ -277,17 +269,13 @@ QDesignerMetaPropertyInterface::~QDesignerMetaPropertyInterface()
     Constructs a QDesignerMetaMethodInterface object.
 */
 
-QDesignerMetaMethodInterface::QDesignerMetaMethodInterface()
-{
-}
+QDesignerMetaMethodInterface::QDesignerMetaMethodInterface() = default;
 
 /*!
     Destroys the QDesignerMetaMethodInterface object.
 */
 
-QDesignerMetaMethodInterface::~QDesignerMetaMethodInterface()
-{
-}
+QDesignerMetaMethodInterface::~QDesignerMetaMethodInterface() = default;
 
 /*!
     \enum QDesignerMetaMethodInterface::MethodType
@@ -380,17 +368,13 @@ QDesignerMetaMethodInterface::~QDesignerMetaMethodInterface()
     Constructs a QDesignerMetaObjectInterface object.
 */
 
-QDesignerMetaObjectInterface::QDesignerMetaObjectInterface()
-{
-}
+QDesignerMetaObjectInterface::QDesignerMetaObjectInterface() = default;
 
 /*!
     Destroys the QDesignerMetaObjectInterface object.
 */
 
-QDesignerMetaObjectInterface::~QDesignerMetaObjectInterface()
-{
-}
+QDesignerMetaObjectInterface::~QDesignerMetaObjectInterface() = default;
 
 /*!
     \fn QString QDesignerMetaObjectInterface::className() const
diff --git a/src/designer/src/lib/sdk/abstractmetadatabase.cpp b/src/designer/src/lib/sdk/abstractmetadatabase.cpp
index 0ec4d7457..3ba2d5804 100644
--- a/src/designer/src/lib/sdk/abstractmetadatabase.cpp
+++ b/src/designer/src/lib/sdk/abstractmetadatabase.cpp
@@ -50,9 +50,7 @@ QDesignerMetaDataBaseInterface::QDesignerMetaDataBaseInterface(QObject *parent)
 /*!
     Destroys the interface to the meta database.
 */
-QDesignerMetaDataBaseInterface::~QDesignerMetaDataBaseInterface()
-{
-}
+QDesignerMetaDataBaseInterface::~QDesignerMetaDataBaseInterface() = default;
 
 /*!
     \fn QDesignerMetaDataBaseItemInterface *QDesignerMetaDataBaseInterface::item(QObject *object) const
diff --git a/src/designer/src/lib/sdk/abstractnewformwidget.cpp b/src/designer/src/lib/sdk/abstractnewformwidget.cpp
index 8bd94eed0..404c0c595 100644
--- a/src/designer/src/lib/sdk/abstractnewformwidget.cpp
+++ b/src/designer/src/lib/sdk/abstractnewformwidget.cpp
@@ -59,9 +59,7 @@ QDesignerNewFormWidgetInterface::QDesignerNewFormWidgetInterface(QWidget *parent
     Destroys the QDesignerNewFormWidgetInterface object.
 */
 
-QDesignerNewFormWidgetInterface::~QDesignerNewFormWidgetInterface()
-{
-}
+QDesignerNewFormWidgetInterface::~QDesignerNewFormWidgetInterface() = default;
 
 /*!
     Creates an instance of the QDesignerNewFormWidgetInterface as a child
diff --git a/src/designer/src/lib/sdk/abstractobjectinspector.cpp b/src/designer/src/lib/sdk/abstractobjectinspector.cpp
index 5d8e73849..61fbb6e25 100644
--- a/src/designer/src/lib/sdk/abstractobjectinspector.cpp
+++ b/src/designer/src/lib/sdk/abstractobjectinspector.cpp
@@ -75,9 +75,7 @@ QDesignerObjectInspectorInterface::QDesignerObjectInspectorInterface(QWidget *pa
 /*!
     Destroys the object inspector interface.
 */
-QDesignerObjectInspectorInterface::~QDesignerObjectInspectorInterface()
-{
-}
+QDesignerObjectInspectorInterface::~QDesignerObjectInspectorInterface() = default;
 
 /*!
     Returns a pointer to \QD's current QDesignerFormEditorInterface
diff --git a/src/designer/src/lib/sdk/abstractpropertyeditor.cpp b/src/designer/src/lib/sdk/abstractpropertyeditor.cpp
index 82dad6d63..b9cdeca63 100644
--- a/src/designer/src/lib/sdk/abstractpropertyeditor.cpp
+++ b/src/designer/src/lib/sdk/abstractpropertyeditor.cpp
@@ -98,9 +98,7 @@ QDesignerPropertyEditorInterface::QDesignerPropertyEditorInterface(QWidget *pare
 /*!
     Destroys the property editor interface.
 */
-QDesignerPropertyEditorInterface::~QDesignerPropertyEditorInterface()
-{
-}
+QDesignerPropertyEditorInterface::~QDesignerPropertyEditorInterface() = default;
 
 /*!
     Returns a pointer to \QD's current QDesignerFormEditorInterface
diff --git a/src/designer/src/lib/sdk/abstractresourcebrowser.cpp b/src/designer/src/lib/sdk/abstractresourcebrowser.cpp
index 0316b2588..26a5b8dc3 100644
--- a/src/designer/src/lib/sdk/abstractresourcebrowser.cpp
+++ b/src/designer/src/lib/sdk/abstractresourcebrowser.cpp
@@ -36,9 +36,6 @@ QDesignerResourceBrowserInterface::QDesignerResourceBrowserInterface(QWidget *pa
 
 }
 
-QDesignerResourceBrowserInterface::~QDesignerResourceBrowserInterface()
-{
-
-}
+QDesignerResourceBrowserInterface::~QDesignerResourceBrowserInterface() = default;
 
 QT_END_NAMESPACE
diff --git a/src/designer/src/lib/sdk/abstractwidgetfactory.cpp b/src/designer/src/lib/sdk/abstractwidgetfactory.cpp
index 9c7dc7bcd..9b4f70680 100644
--- a/src/designer/src/lib/sdk/abstractwidgetfactory.cpp
+++ b/src/designer/src/lib/sdk/abstractwidgetfactory.cpp
@@ -53,9 +53,7 @@ QDesignerWidgetFactoryInterface::QDesignerWidgetFactoryInterface(QObject *parent
 /*!
     \fn virtual QDesignerWidgetFactoryInterface::~QDesignerWidgetFactoryInterface()
 */
-QDesignerWidgetFactoryInterface::~QDesignerWidgetFactoryInterface()
-{
-}
+QDesignerWidgetFactoryInterface::~QDesignerWidgetFactoryInterface() = default;
 
 /*!
     \fn virtual QDesignerFormEditorInterface *QDesignerWidgetFactoryInterface::core() const = 0
diff --git a/src/designer/src/lib/shared/csshighlighter_p.h b/src/designer/src/lib/shared/csshighlighter_p.h
index 508c56c43..8af8cd337 100644
--- a/src/designer/src/lib/shared/csshighlighter_p.h
+++ b/src/designer/src/lib/shared/csshighlighter_p.h
@@ -54,7 +54,7 @@ public:
     explicit CssHighlighter(QTextDocument *document);
 
 protected:
-    void highlightBlock(const QString&);
+    void highlightBlock(const QString&) override;
     void highlight(const QString&, int, int, int/*State*/);
 
 private:
diff --git a/src/designer/src/lib/shared/htmlhighlighter_p.h b/src/designer/src/lib/shared/htmlhighlighter_p.h
index 8a6947eb2..e63186166 100644
--- a/src/designer/src/lib/shared/htmlhighlighter_p.h
+++ b/src/designer/src/lib/shared/htmlhighlighter_p.h
@@ -77,7 +77,7 @@ protected:
         InTag
     };
 
-    void highlightBlock(const QString &text);
+    void highlightBlock(const QString &text) override;
 
 private:
     QTextCharFormat m_formats[LastConstruct + 1];
diff --git a/src/designer/src/lib/shared/newformwidget_p.h b/src/designer/src/lib/shared/newformwidget_p.h
index 2f28ed6be..f6daae122 100644
--- a/src/designer/src/lib/shared/newformwidget_p.h
+++ b/src/designer/src/lib/shared/newformwidget_p.h
@@ -63,8 +63,6 @@ namespace Ui {
     class NewFormWidget;
 }
 
-class QDesignerWorkbench;
-
 class QDESIGNER_SHARED_EXPORT NewFormWidget : public QDesignerNewFormWidgetInterface
 {
     Q_OBJECT
diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp
index 1adfc727b..741fe455a 100644
--- a/src/designer/src/lib/shared/previewmanager.cpp
+++ b/src/designer/src/lib/shared/previewmanager.cpp
@@ -304,7 +304,7 @@ QMatrix PreviewDeviceSkin::skinTransform() const
 // ------------ PreviewConfigurationPrivate
 class PreviewConfigurationData : public QSharedData {
 public:
-    PreviewConfigurationData() {}
+    PreviewConfigurationData() = default;
     explicit PreviewConfigurationData(const QString &style, const QString &applicationStyleSheet, const QString &deviceSkin);
 
     QString m_style;
diff --git a/src/designer/src/lib/shared/propertylineedit_p.h b/src/designer/src/lib/shared/propertylineedit_p.h
index 6207aa1d7..a408f8a9d 100644
--- a/src/designer/src/lib/shared/propertylineedit_p.h
+++ b/src/designer/src/lib/shared/propertylineedit_p.h
@@ -56,9 +56,9 @@ namespace qdesigner_internal {
         void setWantNewLine(bool nl) {  m_wantNewLine = nl; }
         bool wantNewLine() const { return m_wantNewLine; }
 
-        bool event(QEvent *e);
+        bool event(QEvent *e) override;
     protected:
-        void contextMenuEvent (QContextMenuEvent *event );
+        void contextMenuEvent (QContextMenuEvent *event ) override;
     private slots:
         void insertNewLine();
     private:
diff --git a/src/designer/src/lib/shared/qdesigner_command_p.h b/src/designer/src/lib/shared/qdesigner_command_p.h
index f967c22f8..8053c8918 100644
--- a/src/designer/src/lib/shared/qdesigner_command_p.h
+++ b/src/designer/src/lib/shared/qdesigner_command_p.h
@@ -841,7 +841,7 @@ protected:
 };
 
 struct QDESIGNER_SHARED_EXPORT ItemData {
-    ItemData() {}
+    ItemData() = default;
 
     ItemData(const QListWidgetItem *item, bool editor);
     ItemData(const QTableWidgetItem *item, bool editor);
@@ -858,7 +858,7 @@ struct QDESIGNER_SHARED_EXPORT ItemData {
 };
 
 struct QDESIGNER_SHARED_EXPORT ListContents {
-    ListContents() {}
+    ListContents() = default;
 
     ListContents(const QTreeWidgetItem *item);
     QTreeWidgetItem *createTreeItem(DesignerIconCache *iconCache) const;
diff --git a/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp b/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp
index a9126150f..91332b0ec 100644
--- a/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp
+++ b/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp
@@ -53,9 +53,7 @@ QDesignerFormWindowManager::QDesignerFormWindowManager(QObject *parent)
 {
 }
 
-QDesignerFormWindowManager::~QDesignerFormWindowManager()
-{
-}
+QDesignerFormWindowManager::~QDesignerFormWindowManager() = default;
 
 /*!
     \fn PreviewManager *qdesigner_internal::QDesignerFormWindowManager::previewManager() const
diff --git a/src/designer/src/lib/shared/qdesigner_propertycommand.cpp b/src/designer/src/lib/shared/qdesigner_propertycommand.cpp
index 0e6287137..d7f94136e 100644
--- a/src/designer/src/lib/shared/qdesigner_propertycommand.cpp
+++ b/src/designer/src/lib/shared/qdesigner_propertycommand.cpp
@@ -1114,7 +1114,7 @@ template <class PropertyListIterator, class Function>
 
 
 // set a new value, return update mask
-unsigned PropertyListCommand::setValue(QVariant value, bool changed, unsigned subPropertyMask)
+unsigned PropertyListCommand::setValue(const QVariant &value, bool changed, unsigned subPropertyMask)
 {
     if(debugPropertyCommands)
         qDebug() << "PropertyListCommand::setValue(" << value
diff --git a/src/designer/src/lib/shared/qdesigner_propertycommand_p.h b/src/designer/src/lib/shared/qdesigner_propertycommand_p.h
index f1e43617a..2ee57ad2c 100644
--- a/src/designer/src/lib/shared/qdesigner_propertycommand_p.h
+++ b/src/designer/src/lib/shared/qdesigner_propertycommand_p.h
@@ -80,7 +80,7 @@ public:
                    SpecialProperty specialProperty,
                    QDesignerPropertySheetExtension *sheet,
                    int index);
-    virtual ~PropertyHelper() {}
+    virtual ~PropertyHelper() = default;
 
     QObject *object() const { return m_object; }
     SpecialProperty specialProperty() const { return m_specialProperty; }
@@ -144,7 +144,7 @@ public:
     void setOldValue(const QVariant &oldValue, int index = 0);
 
     // Calls restoreDefaultValue() and update()
-    virtual void undo();
+    void undo() override;
 
 protected:
     using PropertyHelperPtr = QSharedPointer<PropertyHelper>;
@@ -157,7 +157,7 @@ protected:
     bool initList(const QObjectList &list, const QString &apropertyName, QObject *referenceObject = nullptr);
 
     // set a new value, return update mask
-    unsigned setValue(QVariant value, bool changed, unsigned subPropertyMask);
+    unsigned setValue(const QVariant &value, bool changed, unsigned subPropertyMask);
 
     // restore old value,  return update mask
     unsigned  restoreOldValue();
@@ -218,10 +218,10 @@ public:
     inline void setNewValue(const QVariant &newValue)
     { m_newValue = newValue; }
 
-    int id() const;
-    bool mergeWith(const QUndoCommand *other);
+    int id() const override;
+    bool mergeWith(const QUndoCommand *other) override;
 
-    virtual void redo();
+    void redo() override;
 
 protected:
     virtual QVariant mergeValue(const QVariant &newValue);
diff --git a/src/designer/src/lib/shared/qdesigner_toolbox_p.h b/src/designer/src/lib/shared/qdesigner_toolbox_p.h
index 52a458afe..9828ff2c3 100644
--- a/src/designer/src/lib/shared/qdesigner_toolbox_p.h
+++ b/src/designer/src/lib/shared/qdesigner_toolbox_p.h
@@ -71,7 +71,7 @@ public:
     QPalette::ColorRole currentItemBackgroundRole() const;
     void setCurrentItemBackgroundRole(QPalette::ColorRole role);
 
-    bool eventFilter(QObject *watched, QEvent *event);
+    bool eventFilter(QObject *watched, QEvent *event) override;
     // Add context menu and return page submenu or 0.
 
     QMenu *addContextMenuActions(QMenu *popup) const;
diff --git a/src/designer/src/lib/shared/qdesigner_utils.cpp b/src/designer/src/lib/shared/qdesigner_utils.cpp
index acbfc99f4..a7c4fdd72 100644
--- a/src/designer/src/lib/shared/qdesigner_utils.cpp
+++ b/src/designer/src/lib/shared/qdesigner_utils.cpp
@@ -270,9 +270,7 @@ namespace qdesigner_internal
     {
     }
 
-    PropertySheetPixmapValue::PropertySheetPixmapValue()
-    {
-    }
+    PropertySheetPixmapValue::PropertySheetPixmapValue() = default;
 
     PropertySheetPixmapValue::PixmapSource PropertySheetPixmapValue::getPixmapSource(QDesignerFormEditorInterface *core, const QString & path)
     {
diff --git a/src/designer/src/lib/shared/qdesigner_utils_p.h b/src/designer/src/lib/shared/qdesigner_utils_p.h
index 4013ded7d..521f8b3eb 100644
--- a/src/designer/src/lib/shared/qdesigner_utils_p.h
+++ b/src/designer/src/lib/shared/qdesigner_utils_p.h
@@ -161,7 +161,7 @@ class QDESIGNER_SHARED_EXPORT DesignerMetaEnum : public MetaEnum<int>
 {
 public:
     DesignerMetaEnum(const QString &name, const QString &scope, const QString &separator);
-    DesignerMetaEnum() {}
+    DesignerMetaEnum() = default;
 
     enum SerializationMode { FullyQualified, NameOnly };
     QString toString(int value, SerializationMode sm, bool *ok = nullptr) const;
@@ -181,7 +181,7 @@ class QDESIGNER_SHARED_EXPORT DesignerMetaFlags : public MetaEnum<uint>
 {
 public:
     DesignerMetaFlags(const QString &name, const QString &scope, const QString &separator);
-    DesignerMetaFlags() {}
+    DesignerMetaFlags() = default;
 
     enum SerializationMode { FullyQualified, NameOnly };
     QString toString(int value, SerializationMode sm) const;
diff --git a/src/designer/src/lib/shared/qlayout_widget.cpp b/src/designer/src/lib/shared/qlayout_widget.cpp
index 125eeb2b8..852002838 100644
--- a/src/designer/src/lib/shared/qlayout_widget.cpp
+++ b/src/designer/src/lib/shared/qlayout_widget.cpp
@@ -417,13 +417,9 @@ int LayoutProperties::toPropertySheet(const QDesignerFormEditorInterface *core,
 }
 
 // ---------------- LayoutHelper
-LayoutHelper::LayoutHelper()
-{
-}
+LayoutHelper::LayoutHelper() = default;
 
-LayoutHelper::~LayoutHelper()
-{
-}
+LayoutHelper::~LayoutHelper() = default;
 
 int LayoutHelper::indexOf(const QLayout *lt, const QWidget *widget)
 {
@@ -860,7 +856,7 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const
     // ---------------- GridLayoutHelper
     class GridLayoutHelper : public  LayoutHelper {
     public:
-        GridLayoutHelper() {}
+        GridLayoutHelper() = default;
 
         QRect itemInfo(QLayout *lt, int index) const override;
         void insertWidget(QLayout *lt, const QRect &info, QWidget *w) override;
@@ -1017,7 +1013,7 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const
         typedef QPair<QWidget *, QWidget *> WidgetPair;
         using FormLayoutState = QVector<WidgetPair>;
 
-        FormLayoutHelper() {}
+        FormLayoutHelper() = default;
 
         QRect itemInfo(QLayout *lt, int index) const override;
         void insertWidget(QLayout *lt, const QRect &info, QWidget *w) override;
diff --git a/src/designer/src/lib/shared/qlayout_widget_p.h b/src/designer/src/lib/shared/qlayout_widget_p.h
index ff91bd392..1efe3a905 100644
--- a/src/designer/src/lib/shared/qlayout_widget_p.h
+++ b/src/designer/src/lib/shared/qlayout_widget_p.h
@@ -131,6 +131,8 @@ protected:
     LayoutHelper();
 
 public:
+    Q_DISABLE_COPY(LayoutHelper)
+
     virtual ~LayoutHelper();
 
     static LayoutHelper *createLayoutHelper(int type);
diff --git a/src/designer/src/lib/shared/qsimpleresource_p.h b/src/designer/src/lib/shared/qsimpleresource_p.h
index be67a43dc..e2dccaa53 100644
--- a/src/designer/src/lib/shared/qsimpleresource_p.h
+++ b/src/designer/src/lib/shared/qsimpleresource_p.h
@@ -103,7 +103,7 @@ private:
 struct QDESIGNER_SHARED_EXPORT FormBuilderClipboard {
     using ActionList = QList<QAction *>;
 
-    FormBuilderClipboard() {}
+    FormBuilderClipboard() = default;
     FormBuilderClipboard(QWidget *w);
 
     bool empty() const;
diff --git a/src/designer/src/lib/shared/qtresourceview_p.h b/src/designer/src/lib/shared/qtresourceview_p.h
index 96bc87aee..17ec9c194 100644
--- a/src/designer/src/lib/shared/qtresourceview_p.h
+++ b/src/designer/src/lib/shared/qtresourceview_p.h
@@ -85,7 +85,7 @@ signals:
     void resourceActivated(const QString &resource);
 
 protected:
-    bool event(QEvent *event);
+    bool event(QEvent *event) override;
 
 private:
 
diff --git a/src/designer/src/lib/shared/richtexteditor.cpp b/src/designer/src/lib/shared/richtexteditor.cpp
index 434b72104..0c7400b85 100644
--- a/src/designer/src/lib/shared/richtexteditor.cpp
+++ b/src/designer/src/lib/shared/richtexteditor.cpp
@@ -262,7 +262,7 @@ public:
         : QTextEdit(parent)
     {}
 
-    void contextMenuEvent(QContextMenuEvent *event);
+    void contextMenuEvent(QContextMenuEvent *event) override;
 
 private slots:
     void actionTriggered(QAction *action);
diff --git a/src/designer/src/lib/shared/selectsignaldialog_p.h b/src/designer/src/lib/shared/selectsignaldialog_p.h
index 6d2a0d1ac..ab94fb1ec 100644
--- a/src/designer/src/lib/shared/selectsignaldialog_p.h
+++ b/src/designer/src/lib/shared/selectsignaldialog_p.h
@@ -58,7 +58,7 @@ class SelectSignalDialog : public QDialog
 public:
     struct Method
     {
-        Method() {}
+        Method() = default;
         explicit Method(const QString &c, const QString &s, const QStringList &p = QStringList())
             : className(c), signature(s), parameterNames(p) {}
         bool isValid() const { return !signature.isEmpty(); }
diff --git a/src/designer/src/lib/shared/widgetdatabase_p.h b/src/designer/src/lib/shared/widgetdatabase_p.h
index 44dcd4f18..73f00b6b6 100644
--- a/src/designer/src/lib/shared/widgetdatabase_p.h
+++ b/src/designer/src/lib/shared/widgetdatabase_p.h
@@ -64,45 +64,45 @@ public:
     explicit WidgetDataBaseItem(const QString &name = QString(),
                                 const QString &group = QString());
 
-    QString name() const;
-    void setName(const QString &name);
+    QString name() const override;
+    void setName(const QString &name) override;
 
-    QString group() const;
-    void setGroup(const QString &group);
+    QString group() const override;
+    void setGroup(const QString &group) override;
 
-    QString toolTip() const;
-    void setToolTip(const QString &toolTip);
+    QString toolTip() const override;
+    void setToolTip(const QString &toolTip) override;
 
-    QString whatsThis() const;
-    void setWhatsThis(const QString &whatsThis);
+    QString whatsThis() const override;
+    void setWhatsThis(const QString &whatsThis) override;
 
-    QString includeFile() const;
-    void setIncludeFile(const QString &includeFile);
+    QString includeFile() const override;
+    void setIncludeFile(const QString &includeFile) override;
 
 
-    QIcon icon() const;
-    void setIcon(const QIcon &icon);
+    QIcon icon() const override;
+    void setIcon(const QIcon &icon) override;
 
-    bool isCompat() const;
-    void setCompat(bool compat);
+    bool isCompat() const override;
+    void setCompat(bool compat) override;
 
-    bool isContainer() const;
-    void setContainer(bool b);
+    bool isContainer() const override;
+    void setContainer(bool b) override;
 
-    bool isCustom() const;
-    void setCustom(bool b);
+    bool isCustom() const override;
+    void setCustom(bool b) override;
 
-    QString pluginPath() const;
-    void setPluginPath(const QString &path);
+    QString pluginPath() const override;
+    void setPluginPath(const QString &path) override;
 
-    bool isPromoted() const;
-    void setPromoted(bool b);
+    bool isPromoted() const override;
+    void setPromoted(bool b) override;
 
-    QString extends() const;
-    void setExtends(const QString &s);
+    QString extends() const override;
+    void setExtends(const QString &s) override;
 
-    void setDefaultPropertyValues(const QList<QVariant> &list);
-    QList<QVariant> defaultPropertyValues() const;
+    void setDefaultPropertyValues(const QList<QVariant> &list) override;
+    QList<QVariant> defaultPropertyValues() const override;
 
     static WidgetDataBaseItem *clone(const QDesignerWidgetDataBaseItemInterface *item);
 
diff --git a/src/designer/src/lib/shared/zoomwidget_p.h b/src/designer/src/lib/shared/zoomwidget_p.h
index 1c4988eb3..774528069 100644
--- a/src/designer/src/lib/shared/zoomwidget_p.h
+++ b/src/designer/src/lib/shared/zoomwidget_p.h
@@ -120,7 +120,7 @@ public slots:
     void showContextMenu(const QPoint &globalPos);
 
 protected:
-    void contextMenuEvent(QContextMenuEvent *event);
+    void contextMenuEvent(QContextMenuEvent *event) override;
 
     // Overwrite for implementing additional behaviour when doing setZoom();
     virtual void applyZoom();
diff --git a/src/designer/src/lib/uilib/abstractformbuilder.h b/src/designer/src/lib/uilib/abstractformbuilder.h
index bf2e9d5d5..486359099 100644
--- a/src/designer/src/lib/uilib/abstractformbuilder.h
+++ b/src/designer/src/lib/uilib/abstractformbuilder.h
@@ -118,6 +118,8 @@ class QFormBuilderExtra;
 class QDESIGNER_UILIB_EXPORT QAbstractFormBuilder
 {
 public:
+    Q_DISABLE_COPY(QAbstractFormBuilder)
+
     QAbstractFormBuilder();
     virtual ~QAbstractFormBuilder();
 
@@ -259,9 +261,6 @@ private:
 //
     static Qt::ToolBarArea toolbarAreaFromDOMAttributes(const DomPropertyHash &attributeMap);
 
-    QAbstractFormBuilder(const QAbstractFormBuilder &other);
-    void operator = (const QAbstractFormBuilder &other);
-
     friend QDESIGNER_UILIB_EXPORT DomProperty *variantToDomProperty(QAbstractFormBuilder *abstractFormBuilder, const QMetaObject *meta, const QString &propertyName, const QVariant &value);
     friend QDESIGNER_UILIB_EXPORT QVariant domPropertyToVariant(QAbstractFormBuilder *abstractFormBuilder,const QMetaObject *meta, const DomProperty *property);
 
diff --git a/src/designer/src/lib/uilib/formbuilder.cpp b/src/designer/src/lib/uilib/formbuilder.cpp
index 7ba7f445a..31bfdfde4 100644
--- a/src/designer/src/lib/uilib/formbuilder.cpp
+++ b/src/designer/src/lib/uilib/formbuilder.cpp
@@ -112,16 +112,12 @@ namespace QFormInternal {
     Constructs a new form builder.
 */
 
-QFormBuilder::QFormBuilder()
-{
-}
+QFormBuilder::QFormBuilder() = default;
 
 /*!
     Destroys the form builder.
 */
-QFormBuilder::~QFormBuilder()
-{
-}
+QFormBuilder::~QFormBuilder() = default;
 
 /*!
     \internal
diff --git a/src/designer/src/uitools/quiloader.cpp b/src/designer/src/uitools/quiloader.cpp
index 097512373..e5f157fb1 100644
--- a/src/designer/src/uitools/quiloader.cpp
+++ b/src/designer/src/uitools/quiloader.cpp
@@ -681,9 +681,7 @@ QUiLoader::QUiLoader(QObject *parent)
 /*!
     Destroys the loader.
 */
-QUiLoader::~QUiLoader()
-{
-}
+QUiLoader::~QUiLoader() = default;
 
 /*!
     Loads a form from the given \a device and creates a new widget with the