CodeAssistant: Replace virtual with QTC_OVERRIDE

Change-Id: I18ea4ea410ac811972447e9395f2eef76bda8084
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

src/plugins/cppeditor/cppquickfixassistant.h

@@ -37,6 +37,8 @@
 
 #include <cplusplus/LookupContext.h>
 
+#include <utils/qtcoverride.h>
+
 namespace CppTools {
 class CppRefactoringFile;
 typedef QSharedPointer<CppRefactoringFile> CppRefactoringFilePtr;
@@ -77,7 +79,7 @@ class CppQuickFixAssistProcessor : public TextEditor::QuickFixAssistProcessor
 public:
     CppQuickFixAssistProcessor(const TextEditor::IAssistProvider *provider);
 
-    virtual const TextEditor::IAssistProvider *provider() const;
+    const TextEditor::IAssistProvider *provider() const QTC_OVERRIDE;
 
 private:
     const TextEditor::IAssistProvider *m_provider;
@@ -86,11 +88,11 @@ private:
 class CppQuickFixAssistProvider : public TextEditor::QuickFixAssistProvider
 {
 public:
-    virtual bool isAsynchronous() const;
-    virtual bool supportsEditor(const Core::Id &editorId) const;
-    virtual TextEditor::IAssistProcessor *createProcessor() const;
+    bool isAsynchronous() const QTC_OVERRIDE;
+    bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
+    TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
 
-    virtual QList<TextEditor::QuickFixFactory *> quickFixFactories() const;
+    QList<TextEditor::QuickFixFactory *> quickFixFactories() const QTC_OVERRIDE;
 };
 
 } // Internal

src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp

@@ -53,6 +53,7 @@
 #include <texteditor/texteditorconstants.h>
 
 #include <utils/qtcassert.h>
+#include <utils/qtcoverride.h>
 
 using namespace CPlusPlus;
 using namespace CppEditor::Internal;
@@ -88,7 +89,7 @@ protected:
         return GenericProposalWidget::eventFilter(o, e);
     }
 
-    void showProposal(const QString &prefix)
+    void showProposal(const QString &prefix) QTC_OVERRIDE
     {
         IGenericProposalModel *proposalModel = model();
         if (proposalModel && proposalModel->size() == 1) {
@@ -111,9 +112,9 @@ public:
         , m_openInSplit(openInSplit)
     {}
 
-    bool isFragile() const { return true; }
+    bool isFragile() const QTC_OVERRIDE { return true; }
 
-    IAssistProposalWidget *createWidget() const
+    IAssistProposalWidget *createWidget() const QTC_OVERRIDE
     { return new VirtualFunctionProposalWidget(m_openInSplit); }
 
 private:
@@ -127,7 +128,7 @@ public:
         : m_params(params)
     {}
 
-    IAssistProposal *immediateProposal(const TextEditor::IAssistInterface *)
+    IAssistProposal *immediateProposal(const TextEditor::IAssistInterface *) QTC_OVERRIDE
     {
         QTC_ASSERT(m_params.function, return 0);
 
@@ -144,7 +145,7 @@ public:
                                            m_params.openInNextSplit);
     }
 
-    IAssistProposal *perform(const IAssistInterface *)
+    IAssistProposal *perform(const IAssistInterface *) QTC_OVERRIDE
     {
         QTC_ASSERT(m_params.function, return 0);
         QTC_ASSERT(m_params.staticClass, return 0);

src/plugins/cppeditor/cppvirtualfunctionassistprovider.h

@@ -36,6 +36,8 @@
 #include <cplusplus/Symbols.h>
 #include <cplusplus/TypeOfExpression.h>
 
+#include <utils/qtcoverride.h>
+
 #include <QSharedPointer>
 #include <QTextCursor>
 
@@ -62,9 +64,9 @@ public:
     Parameters params() const { return m_params; }
     void clearParams() { m_params = Parameters(); }
 
-    bool isAsynchronous() const;
-    bool supportsEditor(const Core::Id &editorId) const;
-    TextEditor::IAssistProcessor *createProcessor() const;
+    bool isAsynchronous() const QTC_OVERRIDE;
+    bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
+    TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
 
 private:
     Parameters m_params;

src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp

@@ -107,7 +107,7 @@ public:
     // Invoke the processor already here to calculate the proposals. Return false in order to
     // indicate that configure failed, so the actual code assist invocation leading to a pop-up
     // will not happen.
-    bool configure(const VirtualFunctionAssistProvider::Parameters &params)
+    bool configure(const VirtualFunctionAssistProvider::Parameters &params) QTC_OVERRIDE
     {
         VirtualFunctionAssistProvider::configure(params);
 

src/plugins/cpptools/cppcompletionassist.cpp

@@ -45,6 +45,7 @@
 #include <texteditor/completionsettings.h>
 
 #include <utils/qtcassert.h>
+#include <utils/qtcoverride.h>
 
 #include <cplusplus/BackwardsScanner.h>
 #include <cplusplus/CppRewriter.h>
@@ -85,9 +86,9 @@ public:
     CppAssistProposalItem() :
         m_isOverloaded(false) {}
 
-    virtual bool prematurelyApplies(const QChar &c) const;
-    virtual void applyContextualContent(TextEditor::BaseTextEditor *editor,
-                                        int basePosition) const;
+    bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE;
+    void applyContextualContent(TextEditor::BaseTextEditor *editor,
+                                int basePosition) const QTC_OVERRIDE;
 
     bool isOverloaded() const { return m_isOverloaded; }
     void markAsOverloaded() { m_isOverloaded = true; }
@@ -350,10 +351,10 @@ public:
         , m_typeOfExpression(typeOfExp)
     {}
 
-    virtual void reset() {}
-    virtual int size() const { return m_functionSymbols.size(); }
-    virtual QString text(int index) const;
-    virtual int activeArgument(const QString &prefix) const;
+    void reset() QTC_OVERRIDE {}
+    int size() const QTC_OVERRIDE { return m_functionSymbols.size(); }
+    QString text(int index) const QTC_OVERRIDE;
+    int activeArgument(const QString &prefix) const QTC_OVERRIDE;
 
 private:
     QList<Function *> m_functionSymbols;
@@ -452,8 +453,8 @@ public:
         , m_replaceDotForArrow(static_cast<CppAssistProposalModel *>(model)->m_replaceDotForArrow)
     {}
 
-    bool isCorrective() const { return m_replaceDotForArrow; }
-    void makeCorrection(BaseTextEditor *editor);
+    bool isCorrective() const QTC_OVERRIDE { return m_replaceDotForArrow; }
+    void makeCorrection(BaseTextEditor *editor) QTC_OVERRIDE;
 
 private:
     bool m_replaceDotForArrow;
@@ -528,32 +529,32 @@ protected:
         return item;
     }
 
-    virtual void visit(const Identifier *name)
+    void visit(const Identifier *name)
     {
         _item = newCompletionItem(name);
         if (!_symbol->isScope() || _symbol->isFunction())
             _item->setDetail(overview.prettyType(_symbol->type(), name));
     }
 
-    virtual void visit(const TemplateNameId *name)
+    void visit(const TemplateNameId *name)
     {
         _item = newCompletionItem(name);
         _item->setText(QLatin1String(name->identifier()->chars()));
     }
 
-    virtual void visit(const DestructorNameId *name)
+    void visit(const DestructorNameId *name)
     { _item = newCompletionItem(name); }
 
-    virtual void visit(const OperatorNameId *name)
+    void visit(const OperatorNameId *name)
     {
         _item = newCompletionItem(name);
         _item->setDetail(overview.prettyType(_symbol->type(), name));
     }
 
-    virtual void visit(const ConversionNameId *name)
+    void visit(const ConversionNameId *name)
     { _item = newCompletionItem(name); }
 
-    virtual void visit(const QualifiedNameId *name)
+    void visit(const QualifiedNameId *name)
     { _item = newCompletionItem(name->name()); }
 };
 

src/plugins/cpptools/cppcompletionassist.h

@@ -44,6 +44,8 @@
 #include <texteditor/codeassist/iassistprocessor.h>
 #include <texteditor/snippets/snippetassistcollector.h>
 
+#include <utils/qtcoverride.h>
+
 #include <QStringList>
 #include <QVariant>
 
@@ -75,8 +77,8 @@ public:
         m_typeOfExpression->setExpandTemplates(true);
     }
 
-    virtual bool isSortable(const QString &prefix) const;
-    virtual TextEditor::IAssistProposalItem *proposalItem(int index) const;
+    bool isSortable(const QString &prefix) const QTC_OVERRIDE;
+    TextEditor::IAssistProposalItem *proposalItem(int index) const QTC_OVERRIDE;
 
     unsigned m_completionOperator;
     bool m_replaceDotForArrow;
@@ -88,11 +90,14 @@ class InternalCompletionAssistProvider : public CppCompletionAssistProvider
     Q_OBJECT
 
 public:
-    virtual TextEditor::IAssistProcessor *createProcessor() const;
+    TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
 
-    virtual TextEditor::IAssistInterface *createAssistInterface(
-            ProjectExplorer::Project *project, TextEditor::BaseTextEditor *editor,
-            QTextDocument *document, int position, TextEditor::AssistReason reason) const;
+    TextEditor::IAssistInterface *createAssistInterface(
+            ProjectExplorer::Project *project,
+            TextEditor::BaseTextEditor *editor,
+            QTextDocument *document,
+            int position,
+            TextEditor::AssistReason reason) const QTC_OVERRIDE;
 
 };
 
@@ -100,9 +105,9 @@ class CppCompletionAssistProcessor : public TextEditor::IAssistProcessor
 {
 public:
     CppCompletionAssistProcessor();
-    virtual ~CppCompletionAssistProcessor();
+    ~CppCompletionAssistProcessor();
 
-    virtual TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface);
+    TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface) QTC_OVERRIDE;
 
 private:
     TextEditor::IAssistProposal *createContentProposal();

src/plugins/cpptools/cppcompletionassistprovider.h

@@ -35,6 +35,8 @@
 #include <texteditor/codeassist/assistenums.h>
 #include <texteditor/codeassist/completionassistprovider.h>
 
+#include <utils/qtcoverride.h>
+
 QT_BEGIN_NAMESPACE
 class QTextDocument;
 QT_END_NAMESPACE
@@ -53,9 +55,9 @@ class CPPTOOLS_EXPORT CppCompletionAssistProvider : public TextEditor::Completio
     Q_OBJECT
 
 public:
-    virtual bool supportsEditor(const Core::Id &editorId) const;
-    virtual int activationCharSequenceLength() const;
-    virtual bool isActivationCharSequence(const QString &sequence) const;
+    bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
+    int activationCharSequenceLength() const QTC_OVERRIDE;
+    bool isActivationCharSequence(const QString &sequence) const QTC_OVERRIDE;
 
     virtual TextEditor::IAssistInterface *createAssistInterface(
             ProjectExplorer::Project *project, TextEditor::BaseTextEditor *editor,

src/plugins/fakevim/fakevimplugin.cpp

@@ -73,6 +73,7 @@
 
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcoverride.h>
 #include <utils/savedaction.h>
 #include <utils/stylehelper.h>
 
@@ -894,18 +895,18 @@ public:
         : m_provider(const_cast<FakeVimCompletionAssistProvider *>(provider))
     {}
 
-    virtual bool implicitlyApplies() const
+    bool implicitlyApplies() const QTC_OVERRIDE
     {
         return false;
     }
 
-    virtual bool prematurelyApplies(const QChar &c) const
+    bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE
     {
         m_provider->appendNeedle(c);
         return text() == m_provider->needle();
     }
 
-    virtual void applyContextualContent(BaseTextEditor *, int) const
+    void applyContextualContent(BaseTextEditor *, int) const QTC_OVERRIDE
     {
         QTC_ASSERT(m_provider->handler(), return);
         m_provider->handler()->handleReplay(text().mid(m_provider->needle().size()));
@@ -924,7 +925,7 @@ public:
         : BasicProposalItemListModel(items)
     {}
 
-    virtual bool supportsPrefixExpansion() const
+    bool supportsPrefixExpansion() const QTC_OVERRIDE
     {
         return false;
     }
@@ -937,7 +938,7 @@ public:
         : m_provider(static_cast<const FakeVimCompletionAssistProvider *>(provider))
     {}
 
-    IAssistProposal *perform(const IAssistInterface *interface)
+    IAssistProposal *perform(const IAssistInterface *interface) QTC_OVERRIDE
     {
         const QString &needle = m_provider->needle();
 
@@ -1728,7 +1729,7 @@ public:
         : QObject(parent), m_handler(handler)
     {}
 
-    virtual ~DeferredDeleter()
+    ~DeferredDeleter()
     {
         if (m_handler) {
             m_handler->disconnectFromEditor();

src/plugins/glsleditor/glslcompletionassist.cpp

@@ -46,7 +46,9 @@
 #include <texteditor/codeassist/genericproposal.h>
 #include <texteditor/codeassist/functionhintproposal.h>
 #include <cplusplus/ExpressionUnderCursor.h>
+
 #include <utils/faketooltip.h>
+#include <utils/qtcoverride.h>
 
 #include <QIcon>
 #include <QPainter>
@@ -149,10 +151,10 @@ public:
         , m_currentArg(-1)
     {}
 
-    virtual void reset() {}
-    virtual int size() const { return m_items.size(); }
-    virtual QString text(int index) const;
-    virtual int activeArgument(const QString &prefix) const;
+    void reset() QTC_OVERRIDE {}
+    int size() const QTC_OVERRIDE { return m_items.size(); }
+    QString text(int index) const QTC_OVERRIDE;
+    int activeArgument(const QString &prefix) const QTC_OVERRIDE;
 
 private:
     QVector<GLSL::Function *> m_items;

src/plugins/glsleditor/glslcompletionassist.h

@@ -37,6 +37,8 @@
 #include <texteditor/codeassist/defaultassistinterface.h>
 #include <texteditor/codeassist/ifunctionhintproposalmodel.h>
 
+#include <utils/qtcoverride.h>
+
 #include <QScopedPointer>
 #include <QIcon>
 
@@ -54,20 +56,20 @@ class GLSLCompletionAssistProvider : public TextEditor::CompletionAssistProvider
     Q_OBJECT
 
 public:
-    virtual bool supportsEditor(const Core::Id &editorId) const;
-    virtual TextEditor::IAssistProcessor *createProcessor() const;
+    bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
+    TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
 
-    virtual int activationCharSequenceLength() const;
-    virtual bool isActivationCharSequence(const QString &sequence) const;
+    int activationCharSequenceLength() const QTC_OVERRIDE;
+    bool isActivationCharSequence(const QString &sequence) const QTC_OVERRIDE;
 };
 
 class GLSLCompletionAssistProcessor : public TextEditor::IAssistProcessor
 {
 public:
     GLSLCompletionAssistProcessor();
-    virtual ~GLSLCompletionAssistProcessor();
+    ~GLSLCompletionAssistProcessor();
 
-    virtual TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface);
+    TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface) QTC_OVERRIDE;
 
 private:
     TextEditor::IAssistProposal *createContentProposal() const;

src/plugins/qmakeprojectmanager/profilecompletionassist.h

@@ -32,6 +32,8 @@
 
 #include <texteditor/codeassist/completionassistprovider.h>
 
+#include <utils/qtcoverride.h>
+
 #include <QStringList>
 
 namespace QmakeProjectManager {
@@ -43,10 +45,10 @@ class ProFileCompletionAssistProvider : public TextEditor::CompletionAssistProvi
 public:
     ProFileCompletionAssistProvider();
     void init();
-    virtual ~ProFileCompletionAssistProvider();
+    ~ProFileCompletionAssistProvider();
 
-    virtual bool supportsEditor(const Core::Id &editorId) const;
-    virtual TextEditor::IAssistProcessor *createProcessor() const;
+    bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
+    TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
     QStringList variables() const;
     QStringList functions() const;
 private:

src/plugins/qmljseditor/qmljscompletionassist.cpp

@@ -42,6 +42,7 @@
 #include <texteditor/completionsettings.h>
 
 #include <utils/qtcassert.h>
+#include <utils/qtcoverride.h>
 
 #include <qmljs/qmljsmodelmanagerinterface.h>
 #include <qmljs/parser/qmljsast_p.h>
@@ -136,7 +137,7 @@ public:
         , order(order)
     {}
 
-    virtual void operator()(const Value *base, const QString &name, const Value *value)
+    void operator()(const Value *base, const QString &name, const Value *value) QTC_OVERRIDE
     {
         Q_UNUSED(base)
         QVariant data;
@@ -164,7 +165,7 @@ public:
         , afterOn(afterOn)
     {}
 
-    virtual void operator ()(const Value *base, const QString &name, const Value *)
+    void operator ()(const Value *base, const QString &name, const Value *) QTC_OVERRIDE
     {
         const CppComponentValue *qmlBase = value_cast<CppComponentValue>(base);
 
@@ -246,34 +247,34 @@ private:
         (*_propertyProcessor)(_currentObject, name, value);
     }
 
-    virtual bool processProperty(const QString &name, const Value *value)
+    bool processProperty(const QString &name, const Value *value) QTC_OVERRIDE
     {
         process(name, value);
         return true;
     }
 
-    virtual bool processEnumerator(const QString &name, const Value *value)
+    bool processEnumerator(const QString &name, const Value *value) QTC_OVERRIDE
     {
         if (! _globalCompletion)
             process(name, value);
         return true;
     }
 
-    virtual bool processSignal(const QString &name, const Value *value)
+    bool processSignal(const QString &name, const Value *value) QTC_OVERRIDE
     {
         if (_globalCompletion)
             process(name, value);
         return true;
     }
 
-    virtual bool processSlot(const QString &name, const Value *value)
+    bool processSlot(const QString &name, const Value *value) QTC_OVERRIDE
     {
         if (_enumerateSlots)
             process(name, value);
         return true;
     }
 
-    virtual bool processGeneratedSlot(const QString &name, const Value *value)
+    bool processGeneratedSlot(const QString &name, const Value *value) QTC_OVERRIDE
     {
         if (_enumerateGeneratedSlots || (_currentObject && _currentObject->className().endsWith(QLatin1String("Keys")))) {
             // ### FIXME: add support for attached properties.
@@ -404,10 +405,10 @@ public:
         , m_isVariadic(isVariadic)
     {}
 
-    virtual void reset() {}
-    virtual int size() const { return 1; }
-    virtual QString text(int index) const;
-    virtual int activeArgument(const QString &prefix) const;
+    void reset() QTC_OVERRIDE {}
+    int size() const QTC_OVERRIDE { return 1; }
+    QString text(int index) const QTC_OVERRIDE;
+    int activeArgument(const QString &prefix) const QTC_OVERRIDE;
 
 private:
     QString m_functionName;

src/plugins/qmljseditor/qmljscompletionassist.h

@@ -39,6 +39,8 @@
 #include <texteditor/snippets/snippetassistcollector.h>
 #include <texteditor/codeassist/defaultassistinterface.h>
 
+#include <utils/qtcoverride.h>
+
 #include <QStringList>
 #include <QScopedPointer>
 #include <QVariant>
@@ -54,9 +56,9 @@ class QmlJSCompletionAssistInterface;
 class QmlJSAssistProposalItem : public TextEditor::BasicProposalItem
 {
 public:
-    virtual bool prematurelyApplies(const QChar &c) const;
-    virtual void applyContextualContent(TextEditor::BaseTextEditor *editor,
-                                        int basePosition) const;
+    bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE;
+    void applyContextualContent(TextEditor::BaseTextEditor *editor,
+                                int basePosition) const QTC_OVERRIDE;
 };
 
 
@@ -67,9 +69,9 @@ public:
         : TextEditor::BasicProposalItemListModel(items)
     {}
 
-    virtual void filter(const QString &prefix);
-    virtual void sort(const QString &prefix);
-    virtual bool keepPerfectMatch(TextEditor::AssistReason reason) const;
+    void filter(const QString &prefix) QTC_OVERRIDE;
+    void sort(const QString &prefix) QTC_OVERRIDE;
+    bool keepPerfectMatch(TextEditor::AssistReason reason) const QTC_OVERRIDE;
 };
 
 
@@ -78,12 +80,12 @@ class QmlJSCompletionAssistProvider : public TextEditor::CompletionAssistProvide
     Q_OBJECT
 
 public:
-    virtual bool supportsEditor(const Core::Id &editorId) const;
-    virtual TextEditor::IAssistProcessor *createProcessor() const;
+    bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
+    TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
 
-    virtual int activationCharSequenceLength() const;
-    virtual bool isActivationCharSequence(const QString &sequence) const;
-    virtual bool isContinuationChar(const QChar &c) const;
+    int activationCharSequenceLength() const QTC_OVERRIDE;
+    bool isActivationCharSequence(const QString &sequence) const QTC_OVERRIDE;
+    bool isContinuationChar(const QChar &c) const QTC_OVERRIDE;
 };
 
 
@@ -91,9 +93,9 @@ class QmlJSCompletionAssistProcessor : public TextEditor::IAssistProcessor
 {
 public:
     QmlJSCompletionAssistProcessor();
-    virtual ~QmlJSCompletionAssistProcessor();
+    ~QmlJSCompletionAssistProcessor();
 
-    virtual TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface);
+    TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface) QTC_OVERRIDE;
 
 private:
     TextEditor::IAssistProposal *createContentProposal() const;

src/plugins/qmljseditor/qmljsquickfixassist.h

@@ -38,6 +38,8 @@
 #include <texteditor/codeassist/quickfixassistprovider.h>
 #include <texteditor/codeassist/quickfixassistprocessor.h>
 
+#include <utils/qtcoverride.h>
+
 namespace QmlJSEditor {
 namespace Internal {
 
@@ -45,7 +47,7 @@ class QmlJSQuickFixAssistInterface : public TextEditor::DefaultAssistInterface
 {
 public:
     QmlJSQuickFixAssistInterface(QmlJSTextEditorWidget *editor, TextEditor::AssistReason reason);
-    virtual ~QmlJSQuickFixAssistInterface();
+    ~QmlJSQuickFixAssistInterface();
 
     const QmlJSTools::SemanticInfo &semanticInfo() const;
     QmlJSTools::QmlJSRefactoringFilePtr currentFile() const;
@@ -60,9 +62,9 @@ class QmlJSQuickFixProcessor : public TextEditor::QuickFixAssistProcessor
 {
 public:
     QmlJSQuickFixProcessor(const TextEditor::IAssistProvider *provider);
-    virtual ~QmlJSQuickFixProcessor();
+    ~QmlJSQuickFixProcessor();
 
-    virtual const TextEditor::IAssistProvider *provider() const;
+    const TextEditor::IAssistProvider *provider() const QTC_OVERRIDE;
 
 private:
     const TextEditor::IAssistProvider *m_provider;
@@ -73,13 +75,13 @@ class QmlJSQuickFixAssistProvider : public TextEditor::QuickFixAssistProvider
 {
 public:
     QmlJSQuickFixAssistProvider();
-    virtual ~QmlJSQuickFixAssistProvider();
+    ~QmlJSQuickFixAssistProvider();
 
-    virtual bool isAsynchronous() const;
-    virtual bool supportsEditor(const Core::Id &editorId) const;
-    virtual TextEditor::IAssistProcessor *createProcessor() const;
+    bool isAsynchronous() const QTC_OVERRIDE;
+    bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
+    TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
 
-    virtual QList<TextEditor::QuickFixFactory *> quickFixFactories() const;
+    QList<TextEditor::QuickFixFactory *> quickFixFactories() const QTC_OVERRIDE;
 };
 
 } // Internal

src/plugins/texteditor/circularclipboardassist.cpp

@@ -39,6 +39,8 @@
 
 #include <coreplugin/coreconstants.h>
 
+#include <utils/qtcoverride.h>
+
 #include <QApplication>
 #include <QClipboard>
 
@@ -62,7 +64,7 @@ public:
         setText(text);
     }
 
-    virtual void apply(BaseTextEditor *editor, int /*basePosition*/) const
+    void apply(BaseTextEditor *editor, int /*basePosition*/) const QTC_OVERRIDE
     {
         BaseTextEditorWidget *editwidget = editor->editorWidget();
 
@@ -87,7 +89,7 @@ private:
 class ClipboardAssistProcessor: public IAssistProcessor
 {
 public:
-    IAssistProposal *perform(const IAssistInterface *interface)
+    IAssistProposal *perform(const IAssistInterface *interface) QTC_OVERRIDE
     {
         if (!interface)
             return 0;

src/plugins/texteditor/circularclipboardassist.h

@@ -32,6 +32,8 @@
 
 #include "codeassist/iassistprovider.h"
 
+#include <utils/qtcoverride.h>
+
 namespace TextEditor {
 namespace Internal {
 
@@ -39,8 +41,8 @@ class ClipboardAssistProvider: public IAssistProvider
 {
 public:
     bool isAsynchronous() const;
-    virtual bool supportsEditor(const Core::Id &editorId) const;
-    virtual IAssistProcessor *createProcessor() const;
+    bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
+    IAssistProcessor *createProcessor() const QTC_OVERRIDE;
 };
 
 } // namespace Internal

src/plugins/texteditor/codeassist/basicproposalitem.h

@@ -34,6 +34,8 @@
 
 #include <texteditor/texteditor_global.h>
 
+#include <utils/qtcoverride.h>
+
 #include <QVariant>
 #include <QIcon>
 
@@ -43,13 +45,13 @@ class TEXTEDITOR_EXPORT BasicProposalItem : public IAssistProposalItem
 {
 public:
     BasicProposalItem();
-    virtual ~BasicProposalItem();
+    ~BasicProposalItem();
 
     void setIcon(const QIcon &icon);
     const QIcon &icon() const;
 
     void setText(const QString &text);
-    virtual QString text() const;
+    QString text() const QTC_OVERRIDE;
 
     void setDetail(const QString &detail);
     const QString &detail() const;
@@ -60,9 +62,9 @@ public:
     int order() const;
     void setOrder(int order);
 
-    virtual bool implicitlyApplies() const;
-    virtual bool prematurelyApplies(const QChar &c) const;
-    virtual void apply(BaseTextEditor *editor, int basePosition) const;
+    bool implicitlyApplies() const QTC_OVERRIDE;
+    bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE;
+    void apply(BaseTextEditor *editor, int basePosition) const QTC_OVERRIDE;
     virtual void applyContextualContent(BaseTextEditor *editor, int basePosition) const;
     virtual void applySnippet(BaseTextEditor *editor, int basePosition) const;
     virtual void applyQuickFix(BaseTextEditor *editor, int basePosition) const;

src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h

@@ -34,6 +34,8 @@
 
 #include <texteditor/texteditor_global.h>
 
+#include <utils/qtcoverride.h>
+
 #include <QList>
 #include <QHash>
 #include <QPair>
@@ -47,22 +49,22 @@ class TEXTEDITOR_EXPORT BasicProposalItemListModel : public IGenericProposalMode
 public:
     BasicProposalItemListModel();
     BasicProposalItemListModel(const QList<BasicProposalItem *> &items);
-    virtual ~BasicProposalItemListModel();
+    ~BasicProposalItemListModel();
 
-    virtual void reset();
-    virtual int size() const;
-    virtual QString text(int index) const;
-    virtual QIcon icon(int index) const;
-    virtual QString detail(int index) const;
-    virtual int persistentId(int index) const;
-    virtual void removeDuplicates();
-    virtual void filter(const QString &prefix);
-    virtual bool isSortable(const QString &prefix) const;
-    virtual void sort(const QString &prefix);
-    virtual bool supportsPrefixExpansion() const;
-    virtual QString proposalPrefix() const;
-    virtual bool keepPerfectMatch(AssistReason reason) const;
-    virtual IAssistProposalItem *proposalItem(int index) const;
+    void reset() QTC_OVERRIDE;
+    int size() const QTC_OVERRIDE;
+    QString text(int index) const QTC_OVERRIDE;
+    QIcon icon(int index) const QTC_OVERRIDE;
+    QString detail(int index) const QTC_OVERRIDE;
+    int persistentId(int index) const QTC_OVERRIDE;
+    void removeDuplicates() QTC_OVERRIDE;
+    void filter(const QString &prefix) QTC_OVERRIDE;
+    bool isSortable(const QString &prefix) const QTC_OVERRIDE;
+    void sort(const QString &prefix) QTC_OVERRIDE;
+    bool supportsPrefixExpansion() const QTC_OVERRIDE;
+    QString proposalPrefix() const QTC_OVERRIDE;
+    bool keepPerfectMatch(AssistReason reason) const QTC_OVERRIDE;
+    IAssistProposalItem *proposalItem(int index) const QTC_OVERRIDE;
 
     void loadContent(const QList<BasicProposalItem *> &items);
     void setSortingAllowed(bool isAllowed);

src/plugins/texteditor/codeassist/completionassistprovider.h

@@ -32,6 +32,8 @@
 
 #include "iassistprovider.h"
 
+#include <utils/qtcoverride.h>
+
 namespace TextEditor {
 
 class TEXTEDITOR_EXPORT CompletionAssistProvider : public IAssistProvider
@@ -40,9 +42,9 @@ class TEXTEDITOR_EXPORT CompletionAssistProvider : public IAssistProvider
 
 public:
     CompletionAssistProvider();
-    virtual ~CompletionAssistProvider();
+    ~CompletionAssistProvider();
 
-    virtual bool isAsynchronous() const;
+    bool isAsynchronous() const QTC_OVERRIDE;
     virtual int activationCharSequenceLength() const;
     virtual bool isActivationCharSequence(const QString &sequence) const;
     virtual bool isContinuationChar(const QChar &c) const;

src/plugins/texteditor/codeassist/defaultassistinterface.h

@@ -32,6 +32,8 @@
 
 #include "iassistinterface.h"
 
+#include <utils/qtcoverride.h>
+
 namespace TextEditor {
 
 class TEXTEDITOR_EXPORT DefaultAssistInterface : public IAssistInterface
@@ -41,16 +43,16 @@ public:
                            int position,
                            const QString &fileName,
                            AssistReason reason);
-    virtual ~DefaultAssistInterface();
+    ~DefaultAssistInterface();
 
-    virtual int position() const { return m_position; }
-    virtual QChar characterAt(int position) const;
-    virtual QString textAt(int position, int length) const;
-    virtual QString fileName() const { return m_fileName; }
-    virtual QTextDocument *textDocument() const { return m_textDocument; }
-    virtual void prepareForAsyncUse();
-    virtual void recreateTextDocument();
-    virtual AssistReason reason() const;
+    int position() const QTC_OVERRIDE { return m_position; }
+    QChar characterAt(int position) const QTC_OVERRIDE;
+    QString textAt(int position, int length) const QTC_OVERRIDE;
+    QString fileName() const QTC_OVERRIDE { return m_fileName; }
+    QTextDocument *textDocument() const QTC_OVERRIDE { return m_textDocument; }
+    void prepareForAsyncUse() QTC_OVERRIDE;
+    void recreateTextDocument() QTC_OVERRIDE;
+    AssistReason reason() const QTC_OVERRIDE;
 
 private:
     QTextDocument *m_textDocument;

src/plugins/texteditor/codeassist/functionhintproposal.h

@@ -32,6 +32,8 @@
 
 #include "iassistproposal.h"
 
+#include <utils/qtcoverride.h>
+
 namespace TextEditor {
 
 class IFunctionHintProposalModel;
@@ -40,14 +42,14 @@ class TEXTEDITOR_EXPORT FunctionHintProposal : public IAssistProposal
 {
 public:
     FunctionHintProposal(int cursorPos, IFunctionHintProposalModel *model);
-    virtual ~FunctionHintProposal();
+    ~FunctionHintProposal();
 
-    bool isFragile() const;
-    int basePosition() const;
-    bool isCorrective() const;
-    void makeCorrection(BaseTextEditor *editor);
-    IAssistProposalModel *model() const;
-    IAssistProposalWidget *createWidget() const;
+    bool isFragile() const QTC_OVERRIDE;
+    int basePosition() const QTC_OVERRIDE;
+    bool isCorrective() const QTC_OVERRIDE;
+    void makeCorrection(BaseTextEditor *editor) QTC_OVERRIDE;
+    IAssistProposalModel *model() const QTC_OVERRIDE;
+    IAssistProposalWidget *createWidget() const QTC_OVERRIDE;
 
 private:
     int m_basePosition;

src/plugins/texteditor/codeassist/functionhintproposalwidget.h

@@ -32,6 +32,8 @@
 
 #include "iassistproposalwidget.h"
 
+#include <utils/qtcoverride.h>
+
 namespace TextEditor {
 
 struct FunctionHintProposalWidgetPrivate;
@@ -42,22 +44,22 @@ class TEXTEDITOR_EXPORT FunctionHintProposalWidget : public IAssistProposalWidge
 
 public:
     FunctionHintProposalWidget();
-    virtual ~FunctionHintProposalWidget();
+    ~FunctionHintProposalWidget();
 
-    virtual void setAssistant(CodeAssistant *assistant);
-    virtual void setReason(AssistReason reason);
-    virtual void setKind(AssistKind kind);
-    virtual void setUnderlyingWidget(const QWidget *underlyingWidget);
-    virtual void setModel(IAssistProposalModel *model);
-    virtual void setDisplayRect(const QRect &rect);
-    virtual void setIsSynchronized(bool isSync);
+    void setAssistant(CodeAssistant *assistant) QTC_OVERRIDE;
+    void setReason(AssistReason reason) QTC_OVERRIDE;
+    void setKind(AssistKind kind) QTC_OVERRIDE;
+    void setUnderlyingWidget(const QWidget *underlyingWidget) QTC_OVERRIDE;
+    void setModel(IAssistProposalModel *model) QTC_OVERRIDE;
+    void setDisplayRect(const QRect &rect) QTC_OVERRIDE;
+    void setIsSynchronized(bool isSync) QTC_OVERRIDE;
 
-    virtual void showProposal(const QString &prefix);
-    virtual void updateProposal(const QString &prefix);
-    virtual void closeProposal();
+    void showProposal(const QString &prefix) QTC_OVERRIDE;
+    void updateProposal(const QString &prefix) QTC_OVERRIDE;
+    void closeProposal() QTC_OVERRIDE;
 
 protected:
-    virtual bool eventFilter(QObject *o, QEvent *e);
+    bool eventFilter(QObject *o, QEvent *e) QTC_OVERRIDE;
 
 private slots:
     void nextPage();

src/plugins/texteditor/codeassist/genericproposal.h

@@ -32,6 +32,8 @@
 
 #include "iassistproposal.h"
 
+#include <utils/qtcoverride.h>
+
 namespace TextEditor {
 
 class IGenericProposalModel;
@@ -42,12 +44,12 @@ public:
     GenericProposal(int cursorPos, IGenericProposalModel *model);
     ~GenericProposal();
 
-    bool isFragile() const;
-    int basePosition() const;
-    bool isCorrective() const;
-    void makeCorrection(BaseTextEditor *editor);
-    IAssistProposalModel *model() const;
-    IAssistProposalWidget *createWidget() const;
+    bool isFragile() const QTC_OVERRIDE;
+    int basePosition() const QTC_OVERRIDE;
+    bool isCorrective() const QTC_OVERRIDE;
+    void makeCorrection(BaseTextEditor *editor) QTC_OVERRIDE;
+    IAssistProposalModel *model() const QTC_OVERRIDE;
+    IAssistProposalWidget *createWidget() const QTC_OVERRIDE;
 
 protected:
     void moveBasePosition(int length);

src/plugins/texteditor/codeassist/genericproposalwidget.h

@@ -34,6 +34,8 @@
 
 #include <texteditor/texteditor_global.h>
 
+#include <utils/qtcoverride.h>
+
 namespace TextEditor {
 
 class GenericProposalWidgetPrivate;
@@ -48,17 +50,17 @@ public:
     GenericProposalWidget();
     ~GenericProposalWidget();
 
-    void setAssistant(CodeAssistant *assistant);
-    void setReason(AssistReason reason);
-    void setKind(AssistKind kind);
-    void setUnderlyingWidget(const QWidget *underlyingWidget);
-    void setModel(IAssistProposalModel *model);
-    void setDisplayRect(const QRect &rect);
-    void setIsSynchronized(bool isSync);
+    void setAssistant(CodeAssistant *assistant) QTC_OVERRIDE;
+    void setReason(AssistReason reason) QTC_OVERRIDE;
+    void setKind(AssistKind kind) QTC_OVERRIDE;
+    void setUnderlyingWidget(const QWidget *underlyingWidget) QTC_OVERRIDE;
+    void setModel(IAssistProposalModel *model) QTC_OVERRIDE;
+    void setDisplayRect(const QRect &rect) QTC_OVERRIDE;
+    void setIsSynchronized(bool isSync) QTC_OVERRIDE;
 
-    void showProposal(const QString &prefix);
-    void updateProposal(const QString &prefix);
-    void closeProposal();
+    void showProposal(const QString &prefix) QTC_OVERRIDE;
+    void updateProposal(const QString &prefix) QTC_OVERRIDE;
+    void closeProposal() QTC_OVERRIDE;
 
 private:
     bool updateAndCheck(const QString &prefix);

src/plugins/texteditor/codeassist/ifunctionhintproposalmodel.h

@@ -40,7 +40,7 @@ class TEXTEDITOR_EXPORT IFunctionHintProposalModel : public IAssistProposalModel
 {
 public:
     IFunctionHintProposalModel();
-    virtual ~IFunctionHintProposalModel();
+    ~IFunctionHintProposalModel();
 
     virtual int activeArgument(const QString &prefix) const = 0;
 };

src/plugins/texteditor/codeassist/igenericproposalmodel.h

@@ -45,7 +45,7 @@ class TEXTEDITOR_EXPORT IGenericProposalModel : public IAssistProposalModel
 {
 public:
     IGenericProposalModel();
-    virtual ~IGenericProposalModel();
+    ~IGenericProposalModel();
 
     virtual QIcon icon(int index) const = 0;
     virtual QString detail(int index) const = 0;

src/plugins/texteditor/codeassist/keywordscompletionassist.h

@@ -34,6 +34,8 @@
 #include "basicproposalitem.h"
 #include "ifunctionhintproposalmodel.h"
 
+#include <utils/qtcoverride.h>
+
 namespace TextEditor {
 
 class TEXTEDITOR_EXPORT Keywords
@@ -58,11 +60,11 @@ class TEXTEDITOR_EXPORT KeywordsAssistProposalItem : public TextEditor::BasicPro
 {
 public:
     KeywordsAssistProposalItem(Keywords keywords);
-    virtual ~KeywordsAssistProposalItem();
+    ~KeywordsAssistProposalItem();
 
-    virtual bool prematurelyApplies(const QChar &c) const;
-    virtual void applyContextualContent(TextEditor::BaseTextEditor *editor,
-                                        int basePosition) const;
+    bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE;
+    void applyContextualContent(TextEditor::BaseTextEditor *editor,
+                                int basePosition) const QTC_OVERRIDE;
 private:
     Keywords m_keywords;
 };
@@ -71,12 +73,12 @@ class TEXTEDITOR_EXPORT KeywordsFunctionHintModel : public TextEditor::IFunction
 {
 public:
     KeywordsFunctionHintModel(const QStringList &functionSymbols);
-    virtual ~KeywordsFunctionHintModel();
+    ~KeywordsFunctionHintModel();
 
-    virtual void reset();
-    virtual int size() const;
-    virtual QString text(int index) const;
-    virtual int activeArgument(const QString &prefix) const;
+    void reset() QTC_OVERRIDE;
+    int size() const QTC_OVERRIDE;
+    QString text(int index) const QTC_OVERRIDE;
+    int activeArgument(const QString &prefix) const QTC_OVERRIDE;
 
 private:
     QStringList m_functionSymbols;
@@ -86,10 +88,10 @@ class TEXTEDITOR_EXPORT KeywordsCompletionAssistProcessor : public TextEditor::I
 {
 public:
     KeywordsCompletionAssistProcessor(Keywords keywords);
-    virtual ~KeywordsCompletionAssistProcessor();
+    ~KeywordsCompletionAssistProcessor();
 
-    virtual TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface);
-    virtual QChar startOfCommentChar() const;
+    TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface) QTC_OVERRIDE;
+    QChar startOfCommentChar() const;
 
 private:
     bool acceptsIdleEditor();

src/plugins/texteditor/codeassist/quickfixassistprocessor.h

@@ -32,17 +32,19 @@
 
 #include "iassistprocessor.h"
 
+#include <utils/qtcoverride.h>
+
 namespace TextEditor {
 
 class TEXTEDITOR_EXPORT QuickFixAssistProcessor : public IAssistProcessor
 {
 public:
     QuickFixAssistProcessor();
-    virtual ~QuickFixAssistProcessor();
+    ~QuickFixAssistProcessor();
 
     virtual const IAssistProvider *provider() const = 0;
 
-    virtual IAssistProposal *perform(const IAssistInterface *interface);
+    IAssistProposal *perform(const IAssistInterface *interface) QTC_OVERRIDE;
 };
 
 } // TextEditor

src/plugins/texteditor/codeassist/quickfixassistprovider.h

@@ -44,7 +44,7 @@ class TEXTEDITOR_EXPORT QuickFixAssistProvider : public IAssistProvider
 
 public:
     QuickFixAssistProvider();
-    virtual ~QuickFixAssistProvider();
+    ~QuickFixAssistProvider();
 
     virtual QList<QuickFixFactory *> quickFixFactories() const;
 };