diff options
| author | Montel Laurent <montel@kde.org> | 2015-02-25 08:51:58 +0100 |
|---|---|---|
| committer | Montel Laurent <montel@kde.org> | 2015-02-25 08:51:58 +0100 |
| commit | 9fed4e3bbe5e72641d9793badb090290ce237fae (patch) | |
| tree | 0386e1b8402b958db50c22ff4cd1736e70ff8498 /src/core/kconfig.h | |
| parent | 5a28172868cdc51607e0e87172d4d4fb6f01b896 (diff) | |
| download | kconfig-9fed4e3bbe5e72641d9793badb090290ce237fae.tar.gz kconfig-9fed4e3bbe5e72641d9793badb090290ce237fae.tar.bz2 | |
not necessary to have virtual + Q_DECL_OVERRIDE
Diffstat (limited to 'src/core/kconfig.h')
| -rw-r--r-- | src/core/kconfig.h | 12 |
1 files changed, 6 insertions, 6 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; |