diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-06-02 09:24:27 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-06-02 09:17:02 +0000 |
commit | 17aaf043099cbf2405a3a667879448ba80dea4b4 (patch) | |
tree | 203f1834a588cb34ff3615a2a0f51f258bc48d7b | |
parent | b281869b25a3c906b0d0ad3c9716833c5e4432dc (diff) |
Qt Designer plugin: Introduce override.
Change-Id: I1b69865dfeb19322693f11ea2c276bd016ceed4f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
-rw-r--r-- | src/plugins/designer/designercontext.h | 2 | ||||
-rw-r--r-- | src/plugins/designer/formeditorfactory.h | 2 | ||||
-rw-r--r-- | src/plugins/designer/formeditorplugin.h | 6 | ||||
-rw-r--r-- | src/plugins/designer/formtemplatewizardpage.h | 8 | ||||
-rw-r--r-- | src/plugins/designer/formwindoweditor.h | 8 | ||||
-rw-r--r-- | src/plugins/designer/formwindowfile.h | 22 | ||||
-rw-r--r-- | src/plugins/designer/qtcreatorintegration.h | 4 | ||||
-rw-r--r-- | src/plugins/designer/settingsmanager.h | 12 | ||||
-rw-r--r-- | src/plugins/designer/settingspage.h | 10 | ||||
-rw-r--r-- | src/shared/designerintegrationv2/formresizer.h | 2 | ||||
-rw-r--r-- | src/shared/designerintegrationv2/sizehandlerect.h | 8 |
11 files changed, 42 insertions, 42 deletions
diff --git a/src/plugins/designer/designercontext.h b/src/plugins/designer/designercontext.h index 7515425ce5..69bd94e90c 100644 --- a/src/plugins/designer/designercontext.h +++ b/src/plugins/designer/designercontext.h @@ -43,7 +43,7 @@ public: QWidget *widget, QObject *parent = 0); - virtual QString contextHelpId() const; + QString contextHelpId() const override; }; } // namespace Internal diff --git a/src/plugins/designer/formeditorfactory.h b/src/plugins/designer/formeditorfactory.h index 98f85c93d0..b50e8f59ed 100644 --- a/src/plugins/designer/formeditorfactory.h +++ b/src/plugins/designer/formeditorfactory.h @@ -43,7 +43,7 @@ class FormEditorFactory : public Core::IEditorFactory public: FormEditorFactory(); - Core::IEditor *createEditor(); + Core::IEditor *createEditor() override; }; } // namespace Internal diff --git a/src/plugins/designer/formeditorplugin.h b/src/plugins/designer/formeditorplugin.h index 03353ccd12..1a877ad0f7 100644 --- a/src/plugins/designer/formeditorplugin.h +++ b/src/plugins/designer/formeditorplugin.h @@ -47,11 +47,11 @@ class FormEditorPlugin : public ExtensionSystem::IPlugin public: FormEditorPlugin(); - ~FormEditorPlugin(); + ~FormEditorPlugin() override; //Plugin - bool initialize(const QStringList &arguments, QString *errorMessage = 0); - void extensionsInitialized(); + bool initialize(const QStringList &arguments, QString *errorMessage = 0) override; + void extensionsInitialized() override; private slots: #ifdef WITH_TESTS diff --git a/src/plugins/designer/formtemplatewizardpage.h b/src/plugins/designer/formtemplatewizardpage.h index a14e2ddded..9e01c9dfc4 100644 --- a/src/plugins/designer/formtemplatewizardpage.h +++ b/src/plugins/designer/formtemplatewizardpage.h @@ -47,9 +47,9 @@ class FormPageFactory : public ProjectExplorer::JsonWizardPageFactory public: FormPageFactory(); - Utils::WizardPage *create(ProjectExplorer::JsonWizard *wizard, Core::Id typeId, const QVariant &data); + Utils::WizardPage *create(ProjectExplorer::JsonWizard *wizard, Core::Id typeId, const QVariant &data) override; - bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage); + bool validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) override; }; // A wizard page embedding Qt Designer's QDesignerNewFormWidgetInterface @@ -64,8 +64,8 @@ class FormTemplateWizardPage : public Utils::WizardPage public: explicit FormTemplateWizardPage(QWidget * parent = 0); - virtual bool isComplete () const; - virtual bool validatePage(); + bool isComplete () const override; + bool validatePage() override; QString templateContents() const { return m_templateContents; } diff --git a/src/plugins/designer/formwindoweditor.h b/src/plugins/designer/formwindoweditor.h index f82030b61d..3c3a10b6d3 100644 --- a/src/plugins/designer/formwindoweditor.h +++ b/src/plugins/designer/formwindoweditor.h @@ -52,11 +52,11 @@ class DESIGNER_EXPORT FormWindowEditor : public TextEditor::BaseTextEditor public: FormWindowEditor(); - ~FormWindowEditor(); + ~FormWindowEditor() override; - bool open(QString *errorString, const QString &fileName, const QString &realFileName); - QWidget *toolBar(); - bool isDesignModePreferred() const; + bool open(QString *errorString, const QString &fileName, const QString &realFileName) override; + QWidget *toolBar() override; + bool isDesignModePreferred() const override; // For uic code model support QString contents() const; diff --git a/src/plugins/designer/formwindowfile.h b/src/plugins/designer/formwindowfile.h index 1d4d7a4f36..fc83ddede0 100644 --- a/src/plugins/designer/formwindowfile.h +++ b/src/plugins/designer/formwindowfile.h @@ -50,19 +50,19 @@ class FormWindowFile : public TextEditor::TextDocument public: explicit FormWindowFile(QDesignerFormWindowInterface *form, QObject *parent = 0); - ~FormWindowFile() { } + ~FormWindowFile() override { } - bool open(QString *errorString, const QString &fileName, const QString &realFileName); + bool open(QString *errorString, const QString &fileName, const QString &realFileName) override; // IDocument - bool save(QString *errorString, const QString &fileName, bool autoSave); - bool setContents(const QByteArray &contents); - bool shouldAutoSave() const; - bool isModified() const; - bool isSaveAsAllowed() const; - bool reload(QString *errorString, ReloadFlag flag, ChangeType type); - QString defaultPath() const; - QString suggestedFileName() const; + bool save(QString *errorString, const QString &fileName, bool autoSave) override; + bool setContents(const QByteArray &contents) override; + bool shouldAutoSave() const override; + bool isModified() const override; + bool isSaveAsAllowed() const override; + bool reload(QString *errorString, ReloadFlag flag, ChangeType type) override; + QString defaultPath() const override; + QString suggestedFileName() const override; // Internal void setSuggestedFileName(const QString &fileName); @@ -75,7 +75,7 @@ public: ResourceHandler *resourceHandler() const; public slots: - void setFilePath(const Utils::FileName &); + void setFilePath(const Utils::FileName &) override; void setShouldAutoSave(bool sad = true) { m_shouldAutoSave = sad; } void updateIsModified(); diff --git a/src/plugins/designer/qtcreatorintegration.h b/src/plugins/designer/qtcreatorintegration.h index 8742e580ed..99e491763a 100644 --- a/src/plugins/designer/qtcreatorintegration.h +++ b/src/plugins/designer/qtcreatorintegration.h @@ -46,7 +46,7 @@ class QtCreatorIntegration : public QDesignerIntegration public: explicit QtCreatorIntegration(QDesignerFormEditorInterface *core, QObject *parent = 0); - QWidget *containerWindow(QWidget *widget) const; + QWidget *containerWindow(QWidget *widget) const override; bool supportsToSlotNavigation() { return true; } @@ -54,7 +54,7 @@ signals: void creatorHelpRequested(const QUrl &url); public slots: - void updateSelection(); + void updateSelection() override; private slots: void slotNavigateToSlot(const QString &objectName, const QString &signalSignature, const QStringList ¶meterNames); diff --git a/src/plugins/designer/settingsmanager.h b/src/plugins/designer/settingsmanager.h index 5152b54710..9e7f318775 100644 --- a/src/plugins/designer/settingsmanager.h +++ b/src/plugins/designer/settingsmanager.h @@ -42,13 +42,13 @@ namespace Internal { class SettingsManager : public QDesignerSettingsInterface { public: - virtual void beginGroup(const QString &prefix); - virtual void endGroup(); + void beginGroup(const QString &prefix) override; + void endGroup() override; - virtual bool contains(const QString &key) const; - virtual void setValue(const QString &key, const QVariant &value); - virtual QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const; - virtual void remove(const QString &key); + 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; private: QString addPrefix(const QString &name) const; diff --git a/src/plugins/designer/settingspage.h b/src/plugins/designer/settingspage.h index f312811aee..c69824470f 100644 --- a/src/plugins/designer/settingspage.h +++ b/src/plugins/designer/settingspage.h @@ -51,9 +51,9 @@ class SettingsPage : public Core::IOptionsPage public: explicit SettingsPage(QDesignerOptionsPageInterface *designerPage); - QWidget *widget(); - void apply(); - void finish(); + QWidget *widget() override; + void apply() override; + void finish() override; private: QDesignerOptionsPageInterface *m_designerPage; @@ -68,8 +68,8 @@ class SettingsPageProvider : public Core::IOptionsPageProvider public: SettingsPageProvider(QObject *parent = 0); - QList<Core::IOptionsPage *> pages() const; - bool matches(const QString &searchKeyWord) const; + QList<Core::IOptionsPage *> pages() const override; + bool matches(const QString &searchKeyWord) const override; private: mutable bool m_initialized; diff --git a/src/shared/designerintegrationv2/formresizer.h b/src/shared/designerintegrationv2/formresizer.h index 9cc347a8a1..034fc96655 100644 --- a/src/shared/designerintegrationv2/formresizer.h +++ b/src/shared/designerintegrationv2/formresizer.h @@ -77,7 +77,7 @@ signals: void formWindowSizeChanged(const QRect &oldGeo, const QRect &newGeo); protected: - virtual void resizeEvent(QResizeEvent *event); + void resizeEvent(QResizeEvent *event) override; private slots: void mainContainerChanged(); diff --git a/src/shared/designerintegrationv2/sizehandlerect.h b/src/shared/designerintegrationv2/sizehandlerect.h index b8658fcc32..5c95bc6aaa 100644 --- a/src/shared/designerintegrationv2/sizehandlerect.h +++ b/src/shared/designerintegrationv2/sizehandlerect.h @@ -55,10 +55,10 @@ signals: void mouseButtonReleased(const QRect &, const QRect &); protected: - void paintEvent(QPaintEvent *e); - void mousePressEvent(QMouseEvent *e); - void mouseMoveEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *e); + void paintEvent(QPaintEvent *e) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; private: void tryResize(const QSize &delta); |