Commit 17aaf043 authored by Friedemann Kleint's avatar Friedemann Kleint

Qt Designer plugin: Introduce override.

Change-Id: I1b69865dfeb19322693f11ea2c276bd016ceed4f
Reviewed-by: default avatarEike Ziller <eike.ziller@theqtcompany.com>
parent b281869b
......@@ -43,7 +43,7 @@ public:
QWidget *widget,
QObject *parent = 0);
virtual QString contextHelpId() const;
QString contextHelpId() const override;
};
} // namespace Internal
......
......@@ -43,7 +43,7 @@ class FormEditorFactory : public Core::IEditorFactory
public:
FormEditorFactory();
Core::IEditor *createEditor();
Core::IEditor *createEditor() override;
};
} // namespace Internal
......
......@@ -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
......
......@@ -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; }
......
......@@ -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;
......
......@@ -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();
......
......@@ -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 &parameterNames);
......
......@@ -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;
......
......@@ -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;
......
......@@ -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();
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment