diff options
| author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-09-24 12:49:32 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-09-25 12:16:47 +0200 |
| commit | 48f19e925b9af6fb0b22c8bd6c34a4778fe280a8 (patch) | |
| tree | b929e23cd0487100fa7f21234400b616231e4143 /src/plugins/beautifier/beautifierplugin.h | |
| parent | 652c53bf06826bc347d5384b3da01c8a083b2118 (diff) | |
| download | qt-creator-48f19e925b9af6fb0b22c8bd6c34a4778fe280a8.tar.gz | |
Use Q_DECL_OVERRIDE instead of QTC_OVERRIDE
This patch removes src/libs/utils/qtcoverride.h
and uses Q_DECL_OVERRIDE from Qt 5 instead.
Change-Id: I61ffa539648ffe996dc061eec7708c04580c0f09
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Diffstat (limited to 'src/plugins/beautifier/beautifierplugin.h')
| -rw-r--r-- | src/plugins/beautifier/beautifierplugin.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/beautifier/beautifierplugin.h b/src/plugins/beautifier/beautifierplugin.h index fb241ebd68..cfbaf69869 100644 --- a/src/plugins/beautifier/beautifierplugin.h +++ b/src/plugins/beautifier/beautifierplugin.h @@ -33,7 +33,6 @@ #include "command.h" #include <extensionsystem/iplugin.h> -#include <utils/qtcoverride.h> #include <QFutureInterface> #include <QPlainTextEdit> @@ -73,9 +72,9 @@ class BeautifierPlugin : public ExtensionSystem::IPlugin public: BeautifierPlugin(); ~BeautifierPlugin(); - bool initialize(const QStringList &arguments, QString *errorString) QTC_OVERRIDE; - void extensionsInitialized() QTC_OVERRIDE; - ShutdownFlag aboutToShutdown() QTC_OVERRIDE; + bool initialize(const QStringList &arguments, QString *errorString) Q_DECL_OVERRIDE; + void extensionsInitialized() Q_DECL_OVERRIDE; + ShutdownFlag aboutToShutdown() Q_DECL_OVERRIDE; QString format(const QString &text, const Command &command, const QString &fileName, bool *timeout = 0); |