feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

beautifier: s/Q_DECL_OVERRIDE/override/g

Browse Source 
Change-Id: Iffbf9562d1e25ce7787c08eb5e5c413974cc1fc8
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-06-03 15:33:26 +02:00
parent 47092d8e64
commit da96f72124
11 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/beautifier/artisticstyle/artisticstyle.h
View File

@@ -52,9 +52,9 @@ class ArtisticStyle : public BeautifierAbstractTool
public: public:
explicit ArtisticStyle(BeautifierPlugin *parent = 0); explicit ArtisticStyle(BeautifierPlugin *parent = 0);
virtual ~ArtisticStyle(); virtual ~ArtisticStyle();
bool initialize() Q_DECL_OVERRIDE; bool initialize() override;
void updateActions(Core::IEditor *editor) Q_DECL_OVERRIDE; void updateActions(Core::IEditor *editor) override;
QList<QObject *> autoReleaseObjects() Q_DECL_OVERRIDE; QList<QObject *> autoReleaseObjects() override;
private slots: private slots:
void formatFile(); void formatFile();

6
src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h
View File

@@ -65,9 +65,9 @@ class ArtisticStyleOptionsPage : public Core::IOptionsPage
public: public:
explicit ArtisticStyleOptionsPage(ArtisticStyleSettings *settings, QObject *parent = 0); explicit ArtisticStyleOptionsPage(ArtisticStyleSettings *settings, QObject *parent = 0);
QWidget *widget() Q_DECL_OVERRIDE; QWidget *widget() override;
void apply() Q_DECL_OVERRIDE; void apply() override;
void finish() Q_DECL_OVERRIDE; void finish() override;
private: private:
QPointer<ArtisticStyleOptionsPageWidget> m_widget; QPointer<ArtisticStyleOptionsPageWidget> m_widget;

6
src/plugins/beautifier/artisticstyle/artisticstylesettings.h
View File

@@ -52,7 +52,7 @@ public:
ArtisticStyleSettings(); ArtisticStyleSettings();
void updateVersion() Q_DECL_OVERRIDE; void updateVersion() override;
bool useOtherFiles() const; bool useOtherFiles() const;
void setUseOtherFiles(bool useOtherFiles); void setUseOtherFiles(bool useOtherFiles);
@@ -66,8 +66,8 @@ public:
QString customStyle() const; QString customStyle() const;
void setCustomStyle(const QString &customStyle); void setCustomStyle(const QString &customStyle);
QString documentationFilePath() const Q_DECL_OVERRIDE; QString documentationFilePath() const override;
void createDocumentationFile() const Q_DECL_OVERRIDE; void createDocumentationFile() const override;
private slots: private slots:
void helperSetVersion(); void helperSetVersion();

6
src/plugins/beautifier/beautifierplugin.h
View File

@@ -73,9 +73,9 @@ class BeautifierPlugin : public ExtensionSystem::IPlugin
public: public:
BeautifierPlugin(); BeautifierPlugin();
~BeautifierPlugin(); ~BeautifierPlugin();
bool initialize(const QStringList &arguments, QString *errorString) Q_DECL_OVERRIDE; bool initialize(const QStringList &arguments, QString *errorString) override;
void extensionsInitialized() Q_DECL_OVERRIDE; void extensionsInitialized() override;
ShutdownFlag aboutToShutdown() Q_DECL_OVERRIDE; ShutdownFlag aboutToShutdown() override;
QString format(const QString &text, const Command &command, const QString &fileName, QString format(const QString &text, const Command &command, const QString &fileName,
bool *timeout = 0); bool *timeout = 0);

6
src/plugins/beautifier/clangformat/clangformat.h
View File

@@ -53,9 +53,9 @@ class ClangFormat : public BeautifierAbstractTool
public: public:
explicit ClangFormat(BeautifierPlugin *parent = 0); explicit ClangFormat(BeautifierPlugin *parent = 0);
virtual ~ClangFormat(); virtual ~ClangFormat();
bool initialize() Q_DECL_OVERRIDE; bool initialize() override;
void updateActions(Core::IEditor *editor) Q_DECL_OVERRIDE; void updateActions(Core::IEditor *editor) override;
QList<QObject *> autoReleaseObjects() Q_DECL_OVERRIDE; QList<QObject *> autoReleaseObjects() override;
private slots: private slots:
void formatFile(); void formatFile();

6
src/plugins/beautifier/clangformat/clangformatoptionspage.h
View File

@@ -65,9 +65,9 @@ class ClangFormatOptionsPage : public Core::IOptionsPage
public: public:
explicit ClangFormatOptionsPage(ClangFormatSettings *settings, QObject *parent = 0); explicit ClangFormatOptionsPage(ClangFormatSettings *settings, QObject *parent = 0);
QWidget *widget() Q_DECL_OVERRIDE; QWidget *widget() override;
void apply() Q_DECL_OVERRIDE; void apply() override;
void finish() Q_DECL_OVERRIDE; void finish() override;
private: private:
QPointer<ClangFormatOptionsPageWidget> m_widget; QPointer<ClangFormatOptionsPageWidget> m_widget;

6
src/plugins/beautifier/clangformat/clangformatsettings.h
View File

@@ -45,9 +45,9 @@ class ClangFormatSettings : public AbstractSettings
public: public:
explicit ClangFormatSettings(); explicit ClangFormatSettings();
QString documentationFilePath() const Q_DECL_OVERRIDE; QString documentationFilePath() const override;
void createDocumentationFile() const Q_DECL_OVERRIDE; void createDocumentationFile() const override;
QStringList completerWords() Q_DECL_OVERRIDE; QStringList completerWords() override;
bool usePredefinedStyle() const; bool usePredefinedStyle() const;
void setUsePredefinedStyle(bool usePredefinedStyle); void setUsePredefinedStyle(bool usePredefinedStyle);

6
src/plugins/beautifier/configurationeditor.h
View File

@@ -61,7 +61,7 @@ public:
void setCommentExpression(const QRegExp &rx); void setCommentExpression(const QRegExp &rx);
protected: protected:
void highlightBlock(const QString &text) Q_DECL_OVERRIDE; void highlightBlock(const QString &text) override;
private: private:
QRegExp m_expressionKeyword; QRegExp m_expressionKeyword;
@@ -80,8 +80,8 @@ public:
void setCommentExpression(const QRegExp &rx); void setCommentExpression(const QRegExp &rx);
protected: protected:
bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; bool eventFilter(QObject *object, QEvent *event) override;
void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; void keyPressEvent(QKeyEvent *event) override;
private slots: private slots:
void insertCompleterText(const QString &text); void insertCompleterText(const QString &text);

6
src/plugins/beautifier/uncrustify/uncrustify.h
View File

@@ -52,9 +52,9 @@ class Uncrustify : public BeautifierAbstractTool
public: public:
explicit Uncrustify(BeautifierPlugin *parent = 0); explicit Uncrustify(BeautifierPlugin *parent = 0);
virtual ~Uncrustify(); virtual ~Uncrustify();
bool initialize() Q_DECL_OVERRIDE; bool initialize() override;
void updateActions(Core::IEditor *editor) Q_DECL_OVERRIDE; void updateActions(Core::IEditor *editor) override;
QList<QObject *> autoReleaseObjects() Q_DECL_OVERRIDE; QList<QObject *> autoReleaseObjects() override;
private slots: private slots:
void formatFile(); void formatFile();

6
src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h
View File

@@ -65,9 +65,9 @@ class UncrustifyOptionsPage : public Core::IOptionsPage
public: public:
explicit UncrustifyOptionsPage(UncrustifySettings *settings, QObject *parent = 0); explicit UncrustifyOptionsPage(UncrustifySettings *settings, QObject *parent = 0);
QWidget *widget() Q_DECL_OVERRIDE; QWidget *widget() override;
void apply() Q_DECL_OVERRIDE; void apply() override;
void finish() Q_DECL_OVERRIDE; void finish() override;
private: private:
QPointer<UncrustifyOptionsPageWidget> m_widget; QPointer<UncrustifyOptionsPageWidget> m_widget;

4
src/plugins/beautifier/uncrustify/uncrustifysettings.h
View File

@@ -55,8 +55,8 @@ public:
QString customStyle() const; QString customStyle() const;
void setCustomStyle(const QString &customStyle); void setCustomStyle(const QString &customStyle);
QString documentationFilePath() const Q_DECL_OVERRIDE; QString documentationFilePath() const override;
void createDocumentationFile() const Q_DECL_OVERRIDE; void createDocumentationFile() const override;
}; };
} // namespace Uncrustify } // namespace Uncrustify