diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index b07185cfb3d..e1a12e36ff9 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -79,14 +79,14 @@ public:
 
     TextEditor::AssistInterface *createAssistInterface(
             TextEditor::AssistKind kind,
-            TextEditor::AssistReason reason) const Q_DECL_OVERRIDE;
+            TextEditor::AssistReason reason) const override;
 
     FollowSymbolUnderCursor *followSymbolUnderCursorDelegate(); // exposed for tests
 
 public slots:
-    void paste() Q_DECL_OVERRIDE;
-    void cut() Q_DECL_OVERRIDE;
-    void selectAll() Q_DECL_OVERRIDE;
+    void paste() override;
+    void cut() override;
+    void selectAll() override;
 
     void switchDeclarationDefinition(bool inNextSplit);
     void showPreProcessorWidget();
@@ -96,18 +96,18 @@ public slots:
     void renameUsages(const QString &replacement = QString());
 
 protected:
-    bool event(QEvent *e) Q_DECL_OVERRIDE;
-    void contextMenuEvent(QContextMenuEvent *) Q_DECL_OVERRIDE;
-    void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE;
+    bool event(QEvent *e) override;
+    void contextMenuEvent(QContextMenuEvent *) override;
+    void keyPressEvent(QKeyEvent *e) override;
     bool handleStringSplitting(QKeyEvent *e) const;
 
     Link findLinkAt(const QTextCursor &, bool resolveTarget = true,
-                    bool inNextSplit = false) Q_DECL_OVERRIDE;
+                    bool inNextSplit = false) override;
 
-    void onRefactorMarkerClicked(const TextEditor::RefactorMarker &marker) Q_DECL_OVERRIDE;
+    void onRefactorMarkerClicked(const TextEditor::RefactorMarker &marker) override;
 
 protected slots:
-    void slotCodeStyleSettingsChanged(const QVariant &) Q_DECL_OVERRIDE;
+    void slotCodeStyleSettingsChanged(const QVariant &) override;
 
 private slots:
     void updateFunctionDeclDefLink();
@@ -131,8 +131,8 @@ private slots:
     void processKeyNormally(QKeyEvent *e);
 
 private:
-    void finalizeInitialization() Q_DECL_OVERRIDE;
-    void finalizeInitializationAfterDuplication(TextEditorWidget *other) Q_DECL_OVERRIDE;
+    void finalizeInitialization() override;
+    void finalizeInitializationAfterDuplication(TextEditorWidget *other) override;
 
     unsigned documentRevision() const;
 
diff --git a/src/plugins/cppeditor/cppeditorplugin.h b/src/plugins/cppeditor/cppeditorplugin.h
index a2773621892..8745dc9bb4c 100644
--- a/src/plugins/cppeditor/cppeditorplugin.h
+++ b/src/plugins/cppeditor/cppeditorplugin.h
@@ -86,7 +86,7 @@ private slots:
 
 #ifdef WITH_TESTS
 private:
-    QList<QObject *> createTestObjects() const Q_DECL_OVERRIDE;
+    QList<QObject *> createTestObjects() const override;
 
 private slots:
     // The following tests expect that no projects are loaded on start-up.
diff --git a/src/plugins/cppeditor/cppquickfixassistant.h b/src/plugins/cppeditor/cppquickfixassistant.h
index 967b6825cd0..22eee7c35b6 100644
--- a/src/plugins/cppeditor/cppquickfixassistant.h
+++ b/src/plugins/cppeditor/cppquickfixassistant.h
@@ -77,11 +77,11 @@ private:
 class CppQuickFixAssistProvider : public TextEditor::QuickFixAssistProvider
 {
 public:
-    IAssistProvider::RunType runType() const Q_DECL_OVERRIDE;
-    bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
-    TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
+    IAssistProvider::RunType runType() const override;
+    bool supportsEditor(Core::Id editorId) const override;
+    TextEditor::IAssistProcessor *createProcessor() const override;
 
-    QList<TextEditor::QuickFixFactory *> quickFixFactories() const Q_DECL_OVERRIDE;
+    QList<TextEditor::QuickFixFactory *> quickFixFactories() const override;
 };
 
 } // Internal
diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index 6a94db77651..7d408ebf9a3 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -4017,7 +4017,7 @@ public:
                 : QuickFixFactory::tr("Convert to Pointer"));
     }
 
-    void perform() Q_DECL_OVERRIDE
+    void perform() override
     {
         ChangeSet changes;
 
diff --git a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
index d91d20ee455..99e624b436f 100644
--- a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
+++ b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
@@ -89,7 +89,7 @@ protected:
         return GenericProposalWidget::eventFilter(o, e);
     }
 
-    void showProposal(const QString &prefix) Q_DECL_OVERRIDE
+    void showProposal(const QString &prefix) override
     {
         GenericProposalModel *proposalModel = model();
         if (proposalModel && proposalModel->size() == 1) {
@@ -112,9 +112,9 @@ public:
         , m_openInSplit(openInSplit)
     {}
 
-    bool isFragile() const Q_DECL_OVERRIDE { return true; }
+    bool isFragile() const override { return true; }
 
-    IAssistProposalWidget *createWidget() const Q_DECL_OVERRIDE
+    IAssistProposalWidget *createWidget() const override
     { return new VirtualFunctionProposalWidget(m_openInSplit); }
 
 private:
@@ -128,7 +128,7 @@ public:
         : m_params(params)
     {}
 
-    IAssistProposal *immediateProposal(const AssistInterface *) Q_DECL_OVERRIDE
+    IAssistProposal *immediateProposal(const AssistInterface *) override
     {
         QTC_ASSERT(m_params.function, return 0);
 
@@ -144,7 +144,7 @@ public:
         return new VirtualFunctionProposal(m_params.cursorPosition, items, m_params.openInNextSplit);
     }
 
-    IAssistProposal *perform(const AssistInterface *assistInterface) Q_DECL_OVERRIDE
+    IAssistProposal *perform(const AssistInterface *assistInterface) override
     {
         delete assistInterface;
 
diff --git a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h
index 7a5cf668aaf..69794df10ba 100644
--- a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h
+++ b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h
@@ -63,9 +63,9 @@ public:
     Parameters params() const { return m_params; }
     void clearParams() { m_params = Parameters(); }
 
-    IAssistProvider::RunType runType() const Q_DECL_OVERRIDE;
-    bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
-    TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
+    IAssistProvider::RunType runType() const override;
+    bool supportsEditor(Core::Id editorId) const override;
+    TextEditor::IAssistProcessor *createProcessor() const override;
 
 private:
     Parameters m_params;
diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
index 406887e1a7f..86eced81623 100644
--- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
+++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
@@ -132,7 +132,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) Q_DECL_OVERRIDE
+    bool configure(const VirtualFunctionAssistProvider::Parameters &params) override
     {
         VirtualFunctionAssistProvider::configure(params);