9 files changed, 144 insertions, 144 deletions

diff --git a/src/core/kconfig.h b/src/core/kconfig.h
index 9601a1e9..c6be56d6 100644
--- a/src/core/kconfig.h
+++ b/src/core/kconfig.h
@@ -165,18 +165,18 @@ public:
     OpenFlags openFlags() const;
 
     /// @reimp
-    bool sync() Q_DECL_OVERRIDE;
+    bool sync() override;
 
     /// Returns true if sync has any changes to write out.
     /// @since 4.12
     bool isDirty() const;
 
     /// @reimp
-    void markAsClean() Q_DECL_OVERRIDE;
+    void markAsClean() override;
 
     /// @{ configuration object state
     /// @reimp
-    AccessMode accessMode() const Q_DECL_OVERRIDE;
+    AccessMode accessMode() const override;
 
     /**
      * Whether the configuration can be written to.
@@ -312,7 +312,7 @@ public:
 
     /// @{ immutability
     /// @reimp
-    bool isImmutable() const Q_DECL_OVERRIDE;
+    bool isImmutable() const override;
     /// @}
 
     /// @{ global
@@ -343,7 +343,7 @@ public:
     /// @}
 
     /// @reimp
-    QStringList groupList() const Q_DECL_OVERRIDE;
+    QStringList groupList() const override;
 
     /**
      * Returns a map (tree) of entries in a particular group.
@@ -365,11 +365,11 @@ public:
     static void setMainConfigName(const QString &str);
 
 protected:
-    bool hasGroupImpl(const QByteArray &group) const Q_DECL_OVERRIDE;
-    KConfigGroup groupImpl(const QByteArray &b) Q_DECL_OVERRIDE;
-    const KConfigGroup groupImpl(const QByteArray &b) const Q_DECL_OVERRIDE;
-    void deleteGroupImpl(const QByteArray &group, WriteConfigFlags flags = Normal) Q_DECL_OVERRIDE;
-    bool isGroupImmutableImpl(const QByteArray &aGroup) const Q_DECL_OVERRIDE;
+    bool hasGroupImpl(const QByteArray &group) const override;
+    KConfigGroup groupImpl(const QByteArray &b) override;
+    const KConfigGroup groupImpl(const QByteArray &b) const override;
+    void deleteGroupImpl(const QByteArray &group, WriteConfigFlags flags = Normal) override;
+    bool isGroupImmutableImpl(const QByteArray &aGroup) const override;
 
     friend class KConfigGroup;
     friend class KConfigGroupPrivate;
@@ -378,7 +378,7 @@ protected:
     /** Virtual hook, used to add new "virtual" functions while maintaining
      * binary compatibility. Unused in this class.
      */
-    void virtual_hook(int id, void *data) Q_DECL_OVERRIDE;
+    void virtual_hook(int id, void *data) override;
 
     KConfigPrivate *const d_ptr;
 
diff --git a/src/core/kconfiggroup.h b/src/core/kconfiggroup.h
index 5b8c4075..f5e16fdb 100644
--- a/src/core/kconfiggroup.h
+++ b/src/core/kconfiggroup.h
@@ -124,13 +124,13 @@ public:
      *
      * Syncs the parent config.
      */
-    bool sync() Q_DECL_OVERRIDE;
+    bool sync() override;
 
     /// @reimp
-    void markAsClean() Q_DECL_OVERRIDE;
+    void markAsClean() override;
 
     /// @reimp
-    AccessMode accessMode() const Q_DECL_OVERRIDE;
+    AccessMode accessMode() const override;
 
     /**
      * Return the config object that this group belongs to
@@ -203,7 +203,7 @@ public:
     /**
      * @reimp
      */
-    QStringList groupList() const Q_DECL_OVERRIDE;
+    QStringList groupList() const override;
 
     /**
      * Returns a list of keys this group contains
@@ -546,7 +546,7 @@ public:
      *
      * @return @c false if the group may be changed, @c true otherwise
      */
-    bool isImmutable() const Q_DECL_OVERRIDE;
+    bool isImmutable() const override;
 
     /**
      * Checks if it is possible to change the given entry
@@ -624,11 +624,11 @@ public:
     QMap<QString, QString> entryMap() const;
 
 protected:
-    bool hasGroupImpl(const QByteArray &group) const Q_DECL_OVERRIDE;
-    KConfigGroup groupImpl(const QByteArray &b) Q_DECL_OVERRIDE;
-    const KConfigGroup groupImpl(const QByteArray &b) const Q_DECL_OVERRIDE;
-    void deleteGroupImpl(const QByteArray &group, WriteConfigFlags flags) Q_DECL_OVERRIDE;
-    bool isGroupImmutableImpl(const QByteArray &aGroup) const Q_DECL_OVERRIDE;
+    bool hasGroupImpl(const QByteArray &group) const override;
+    KConfigGroup groupImpl(const QByteArray &b) override;
+    const KConfigGroup groupImpl(const QByteArray &b) const override;
+    void deleteGroupImpl(const QByteArray &group, WriteConfigFlags flags) override;
+    bool isGroupImmutableImpl(const QByteArray &aGroup) const override;
 
 private:
     QExplicitlySharedDataPointer<KConfigGroupPrivate> d;
diff --git a/src/core/kconfigini_p.h b/src/core/kconfigini_p.h
index 9b961826..2c17bf60 100644
--- a/src/core/kconfigini_p.h
+++ b/src/core/kconfigini_p.h
@@ -39,26 +39,26 @@ public:
     class BufferFragment;
 
     KConfigIniBackend();
-    ~KConfigIniBackend() Q_DECL_OVERRIDE;
+    ~KConfigIniBackend() override;
 
     ParseInfo parseConfig(const QByteArray &locale,
                           KEntryMap &entryMap,
-                          ParseOptions options) Q_DECL_OVERRIDE;
+                          ParseOptions options) override;
     ParseInfo parseConfig(const QByteArray &locale,
                           KEntryMap &entryMap,
                           ParseOptions options,
                           bool merging);
     bool writeConfig(const QByteArray &locale, KEntryMap &entryMap,
-                     WriteOptions options) Q_DECL_OVERRIDE;
+                     WriteOptions options) override;
 
-    bool isWritable() const Q_DECL_OVERRIDE;
-    QString nonWritableErrorMessage() const Q_DECL_OVERRIDE;
-    KConfigBase::AccessMode accessMode() const Q_DECL_OVERRIDE;
-    void createEnclosing() Q_DECL_OVERRIDE;
-    void setFilePath(const QString &path) Q_DECL_OVERRIDE;
-    bool lock() Q_DECL_OVERRIDE;
-    void unlock() Q_DECL_OVERRIDE;
-    bool isLocked() const Q_DECL_OVERRIDE;
+    bool isWritable() const override;
+    QString nonWritableErrorMessage() const override;
+    KConfigBase::AccessMode accessMode() const override;
+    void createEnclosing() override;
+    void setFilePath(const QString &path) override;
+    bool lock() override;
+    void unlock() override;
+    bool isLocked() const override;
 
 protected:
 
diff --git a/src/core/kcoreconfigskeleton.h b/src/core/kcoreconfigskeleton.h
index df550154..b384129d 100644
--- a/src/core/kcoreconfigskeleton.h
+++ b/src/core/kcoreconfigskeleton.h
@@ -263,13 +263,13 @@ public:
     /**
       Set the value for this item to the default value
      */
-    void setDefault() Q_DECL_OVERRIDE
+    void setDefault() override
     {
         mReference = mDefault;
     }
 
     /** @copydoc KConfigSkeletonItem::writeConfig(KConfig *) */
-    void writeConfig(KConfig *config) Q_DECL_OVERRIDE
+    void writeConfig(KConfig *config) override
     {
         if (mReference != mLoadedValue) { // Is this needed?
             KConfigGroup cg(config, mGroup);
@@ -283,7 +283,7 @@ public:
     }
 
     /** @copydoc KConfigSkeletonItem::readDefault(KConfig*) */
-    void readDefault(KConfig *config) Q_DECL_OVERRIDE
+    void readDefault(KConfig *config) override
     {
         config->setReadDefaults(true);
         readConfig(config);
@@ -292,7 +292,7 @@ public:
     }
 
     /** @copydoc KConfigSkeletonItem::swapDefault() */
-    void swapDefault() Q_DECL_OVERRIDE
+    void swapDefault() override
     {
         T tmp = mReference;
         mReference = mDefault;
@@ -332,16 +332,16 @@ public:
     */
     KConfigCompilerSignallingItem(KConfigSkeletonItem *item, QObject* object,
             NotifyFunction targetFunction, quint64 userData);
-    ~KConfigCompilerSignallingItem() Q_DECL_OVERRIDE;
-
-    void readConfig(KConfig *) Q_DECL_OVERRIDE;
-    void writeConfig(KConfig *) Q_DECL_OVERRIDE;
-    void readDefault(KConfig *) Q_DECL_OVERRIDE;
-    void setProperty(const QVariant &p) Q_DECL_OVERRIDE;
-    bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE;
-    QVariant property() const Q_DECL_OVERRIDE;
-    void setDefault() Q_DECL_OVERRIDE;
-    void swapDefault() Q_DECL_OVERRIDE;
+    ~KConfigCompilerSignallingItem() override;
+
+    void readConfig(KConfig *) override;
+    void writeConfig(KConfig *) override;
+    void readDefault(KConfig *) override;
+    void setProperty(const QVariant &p) override;
+    bool isEqual(const QVariant &p) const override;
+    QVariant property() const override;
+    void setDefault() override;
+    void swapDefault() override;
 private:
     inline void invokeNotifyFunction()
     {
@@ -449,19 +449,19 @@ public:
                    Type type = Normal);
 
         /** @copydoc KConfigSkeletonItem::writeConfig(KConfig*) */
-        void writeConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void writeConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */
-        void setProperty(const QVariant &p) Q_DECL_OVERRIDE;
+        void setProperty(const QVariant &p) override;
 
         /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */
-        bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE;
+        bool isEqual(const QVariant &p) const override;
 
         /** @copydoc KConfigSkeletonItem::property() const */
-        QVariant property() const Q_DECL_OVERRIDE;
+        QVariant property() const override;
 
     private:
         Type mType;
@@ -505,19 +505,19 @@ public:
                 const QUrl &defaultValue = QUrl());
 
         /** @copydoc KConfigSkeletonItem::writeConfig(KConfig*) */
-        void writeConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void writeConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */
-        void setProperty(const QVariant &p) Q_DECL_OVERRIDE;
+        void setProperty(const QVariant &p) override;
 
         /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */
-        bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE;
+        bool isEqual(const QVariant &p) const override;
 
         /** @copydoc KConfigSkeletonItem::property() const */
-        QVariant property() const Q_DECL_OVERRIDE;
+        QVariant property() const override;
     };
 
     /**
@@ -530,14 +530,14 @@ public:
         ItemProperty(const QString &_group, const QString &_key,
                      QVariant &reference, const QVariant &defaultValue = QVariant());
 
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
-        void setProperty(const QVariant &p) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
+        void setProperty(const QVariant &p) override;
 
         /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */
-        bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE;
+        bool isEqual(const QVariant &p) const override;
 
         /** @copydoc KConfigSkeletonItem::property() const */
-        QVariant property() const Q_DECL_OVERRIDE;
+        QVariant property() const override;
     };
 
     /**
@@ -551,16 +551,16 @@ public:
                  bool defaultValue = true);
 
         /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */
-        void setProperty(const QVariant &p) Q_DECL_OVERRIDE;
+        void setProperty(const QVariant &p) override;
 
         /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */
-        bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE;
+        bool isEqual(const QVariant &p) const override;
 
         /** @copydoc KConfigSkeletonItem::property() const */
-        QVariant property() const Q_DECL_OVERRIDE;
+        QVariant property() const override;
     };
 
     /**
@@ -574,22 +574,22 @@ public:
                 qint32 defaultValue = 0);
 
         /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */
-        void setProperty(const QVariant &p) Q_DECL_OVERRIDE;
+        void setProperty(const QVariant &p) override;
 
         /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */
-        bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE;
+        bool isEqual(const QVariant &p) const override;
 
         /** @copydoc KConfigSkeletonItem::property() */
-        QVariant property() const Q_DECL_OVERRIDE;
+        QVariant property() const override;
 
         /** Get the minimum value that is allowed to be stored in this item */
-        QVariant minValue() const Q_DECL_OVERRIDE;
+        QVariant minValue() const override;
 
         /** Get the maximum value this is allowed to be stored in this item */
-        QVariant maxValue() const Q_DECL_OVERRIDE;
+        QVariant maxValue() const override;
 
         /** Set the minimum value for the item
             @sa minValue()
@@ -619,22 +619,22 @@ public:
                      qint64 defaultValue = 0);
 
         /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */
-        void setProperty(const QVariant &p) Q_DECL_OVERRIDE;
+        void setProperty(const QVariant &p) override;
 
         /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */
-        bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE;
+        bool isEqual(const QVariant &p) const override;
 
         /** @copydoc KConfigSkeletonItem::property() */
-        QVariant property() const Q_DECL_OVERRIDE;
+        QVariant property() const override;
 
         /** @copydoc ItemInt::minValue() */
-        QVariant minValue() const Q_DECL_OVERRIDE;
+        QVariant minValue() const override;
 
         /** @copydoc ItemInt::maxValue() */
-        QVariant maxValue() const Q_DECL_OVERRIDE;
+        QVariant maxValue() const override;
 
         /** @copydoc ItemInt::setMinValue(qint32) */
         void setMinValue(qint64);
@@ -674,10 +674,10 @@ public:
         QList<Choice> choices() const;
 
         /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::writeConfig(KConfig*) */
-        void writeConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void writeConfig(KConfig *config) override;
 
         // Source compatibility with 4.x
         typedef Choice Choice2;
@@ -698,22 +698,22 @@ public:
                  quint32 &reference, quint32 defaultValue = 0);
 
         /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */
-        void setProperty(const QVariant &p) Q_DECL_OVERRIDE;
+        void setProperty(const QVariant &p) override;
 
         /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */
-        bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE;
+        bool isEqual(const QVariant &p) const override;
 
         /** @copydoc KConfigSkeletonItem::property() */
-        QVariant property() const Q_DECL_OVERRIDE;
+        QVariant property() const override;
 
         /** @copydoc ItemInt::minValue() */
-        QVariant minValue() const Q_DECL_OVERRIDE;
+        QVariant minValue() const override;
 
         /** @copydoc ItemInt::maxValue() */
-        QVariant maxValue() const Q_DECL_OVERRIDE;
+        QVariant maxValue() const override;
 
         /** @copydoc ItemInt::setMinValue(qint32) */
         void setMinValue(quint32);
@@ -739,22 +739,22 @@ public:
                       quint64 defaultValue = 0);
 
         /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */
-        void setProperty(const QVariant &p) Q_DECL_OVERRIDE;
+        void setProperty(const QVariant &p) override;
 
         /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */
-        bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE;
+        bool isEqual(const QVariant &p) const override;
 
         /** @copydoc KConfigSkeletonItem::property() */
-        QVariant property() const Q_DECL_OVERRIDE;
+        QVariant property() const override;
 
         /** @copydoc ItemInt::minValue() */
-        QVariant minValue() const Q_DECL_OVERRIDE;
+        QVariant minValue() const override;
 
         /** @copydoc ItemInt::maxValue() */
-        QVariant maxValue() const Q_DECL_OVERRIDE;
+        QVariant maxValue() const override;
 
         /** @copydoc ItemInt::setMinValue(qint32) */
         void setMinValue(quint64);
@@ -783,22 +783,22 @@ public:
                    double &reference, double defaultValue = 0);
 
         /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */
-        void setProperty(const QVariant &p) Q_DECL_OVERRIDE;
+        void setProperty(const QVariant &p) override;
 
         /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */
-        bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE;
+        bool isEqual(const QVariant &p) const override;
 
         /** @copydoc KConfigSkeletonItem::property() */
-        QVariant property() const Q_DECL_OVERRIDE;
+        QVariant property() const override;
 
         /** @copydoc ItemInt::minValue() */
-        QVariant minValue() const Q_DECL_OVERRIDE;
+        QVariant minValue() const override;
 
         /** @copydoc ItemInt::maxValue() */
-        QVariant maxValue() const Q_DECL_OVERRIDE;
+        QVariant maxValue() const override;
 
         /** @copydoc ItemInt::setMinValue() */
         void setMinValue(double);
@@ -824,16 +824,16 @@ public:
                  const QRect &defaultValue = QRect());
 
         /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */
-        void setProperty(const QVariant &p) Q_DECL_OVERRIDE;
+        void setProperty(const QVariant &p) override;
 
         /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */
-        bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE;
+        bool isEqual(const QVariant &p) const override;
 
         /** @copydoc KConfigSkeletonItem::property() */
-        QVariant property() const Q_DECL_OVERRIDE;
+        QVariant property() const override;
     };
 
     /**
@@ -847,16 +847,16 @@ public:
                   const QPoint &defaultValue = QPoint());
 
         /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */
-        void setProperty(const QVariant &p) Q_DECL_OVERRIDE;
+        void setProperty(const QVariant &p) override;
 
         /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */
-        bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE;
+        bool isEqual(const QVariant &p) const override;
 
         /** @copydoc KConfigSkeletonItem::property() */
-        QVariant property() const Q_DECL_OVERRIDE;
+        QVariant property() const override;
     };
 
     /**
@@ -870,16 +870,16 @@ public:
                  const QSize &defaultValue = QSize());
 
         /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */
-        void setProperty(const QVariant &p) Q_DECL_OVERRIDE;
+        void setProperty(const QVariant &p) override;
 
         /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */
-        bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE;
+        bool isEqual(const QVariant &p) const override;
 
         /** @copydoc KConfigSkeletonItem::property() */
-        QVariant property() const Q_DECL_OVERRIDE;
+        QVariant property() const override;
     };
 
     /**
@@ -894,16 +894,16 @@ public:
                      const QDateTime &defaultValue = QDateTime());
 
         /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */
-        void setProperty(const QVariant &p) Q_DECL_OVERRIDE;
+        void setProperty(const QVariant &p) override;
 
         /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */
-        bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE;
+        bool isEqual(const QVariant &p) const override;
 
         /** @copydoc KConfigSkeletonItem::property() */
-        QVariant property() const Q_DECL_OVERRIDE;
+        QVariant property() const override;
     };
 
     /**
@@ -918,16 +918,16 @@ public:
                        const QStringList &defaultValue = QStringList());
 
         /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */
-        void setProperty(const QVariant &p) Q_DECL_OVERRIDE;
+        void setProperty(const QVariant &p) override;
 
         /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */
-        bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE;
+        bool isEqual(const QVariant &p) const override;
 
         /** @copydoc KConfigSkeletonItem::property() */
-        QVariant property() const Q_DECL_OVERRIDE;
+        QVariant property() const override;
     };
 
     /**
@@ -942,9 +942,9 @@ public:
                      const QStringList &defaultValue = QStringList());
 
         /** @copydoc KConfigSkeletonItem::readConfig */
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
         /** @copydoc KConfigSkeletonItem::writeConfig */
-        void writeConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void writeConfig(KConfig *config) override;
     };
 
     /**
@@ -959,19 +959,19 @@ public:
                     const QList<QUrl> &defaultValue = QList<QUrl>());
 
         /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::writeConfig(KConfig*) */
-        void writeConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void writeConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */
-        void setProperty(const QVariant &p) Q_DECL_OVERRIDE;
+        void setProperty(const QVariant &p) override;
 
         /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */
-        bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE;
+        bool isEqual(const QVariant &p) const override;
 
         /** @copydoc KConfigSkeletonItem::property() */
-        QVariant property() const Q_DECL_OVERRIDE;
+        QVariant property() const override;
     };
 
     /**
@@ -986,16 +986,16 @@ public:
                     const QList < int > &defaultValue = QList < int >());
 
         /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */
-        void setProperty(const QVariant &p) Q_DECL_OVERRIDE;
+        void setProperty(const QVariant &p) override;
 
         /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */
-        bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE;
+        bool isEqual(const QVariant &p) const override;
 
         /** @copydoc KConfigSkeletonItem::property() */
-        QVariant property() const Q_DECL_OVERRIDE;
+        QVariant property() const override;
     };
 
 public:
diff --git a/src/core/ksharedconfig.h b/src/core/ksharedconfig.h
index 83ec3b6e..e3a06b2e 100644
--- a/src/core/ksharedconfig.h
+++ b/src/core/ksharedconfig.h
@@ -75,12 +75,12 @@ public:
                                          OpenFlags mode = FullConfig,
                                          QStandardPaths::StandardLocation type = QStandardPaths::GenericConfigLocation);
 
-    ~KSharedConfig() Q_DECL_OVERRIDE;
+    ~KSharedConfig() override;
 
 private:
     Q_DISABLE_COPY(KSharedConfig)
-    KConfigGroup groupImpl(const QByteArray &aGroup) Q_DECL_OVERRIDE;
-    const KConfigGroup groupImpl(const QByteArray &aGroup) const Q_DECL_OVERRIDE;
+    KConfigGroup groupImpl(const QByteArray &aGroup) override;
+    const KConfigGroup groupImpl(const QByteArray &aGroup) const override;
 
     KSharedConfig(const QString &file, OpenFlags mode,
                   QStandardPaths::StandardLocation resourceType);
diff --git a/src/gui/kconfigloader.h b/src/gui/kconfigloader.h
index aa6b7538..33f7423a 100644
--- a/src/gui/kconfigloader.h
+++ b/src/gui/kconfigloader.h
@@ -131,7 +131,7 @@ public:
      **/
     KConfigLoader(const KConfigGroup &config, QIODevice *xml, QObject *parent = nullptr);
 
-    ~KConfigLoader() Q_DECL_OVERRIDE;
+    ~KConfigLoader() override;
 
     /**
      * Finds the item for the given group and key.
@@ -169,7 +169,7 @@ protected:
     /**
      * Hack used to force writing when no default exists in config file.
      */
-    bool usrWriteConfig() Q_DECL_OVERRIDE;
+    bool usrWriteConfig() override;
 
 private:
     ConfigLoaderPrivate *const d;
diff --git a/src/gui/kconfigloaderhandler_p.h b/src/gui/kconfigloaderhandler_p.h
index d936b3be..cae92495 100644
--- a/src/gui/kconfigloaderhandler_p.h
+++ b/src/gui/kconfigloaderhandler_p.h
@@ -28,10 +28,10 @@ class ConfigLoaderHandler : public QXmlDefaultHandler
 public:
     ConfigLoaderHandler(KConfigLoader *config, ConfigLoaderPrivate *d);
     bool startElement(const QString &namespaceURI, const QString &localName,
-                      const QString &qName, const QXmlAttributes &atts) Q_DECL_OVERRIDE;
+                      const QString &qName, const QXmlAttributes &atts) override;
     bool endElement(const QString &namespaceURI, const QString &localName,
-                    const QString &qName) Q_DECL_OVERRIDE;
-    bool characters(const QString &ch) Q_DECL_OVERRIDE;
+                    const QString &qName) override;
+    bool characters(const QString &ch) override;
 
     QString name() const;
     void setName(const QString &name);
diff --git a/src/gui/kconfigskeleton.h b/src/gui/kconfigskeleton.h
index 36aee9a7..c7cb5a10 100644
--- a/src/gui/kconfigskeleton.h
+++ b/src/gui/kconfigskeleton.h
@@ -55,16 +55,16 @@ public:
                   const QColor &defaultValue = QColor(128, 128, 128));
 
         /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */
-        void setProperty(const QVariant &p) Q_DECL_OVERRIDE;
+        void setProperty(const QVariant &p) override;
 
         /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) */
-        bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE;
+        bool isEqual(const QVariant &p) const override;
 
         /** @copydoc KConfigSkeletonItem::property() */
-        QVariant property() const Q_DECL_OVERRIDE;
+        QVariant property() const override;
     };
 
     /**
@@ -78,16 +78,16 @@ public:
                  const QFont &defaultValue = QFont());
 
         /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */
-        void readConfig(KConfig *config) Q_DECL_OVERRIDE;
+        void readConfig(KConfig *config) override;
 
         /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */
-        void setProperty(const QVariant &p) Q_DECL_OVERRIDE;
+        void setProperty(const QVariant &p) override;
 
         /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) */
-        bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE;
+        bool isEqual(const QVariant &p) const override;
 
         /** @copydoc KConfigSkeletonItem::property() */
-        QVariant property() const Q_DECL_OVERRIDE;
+        QVariant property() const override;
     };
 
 public:
diff --git a/src/kconfig_compiler/kconfig_compiler.cpp b/src/kconfig_compiler/kconfig_compiler.cpp
index 95d23dd4..82e66e2a 100644
--- a/src/kconfig_compiler/kconfig_compiler.cpp
+++ b/src/kconfig_compiler/kconfig_compiler.cpp
@@ -2123,7 +2123,7 @@ int main(int argc, char **argv)
     }
 
     if (hasNonModifySignals) {
-        h << "    bool usrSave() Q_DECL_OVERRIDE;" << endl;
+        h << "    bool usrSave() override;" << endl;
     }
 
     // Member variables