diff options
author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-06-03 15:33:26 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-06-04 08:31:35 +0000 |
commit | da96f72124462edb756e5288918944badd9786f2 (patch) | |
tree | 29bf81cbd66abc902ff43c0b2fba131afff0a269 /src/plugins/beautifier | |
parent | 47092d8e642cebaa4c4ff9f378b346c5b9c15bc8 (diff) | |
download | qt-creator-da96f72124462edb756e5288918944badd9786f2.tar.gz |
beautifier: s/Q_DECL_OVERRIDE/override/g
Change-Id: Iffbf9562d1e25ce7787c08eb5e5c413974cc1fc8
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/beautifier')
11 files changed, 32 insertions, 32 deletions
diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.h b/src/plugins/beautifier/artisticstyle/artisticstyle.h index 09624a7d02..e362fdd5fa 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyle.h +++ b/src/plugins/beautifier/artisticstyle/artisticstyle.h @@ -52,9 +52,9 @@ class ArtisticStyle : public BeautifierAbstractTool public: explicit ArtisticStyle(BeautifierPlugin *parent = 0); virtual ~ArtisticStyle(); - bool initialize() Q_DECL_OVERRIDE; - void updateActions(Core::IEditor *editor) Q_DECL_OVERRIDE; - QList<QObject *> autoReleaseObjects() Q_DECL_OVERRIDE; + bool initialize() override; + void updateActions(Core::IEditor *editor) override; + QList<QObject *> autoReleaseObjects() override; private slots: void formatFile(); diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h index f68d91a67d..b3e67c5abb 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h +++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h @@ -65,9 +65,9 @@ class ArtisticStyleOptionsPage : public Core::IOptionsPage public: explicit ArtisticStyleOptionsPage(ArtisticStyleSettings *settings, QObject *parent = 0); - QWidget *widget() Q_DECL_OVERRIDE; - void apply() Q_DECL_OVERRIDE; - void finish() Q_DECL_OVERRIDE; + QWidget *widget() override; + void apply() override; + void finish() override; private: QPointer<ArtisticStyleOptionsPageWidget> m_widget; diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.h b/src/plugins/beautifier/artisticstyle/artisticstylesettings.h index 99b5b1474d..e8860d10ef 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.h +++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.h @@ -52,7 +52,7 @@ public: ArtisticStyleSettings(); - void updateVersion() Q_DECL_OVERRIDE; + void updateVersion() override; bool useOtherFiles() const; void setUseOtherFiles(bool useOtherFiles); @@ -66,8 +66,8 @@ public: QString customStyle() const; void setCustomStyle(const QString &customStyle); - QString documentationFilePath() const Q_DECL_OVERRIDE; - void createDocumentationFile() const Q_DECL_OVERRIDE; + QString documentationFilePath() const override; + void createDocumentationFile() const override; private slots: void helperSetVersion(); diff --git a/src/plugins/beautifier/beautifierplugin.h b/src/plugins/beautifier/beautifierplugin.h index c243a3f337..f8d9517c21 100644 --- a/src/plugins/beautifier/beautifierplugin.h +++ b/src/plugins/beautifier/beautifierplugin.h @@ -73,9 +73,9 @@ class BeautifierPlugin : public ExtensionSystem::IPlugin public: BeautifierPlugin(); ~BeautifierPlugin(); - bool initialize(const QStringList &arguments, QString *errorString) Q_DECL_OVERRIDE; - void extensionsInitialized() Q_DECL_OVERRIDE; - ShutdownFlag aboutToShutdown() Q_DECL_OVERRIDE; + bool initialize(const QStringList &arguments, QString *errorString) override; + void extensionsInitialized() override; + ShutdownFlag aboutToShutdown() override; QString format(const QString &text, const Command &command, const QString &fileName, bool *timeout = 0); diff --git a/src/plugins/beautifier/clangformat/clangformat.h b/src/plugins/beautifier/clangformat/clangformat.h index ac9de15766..c6162e588a 100644 --- a/src/plugins/beautifier/clangformat/clangformat.h +++ b/src/plugins/beautifier/clangformat/clangformat.h @@ -53,9 +53,9 @@ class ClangFormat : public BeautifierAbstractTool public: explicit ClangFormat(BeautifierPlugin *parent = 0); virtual ~ClangFormat(); - bool initialize() Q_DECL_OVERRIDE; - void updateActions(Core::IEditor *editor) Q_DECL_OVERRIDE; - QList<QObject *> autoReleaseObjects() Q_DECL_OVERRIDE; + bool initialize() override; + void updateActions(Core::IEditor *editor) override; + QList<QObject *> autoReleaseObjects() override; private slots: void formatFile(); diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.h b/src/plugins/beautifier/clangformat/clangformatoptionspage.h index 24c910c801..19508a937b 100644 --- a/src/plugins/beautifier/clangformat/clangformatoptionspage.h +++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.h @@ -65,9 +65,9 @@ class ClangFormatOptionsPage : public Core::IOptionsPage public: explicit ClangFormatOptionsPage(ClangFormatSettings *settings, QObject *parent = 0); - QWidget *widget() Q_DECL_OVERRIDE; - void apply() Q_DECL_OVERRIDE; - void finish() Q_DECL_OVERRIDE; + QWidget *widget() override; + void apply() override; + void finish() override; private: QPointer<ClangFormatOptionsPageWidget> m_widget; diff --git a/src/plugins/beautifier/clangformat/clangformatsettings.h b/src/plugins/beautifier/clangformat/clangformatsettings.h index 9a5a0a0e64..f92ad8888f 100644 --- a/src/plugins/beautifier/clangformat/clangformatsettings.h +++ b/src/plugins/beautifier/clangformat/clangformatsettings.h @@ -45,9 +45,9 @@ class ClangFormatSettings : public AbstractSettings public: explicit ClangFormatSettings(); - QString documentationFilePath() const Q_DECL_OVERRIDE; - void createDocumentationFile() const Q_DECL_OVERRIDE; - QStringList completerWords() Q_DECL_OVERRIDE; + QString documentationFilePath() const override; + void createDocumentationFile() const override; + QStringList completerWords() override; bool usePredefinedStyle() const; void setUsePredefinedStyle(bool usePredefinedStyle); diff --git a/src/plugins/beautifier/configurationeditor.h b/src/plugins/beautifier/configurationeditor.h index ee8a3ff5f2..6c1810f984 100644 --- a/src/plugins/beautifier/configurationeditor.h +++ b/src/plugins/beautifier/configurationeditor.h @@ -61,7 +61,7 @@ public: void setCommentExpression(const QRegExp &rx); protected: - void highlightBlock(const QString &text) Q_DECL_OVERRIDE; + void highlightBlock(const QString &text) override; private: QRegExp m_expressionKeyword; @@ -80,8 +80,8 @@ public: void setCommentExpression(const QRegExp &rx); protected: - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; private slots: void insertCompleterText(const QString &text); diff --git a/src/plugins/beautifier/uncrustify/uncrustify.h b/src/plugins/beautifier/uncrustify/uncrustify.h index e443e1c84a..5c85aefea5 100644 --- a/src/plugins/beautifier/uncrustify/uncrustify.h +++ b/src/plugins/beautifier/uncrustify/uncrustify.h @@ -52,9 +52,9 @@ class Uncrustify : public BeautifierAbstractTool public: explicit Uncrustify(BeautifierPlugin *parent = 0); virtual ~Uncrustify(); - bool initialize() Q_DECL_OVERRIDE; - void updateActions(Core::IEditor *editor) Q_DECL_OVERRIDE; - QList<QObject *> autoReleaseObjects() Q_DECL_OVERRIDE; + bool initialize() override; + void updateActions(Core::IEditor *editor) override; + QList<QObject *> autoReleaseObjects() override; private slots: void formatFile(); diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h index b4899d3a8a..aa1e4b37b8 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h +++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h @@ -65,9 +65,9 @@ class UncrustifyOptionsPage : public Core::IOptionsPage public: explicit UncrustifyOptionsPage(UncrustifySettings *settings, QObject *parent = 0); - QWidget *widget() Q_DECL_OVERRIDE; - void apply() Q_DECL_OVERRIDE; - void finish() Q_DECL_OVERRIDE; + QWidget *widget() override; + void apply() override; + void finish() override; private: QPointer<UncrustifyOptionsPageWidget> m_widget; diff --git a/src/plugins/beautifier/uncrustify/uncrustifysettings.h b/src/plugins/beautifier/uncrustify/uncrustifysettings.h index 50cb3b0a52..6506672710 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifysettings.h +++ b/src/plugins/beautifier/uncrustify/uncrustifysettings.h @@ -55,8 +55,8 @@ public: QString customStyle() const; void setCustomStyle(const QString &customStyle); - QString documentationFilePath() const Q_DECL_OVERRIDE; - void createDocumentationFile() const Q_DECL_OVERRIDE; + QString documentationFilePath() const override; + void createDocumentationFile() const override; }; } // namespace Uncrustify |