diff --git a/applets/appmenu/lib/appmenuapplet.h b/applets/appmenu/lib/appmenuapplet.h
index 0633c322e..8613b3b6d 100644
--- a/applets/appmenu/lib/appmenuapplet.h
+++ b/applets/appmenu/lib/appmenuapplet.h
@@ -74,7 +74,7 @@ public slots:
     void trigger(QQuickItem *ctx, int idx);
 
 protected:
-    bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
+    bool eventFilter(QObject *watched, QEvent *event) override;
 
 private:
     QMenu *createMenu(int idx) const;
diff --git a/applets/appmenu/plugin/appmenumodel.h b/applets/appmenu/plugin/appmenumodel.h
index 8d7ef923d..139439673 100644
--- a/applets/appmenu/plugin/appmenumodel.h
+++ b/applets/appmenu/plugin/appmenumodel.h
@@ -46,9 +46,9 @@ public:
         ActionRole
     };
 
-    QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
+    QVariant data(const QModelIndex &index, int role) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QHash<int, QByteArray> roleNames() const override;
 
     void updateApplicationMenu(const QString &serviceName, const QString &menuObjectPath);
 
diff --git a/applets/notifications/lib/notificationsapplet.h b/applets/notifications/lib/notificationsapplet.h
index 53b824f4b..43700faa8 100644
--- a/applets/notifications/lib/notificationsapplet.h
+++ b/applets/notifications/lib/notificationsapplet.h
@@ -46,7 +46,7 @@ public:
     QRect availableScreenRect() const;
 
 public Q_SLOTS:
-    void init() Q_DECL_OVERRIDE;
+    void init() override;
     void onScreenPositionChanged(uint position);
     void onAppletLocationChanged();
 
diff --git a/applets/systemtray/systemtray.h b/applets/systemtray/systemtray.h
index c670c91db..cccdf53b9 100644
--- a/applets/systemtray/systemtray.h
+++ b/applets/systemtray/systemtray.h
@@ -42,7 +42,7 @@ public:
 
     void init() override;
 
-    void restoreContents(KConfigGroup &group) Q_DECL_OVERRIDE;
+    void restoreContents(KConfigGroup &group) override;
     void restorePlasmoids();
 
     QStringList defaultPlasmoids() const;
diff --git a/applets/systemtray/tests/statusnotifier/pumpjob.h b/applets/systemtray/tests/statusnotifier/pumpjob.h
index f767952a8..15b87178e 100644
--- a/applets/systemtray/tests/statusnotifier/pumpjob.h
+++ b/applets/systemtray/tests/statusnotifier/pumpjob.h
@@ -34,10 +34,10 @@ class PumpJob : public KIO::Job
         PumpJob(int interval = 0);
         virtual ~PumpJob();
 
-        void start() Q_DECL_OVERRIDE;
-        bool doKill() Q_DECL_OVERRIDE;
-        bool doSuspend() Q_DECL_OVERRIDE;
-        bool doResume() Q_DECL_OVERRIDE;
+        void start() override;
+        bool doKill() override;
+        bool doSuspend() override;
+        bool doResume() override;
 
         virtual bool isSuspended() const;
 
diff --git a/components/shellprivate/widgetexplorer/widgetexplorer.h b/components/shellprivate/widgetexplorer/widgetexplorer.h
index b58820967..98987dce7 100644
--- a/components/shellprivate/widgetexplorer/widgetexplorer.h
+++ b/components/shellprivate/widgetexplorer/widgetexplorer.h
@@ -143,8 +143,8 @@ public:
      */
     Q_INVOKABLE void uninstall(const QString &pluginName);
 
-    void classBegin() Q_DECL_OVERRIDE;
-    void componentComplete() Q_DECL_OVERRIDE;
+    void classBegin() override;
+    void componentComplete() override;
 
 Q_SIGNALS:
     void widgetsMenuActionsChanged();
diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h
index bfe55e4a0..d9414a505 100644
--- a/ksmserver/shutdowndlg.h
+++ b/ksmserver/shutdowndlg.h
@@ -82,7 +82,7 @@ Q_SIGNALS:
     void rejected();
 
 protected:
-    void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE;
+    void resizeEvent(QResizeEvent *e) override;
     bool event(QEvent *e) override;
 
 private:
diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp
index 8854c9798..dfa879dcd 100644
--- a/ksmserver/startup.cpp
+++ b/ksmserver/startup.cpp
@@ -97,7 +97,7 @@ static QTime t;
 class NotificationThread : public QThread
 {
     Q_OBJECT
-    void run() Q_DECL_OVERRIDE {
+    void run() override {
         // We cannot parent to the thread itself so let's create
         // a QObject on the stack and parent everythign to it
         QObject parent;
diff --git a/libtaskmanager/abstracttasksproxymodeliface.h b/libtaskmanager/abstracttasksproxymodeliface.h
index 13c5f64ae..d887406ed 100644
--- a/libtaskmanager/abstracttasksproxymodeliface.h
+++ b/libtaskmanager/abstracttasksproxymodeliface.h
@@ -51,7 +51,7 @@ public:
      *
      * @param index An index in this tasks model.
      **/
-    void requestActivate(const QModelIndex &index) Q_DECL_OVERRIDE;
+    void requestActivate(const QModelIndex &index) override;
 
     /**
      * Request an additional instance of the application backing the task
@@ -59,7 +59,7 @@ public:
      *
      * @param index An index in this tasks model.
      **/
-    void requestNewInstance(const QModelIndex &index) Q_DECL_OVERRIDE;
+    void requestNewInstance(const QModelIndex &index) override;
 
     /**
      * Requests to open the given URLs with the application backing the task
@@ -68,14 +68,14 @@ public:
      * @param index An index in this tasks model.
      * @param urls The URLs to be passed to the application.
      **/
-    virtual void requestOpenUrls(const QModelIndex &index, const QList<QUrl> &urls) Q_DECL_OVERRIDE;
+    virtual void requestOpenUrls(const QModelIndex &index, const QList<QUrl> &urls) override;
 
     /**
      * Request the task at the given index be closed.
      *
      * @param index An index in this tasks model.
      **/
-    void requestClose(const QModelIndex &index) Q_DECL_OVERRIDE;
+    void requestClose(const QModelIndex &index) override;
 
     /**
      * Request starting an interactive move for the task at the given index.
@@ -85,7 +85,7 @@ public:
      *
      * @param index An index in this tasks model.
      **/
-    void requestMove(const QModelIndex &index) Q_DECL_OVERRIDE;
+    void requestMove(const QModelIndex &index) override;
 
     /**
      * Request starting an interactive resize for the task at the given index.
@@ -95,7 +95,7 @@ public:
      *
      * @param index An index in this tasks model.
      **/
-    void requestResize(const QModelIndex &index) Q_DECL_OVERRIDE;
+    void requestResize(const QModelIndex &index) override;
 
     /**
      * Request toggling the minimized state of the task at the given index.
@@ -105,7 +105,7 @@ public:
      *
      * @param index An index in this tasks model.
      **/
-    void requestToggleMinimized(const QModelIndex &index) Q_DECL_OVERRIDE;
+    void requestToggleMinimized(const QModelIndex &index) override;
 
     /**
      * Request toggling the maximized state of the task at the given index.
@@ -115,7 +115,7 @@ public:
      *
      * @param index An index in this tasks model.
      **/
-    void requestToggleMaximized(const QModelIndex &index) Q_DECL_OVERRIDE;
+    void requestToggleMaximized(const QModelIndex &index) override;
 
     /**
      * Request toggling the keep-above state of the task at the given index.
@@ -125,7 +125,7 @@ public:
      *
      * @param index An index in this tasks model.
      **/
-    void requestToggleKeepAbove(const QModelIndex &index) Q_DECL_OVERRIDE;
+    void requestToggleKeepAbove(const QModelIndex &index) override;
 
     /**
      * Request toggling the keep-below state of the task at the given index.
@@ -135,7 +135,7 @@ public:
      *
      * @param index An index in this tasks model.
      **/
-    void requestToggleKeepBelow(const QModelIndex &index) Q_DECL_OVERRIDE;
+    void requestToggleKeepBelow(const QModelIndex &index) override;
 
     /**
      * Request toggling the fullscreen state of the task at the given index.
@@ -145,7 +145,7 @@ public:
      *
      * @param index An index in this tasks model.
      **/
-    void requestToggleFullScreen(const QModelIndex &index) Q_DECL_OVERRIDE;
+    void requestToggleFullScreen(const QModelIndex &index) override;
 
     /**
      * Request toggling the shaded state of the task at the given index.
@@ -155,7 +155,7 @@ public:
      *
      * @param index An index in this tasks model.
      **/
-    void requestToggleShaded(const QModelIndex &index) Q_DECL_OVERRIDE;
+    void requestToggleShaded(const QModelIndex &index) override;
 
     /**
      * Request moving the task at the given index to the specified virtual
@@ -167,7 +167,7 @@ public:
      * @param index An index in this tasks model.
      * @param desktop A virtual desktop number.
      **/
-    void requestVirtualDesktop(const QModelIndex &index, qint32 desktop = -1) Q_DECL_OVERRIDE;
+    void requestVirtualDesktop(const QModelIndex &index, qint32 desktop = -1) override;
 
     /**
      * Request moving the task at the given index to the specified activities.
@@ -178,7 +178,7 @@ public:
      * @param index An index in this tasks model.
      * @param activities The new list of activities.
      **/
-    void requestActivities(const QModelIndex &index, const QStringList &activities) Q_DECL_OVERRIDE;
+    void requestActivities(const QModelIndex &index, const QStringList &activities) override;
 
     /**
      * Request informing the window manager of new geometry for a visual
@@ -192,7 +192,7 @@ public:
      * reject invalid objects.
      **/
     void requestPublishDelegateGeometry(const QModelIndex &index, const QRect &geometry,
-        QObject *delegate = nullptr) Q_DECL_OVERRIDE;
+        QObject *delegate = nullptr) override;
 
 protected:
     /*
diff --git a/libtaskmanager/concatenatetasksproxymodel.h b/libtaskmanager/concatenatetasksproxymodel.h
index c268ebaf6..e94f3cbcf 100644
--- a/libtaskmanager/concatenatetasksproxymodel.h
+++ b/libtaskmanager/concatenatetasksproxymodel.h
@@ -48,7 +48,7 @@ public:
     explicit ConcatenateTasksProxyModel(QObject *parent = 0);
     virtual ~ConcatenateTasksProxyModel();
 protected:
-    QModelIndex mapIfaceToSource(const QModelIndex &index) const Q_DECL_OVERRIDE;
+    QModelIndex mapIfaceToSource(const QModelIndex &index) const override;
 };
 
 }
diff --git a/libtaskmanager/declarative/taskmanagerplugin.h b/libtaskmanager/declarative/taskmanagerplugin.h
index c6b3e4f27..a250df1ca 100644
--- a/libtaskmanager/declarative/taskmanagerplugin.h
+++ b/libtaskmanager/declarative/taskmanagerplugin.h
@@ -33,7 +33,7 @@ class TaskManagerPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
     public:
-        void registerTypes(const char *uri) Q_DECL_OVERRIDE;
+        void registerTypes(const char *uri) override;
 };
 
 }
diff --git a/libtaskmanager/flattentaskgroupsproxymodel.h b/libtaskmanager/flattentaskgroupsproxymodel.h
index 44b65e475..8fce155d2 100644
--- a/libtaskmanager/flattentaskgroupsproxymodel.h
+++ b/libtaskmanager/flattentaskgroupsproxymodel.h
@@ -52,7 +52,7 @@ public:
     void setSourceModel(QAbstractItemModel *sourceModel) override;
 
 protected:
-    QModelIndex mapIfaceToSource(const QModelIndex &index) const Q_DECL_OVERRIDE;
+    QModelIndex mapIfaceToSource(const QModelIndex &index) const override;
 private:
     class Private;
     QScopedPointer<Private> d;
diff --git a/libtaskmanager/taskfilterproxymodel.h b/libtaskmanager/taskfilterproxymodel.h
index 4fdb80c10..a869824d4 100644
--- a/libtaskmanager/taskfilterproxymodel.h
+++ b/libtaskmanager/taskfilterproxymodel.h
@@ -285,7 +285,7 @@ Q_SIGNALS:
 
 protected:
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
-    QModelIndex mapIfaceToSource(const QModelIndex &index) const Q_DECL_OVERRIDE;
+    QModelIndex mapIfaceToSource(const QModelIndex &index) const override;
 
 private:
     class Private;
diff --git a/libtaskmanager/windowtasksmodel.h b/libtaskmanager/windowtasksmodel.h
index 6c3a454cb..1037fbac4 100644
--- a/libtaskmanager/windowtasksmodel.h
+++ b/libtaskmanager/windowtasksmodel.h
@@ -51,7 +51,7 @@ public:
     QHash<int, QByteArray> roleNames() const override;
 
 protected:
-    QModelIndex mapIfaceToSource(const QModelIndex &index) const Q_DECL_OVERRIDE;
+    QModelIndex mapIfaceToSource(const QModelIndex &index) const override;
 private:
     class Private;
     QScopedPointer<Private> d;
diff --git a/plasmacalendarintegration/holidaysevents.h b/plasmacalendarintegration/holidaysevents.h
index 4460b0ef5..ed2524970 100644
--- a/plasmacalendarintegration/holidaysevents.h
+++ b/plasmacalendarintegration/holidaysevents.h
@@ -36,7 +36,7 @@ public:
     explicit HolidaysEventsPlugin(QObject *parent = nullptr);
     ~HolidaysEventsPlugin();
 
-    void loadEventsForDateRange(const QDate &startDate, const QDate &endDate) Q_DECL_OVERRIDE;
+    void loadEventsForDateRange(const QDate &startDate, const QDate &endDate) override;
 
 private:
     QDate m_lastStartDate;
diff --git a/plasmacalendarintegration/qmlhelper/holidayeventshelperplugin.h b/plasmacalendarintegration/qmlhelper/holidayeventshelperplugin.h
index 065a28566..b6c3c866d 100644
--- a/plasmacalendarintegration/qmlhelper/holidayeventshelperplugin.h
+++ b/plasmacalendarintegration/qmlhelper/holidayeventshelperplugin.h
@@ -27,7 +27,7 @@ class HolidayEventsHelperPlugin : public QQmlExtensionPlugin
 Q_OBJECT
 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 public:
-    void registerTypes(const char* uri) Q_DECL_OVERRIDE;
+    void registerTypes(const char* uri) override;
 };
 
 #endif // HOLIDAYEVENTSHELPERPLUGIN_H
diff --git a/runners/powerdevil/PowerDevilRunner.h b/runners/powerdevil/PowerDevilRunner.h
index f003d3194..dfa957027 100644
--- a/runners/powerdevil/PowerDevilRunner.h
+++ b/runners/powerdevil/PowerDevilRunner.h
@@ -33,8 +33,8 @@ class PowerDevilRunner : public Plasma::AbstractRunner
         PowerDevilRunner( QObject *parent, const QVariantList &args );
         ~PowerDevilRunner() override;
 
-        void match( Plasma::RunnerContext &context ) Q_DECL_OVERRIDE;
-        void run( const Plasma::RunnerContext &context, const Plasma::QueryMatch &action ) Q_DECL_OVERRIDE;
+        void match( Plasma::RunnerContext &context ) override;
+        void run( const Plasma::RunnerContext &context, const Plasma::QueryMatch &action ) override;
 
     private Q_SLOTS:
         void updateStatus();
diff --git a/runners/sessions/sessionrunner.h b/runners/sessions/sessionrunner.h
index a905cde6d..763d2e7b7 100644
--- a/runners/sessions/sessionrunner.h
+++ b/runners/sessions/sessionrunner.h
@@ -35,8 +35,8 @@ class SessionRunner : public Plasma::AbstractRunner
         SessionRunner(QObject *parent, const QVariantList &args);
         ~SessionRunner() override;
 
-        void match(Plasma::RunnerContext &context) Q_DECL_OVERRIDE;
-        void run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &action) Q_DECL_OVERRIDE;
+        void match(Plasma::RunnerContext &context) override;
+        void run(const Plasma::RunnerContext &context, const Plasma::QueryMatch &action) override;
 
         enum { LogoutAction = 1, ShutdownAction, RestartAction, LockAction };
 
diff --git a/shell/screenpool.h b/shell/screenpool.h
index 9baa90b49..14f799d20 100644
--- a/shell/screenpool.h
+++ b/shell/screenpool.h
@@ -53,7 +53,7 @@ public:
     QList <int> knownIds() const;
 
 protected:
-    bool nativeEventFilter(const QByteArray & eventType, void * message, long * result) Q_DECL_OVERRIDE;
+    bool nativeEventFilter(const QByteArray & eventType, void * message, long * result) override;
 
 private:
     void save();
diff --git a/soliduiserver/deviceserviceaction.cpp b/soliduiserver/deviceserviceaction.cpp
index f49c967a5..cfbf45682 100644
--- a/soliduiserver/deviceserviceaction.cpp
+++ b/soliduiserver/deviceserviceaction.cpp
@@ -35,7 +35,7 @@ public:
         : KMacroExpanderBase('%'), m_device(device) {}
 
 protected:
-    int expandEscapedMacro(const QString &str, int pos, QStringList &ret) Q_DECL_OVERRIDE;
+    int expandEscapedMacro(const QString &str, int pos, QStringList &ret) override;
 
 private:
     Solid::Device m_device;
diff --git a/wallpapers/image/backgroundlistmodel.h b/wallpapers/image/backgroundlistmodel.h
index 1da62aac3..7c9b31fcd 100644
--- a/wallpapers/image/backgroundlistmodel.h
+++ b/wallpapers/image/backgroundlistmodel.h
@@ -76,10 +76,10 @@ public:
     BackgroundListModel(Image *listener, QObject *parent);
     ~BackgroundListModel() override;
 
-    QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE ;
-    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
+    QHash<int, QByteArray> roleNames() const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override ;
+    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
     KPackage::Package package(int index) const;
 
     void reload();
diff --git a/xembed-sni-proxy/fdoselectionmanager.h b/xembed-sni-proxy/fdoselectionmanager.h
index 75392a6fd..d40ac1171 100644
--- a/xembed-sni-proxy/fdoselectionmanager.h
+++ b/xembed-sni-proxy/fdoselectionmanager.h
@@ -39,7 +39,7 @@ public:
     ~FdoSelectionManager() override;
 
 protected:
-    bool nativeEventFilter(const QByteArray & eventType, void * message, long * result) Q_DECL_OVERRIDE;
+    bool nativeEventFilter(const QByteArray & eventType, void * message, long * result) override;
 
 private Q_SLOTS:
     void onClaimedOwnership();