diff options
| -rw-r--r-- | src/core/kconfig.h | 12 | ||||
| -rw-r--r-- | src/core/kcoreconfigskeleton.h | 20 | ||||
| -rw-r--r-- | src/core/ksharedconfig.h | 4 |
3 files changed, 18 insertions, 18 deletions
diff --git a/src/core/kconfig.h b/src/core/kconfig.h index 26685923..6cc73235 100644 --- a/src/core/kconfig.h +++ b/src/core/kconfig.h @@ -365,11 +365,11 @@ public: static void setMainConfigName(const QString &str); protected: - virtual bool hasGroupImpl(const QByteArray &group) const Q_DECL_OVERRIDE; - virtual KConfigGroup groupImpl(const QByteArray &b) Q_DECL_OVERRIDE; - virtual const KConfigGroup groupImpl(const QByteArray &b) const Q_DECL_OVERRIDE; - virtual void deleteGroupImpl(const QByteArray &group, WriteConfigFlags flags = Normal) Q_DECL_OVERRIDE; - virtual bool isGroupImmutableImpl(const QByteArray &aGroup) const Q_DECL_OVERRIDE; + 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; 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. */ - virtual void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; + void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; KConfigPrivate *const d_ptr; diff --git a/src/core/kcoreconfigskeleton.h b/src/core/kcoreconfigskeleton.h index eb8996c6..4727849b 100644 --- a/src/core/kcoreconfigskeleton.h +++ b/src/core/kcoreconfigskeleton.h @@ -262,13 +262,13 @@ public: /** Set the value for this item to the default value */ - virtual void setDefault() Q_DECL_OVERRIDE + void setDefault() Q_DECL_OVERRIDE { mReference = mDefault; } /** @copydoc KConfigSkeletonItem::writeConfig(KConfig *) */ - virtual void writeConfig(KConfig *config) Q_DECL_OVERRIDE + void writeConfig(KConfig *config) Q_DECL_OVERRIDE { if (mReference != mLoadedValue) { // Is this needed? KConfigGroup cg(config, mGroup); @@ -333,14 +333,14 @@ public: NotifyFunction targetFunction, quint64 userData); virtual ~KConfigCompilerSignallingItem(); - virtual void readConfig(KConfig *) Q_DECL_OVERRIDE; - virtual void writeConfig(KConfig *) Q_DECL_OVERRIDE; - virtual void readDefault(KConfig *) Q_DECL_OVERRIDE; - virtual void setProperty(const QVariant &p) Q_DECL_OVERRIDE; - virtual bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE; - virtual QVariant property() const Q_DECL_OVERRIDE; - virtual void setDefault() Q_DECL_OVERRIDE; - virtual void swapDefault() 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; private: inline void invokeNotifyFunction() { diff --git a/src/core/ksharedconfig.h b/src/core/ksharedconfig.h index d0791e46..2d083797 100644 --- a/src/core/ksharedconfig.h +++ b/src/core/ksharedconfig.h @@ -79,8 +79,8 @@ public: private: Q_DISABLE_COPY(KSharedConfig) - virtual KConfigGroup groupImpl(const QByteArray &aGroup) Q_DECL_OVERRIDE; - virtual const KConfigGroup groupImpl(const QByteArray &aGroup) const Q_DECL_OVERRIDE; + KConfigGroup groupImpl(const QByteArray &aGroup) Q_DECL_OVERRIDE; + const KConfigGroup groupImpl(const QByteArray &aGroup) const Q_DECL_OVERRIDE; KSharedConfig(const QString &file, OpenFlags mode, QStandardPaths::StandardLocation resourceType); |