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/cpptools/cppcompletionassistprovider.h | |
| parent | 652c53bf06826bc347d5384b3da01c8a083b2118 (diff) | |
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/cpptools/cppcompletionassistprovider.h')
| -rw-r--r-- | src/plugins/cpptools/cppcompletionassistprovider.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/cpptools/cppcompletionassistprovider.h b/src/plugins/cpptools/cppcompletionassistprovider.h index 329055a4f9..7a9b7fdcd7 100644 --- a/src/plugins/cpptools/cppcompletionassistprovider.h +++ b/src/plugins/cpptools/cppcompletionassistprovider.h @@ -35,7 +35,6 @@ #include <texteditor/codeassist/assistenums.h> #include <texteditor/codeassist/completionassistprovider.h> -#include <utils/qtcoverride.h> QT_BEGIN_NAMESPACE class QTextDocument; @@ -53,10 +52,10 @@ class CPPTOOLS_EXPORT CppCompletionAssistProvider : public TextEditor::Completio Q_OBJECT public: - bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE; - int activationCharSequenceLength() const QTC_OVERRIDE; - bool isActivationCharSequence(const QString &sequence) const QTC_OVERRIDE; - bool isContinuationChar(const QChar &c) const QTC_OVERRIDE; + bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE; + int activationCharSequenceLength() const Q_DECL_OVERRIDE; + bool isActivationCharSequence(const QString &sequence) const Q_DECL_OVERRIDE; + bool isContinuationChar(const QChar &c) const Q_DECL_OVERRIDE; virtual TextEditor::AssistInterface *createAssistInterface( const QString &filePath, |