diff options
-rw-r--r-- | src/core/kconfig.h | 20 | ||||
-rw-r--r-- | src/core/kconfiggroup.h | 18 | ||||
-rw-r--r-- | src/core/kconfigini_p.h | 20 | ||||
-rw-r--r-- | src/core/kcoreconfigskeleton.h | 170 | ||||
-rw-r--r-- | src/core/ksharedconfig.h | 4 | ||||
-rw-r--r-- | src/gui/kconfigloader.h | 2 | ||||
-rw-r--r-- | src/gui/kconfigloaderhandler_p.h | 6 | ||||
-rw-r--r-- | src/gui/kconfigskeleton.h | 16 |
8 files changed, 128 insertions, 128 deletions
diff --git a/src/core/kconfig.h b/src/core/kconfig.h index 0fb15756..26685923 100644 --- a/src/core/kconfig.h +++ b/src/core/kconfig.h @@ -172,11 +172,11 @@ public: bool isDirty() const; /// @reimp - void markAsClean(); + void markAsClean() Q_DECL_OVERRIDE; /// @{ configuration object state /// @reimp - AccessMode accessMode() const; + AccessMode accessMode() const Q_DECL_OVERRIDE; /** * Whether the configuration can be written to. @@ -312,7 +312,7 @@ public: /// @{ immutability /// @reimp - bool isImmutable() const; + bool isImmutable() const Q_DECL_OVERRIDE; /// @} /// @{ global @@ -343,7 +343,7 @@ public: /// @} /// @reimp - QStringList groupList() const; + QStringList groupList() const Q_DECL_OVERRIDE; /** * Returns a map (tree) of entries in a particular group. @@ -365,11 +365,11 @@ public: static void setMainConfigName(const QString &str); protected: - virtual bool hasGroupImpl(const QByteArray &group) const; - virtual KConfigGroup groupImpl(const QByteArray &b); - virtual const KConfigGroup groupImpl(const QByteArray &b) const; - virtual void deleteGroupImpl(const QByteArray &group, WriteConfigFlags flags = Normal); - virtual bool isGroupImmutableImpl(const QByteArray &aGroup) const; + 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; 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); + virtual void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; KConfigPrivate *const d_ptr; diff --git a/src/core/kconfiggroup.h b/src/core/kconfiggroup.h index abb246e3..9ddf886e 100644 --- a/src/core/kconfiggroup.h +++ b/src/core/kconfiggroup.h @@ -127,10 +127,10 @@ public: bool sync() Q_DECL_OVERRIDE; /// @reimp - void markAsClean(); + void markAsClean() Q_DECL_OVERRIDE; /// @reimp - AccessMode accessMode() const; + AccessMode accessMode() const Q_DECL_OVERRIDE; /** * Return the config object that this group belongs to @@ -203,7 +203,7 @@ public: /** * @reimp */ - QStringList groupList() const; + QStringList groupList() const Q_DECL_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; + bool isImmutable() const Q_DECL_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; - KConfigGroup groupImpl(const QByteArray &b); - const KConfigGroup groupImpl(const QByteArray &b) const; - void deleteGroupImpl(const QByteArray &group, WriteConfigFlags flags); - bool isGroupImmutableImpl(const QByteArray &aGroup) const; + 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; private: QExplicitlySharedDataPointer<KConfigGroupPrivate> d; diff --git a/src/core/kconfigini_p.h b/src/core/kconfigini_p.h index 29f61090..47aa6fea 100644 --- a/src/core/kconfigini_p.h +++ b/src/core/kconfigini_p.h @@ -43,22 +43,22 @@ public: ParseInfo parseConfig(const QByteArray &locale, KEntryMap &entryMap, - ParseOptions options); + ParseOptions options) Q_DECL_OVERRIDE; ParseInfo parseConfig(const QByteArray &locale, KEntryMap &entryMap, ParseOptions options, bool merging); bool writeConfig(const QByteArray &locale, KEntryMap &entryMap, - WriteOptions options); + WriteOptions options) Q_DECL_OVERRIDE; - bool isWritable() const; - QString nonWritableErrorMessage() const; - KConfigBase::AccessMode accessMode() const; - void createEnclosing(); - void setFilePath(const QString &path); - bool lock(); - void unlock(); - bool isLocked() const; + 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; protected: diff --git a/src/core/kcoreconfigskeleton.h b/src/core/kcoreconfigskeleton.h index bb3d0f61..eb8996c6 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() + virtual void setDefault() Q_DECL_OVERRIDE { mReference = mDefault; } /** @copydoc KConfigSkeletonItem::writeConfig(KConfig *) */ - virtual void writeConfig(KConfig *config) + virtual void writeConfig(KConfig *config) Q_DECL_OVERRIDE { if (mReference != mLoadedValue) { // Is this needed? KConfigGroup cg(config, mGroup); @@ -282,7 +282,7 @@ public: } /** @copydoc KConfigSkeletonItem::readDefault(KConfig*) */ - void readDefault(KConfig *config) + void readDefault(KConfig *config) Q_DECL_OVERRIDE { config->setReadDefaults(true); readConfig(config); @@ -291,7 +291,7 @@ public: } /** @copydoc KConfigSkeletonItem::swapDefault() */ - void swapDefault() + void swapDefault() Q_DECL_OVERRIDE { T tmp = mReference; mReference = mDefault; @@ -448,19 +448,19 @@ public: Type type = Normal); /** @copydoc KConfigSkeletonItem::writeConfig(KConfig*) */ - void writeConfig(KConfig *config); + void writeConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ - void readConfig(KConfig *config); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */ - void setProperty(const QVariant &p); + void setProperty(const QVariant &p) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */ - bool isEqual(const QVariant &p) const; + bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::property() const */ - QVariant property() const; + QVariant property() const Q_DECL_OVERRIDE; private: Type mType; @@ -504,19 +504,19 @@ public: const QUrl &defaultValue = QUrl()); /** @copydoc KConfigSkeletonItem::writeConfig(KConfig*) */ - void writeConfig(KConfig *config); + void writeConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ - void readConfig(KConfig *config); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */ - void setProperty(const QVariant &p); + void setProperty(const QVariant &p) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */ - bool isEqual(const QVariant &p) const; + bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::property() const */ - QVariant property() const; + QVariant property() const Q_DECL_OVERRIDE; }; /** @@ -529,14 +529,14 @@ public: ItemProperty(const QString &_group, const QString &_key, QVariant &reference, const QVariant &defaultValue = QVariant()); - void readConfig(KConfig *config); - void setProperty(const QVariant &p); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; + void setProperty(const QVariant &p) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */ - bool isEqual(const QVariant &p) const; + bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::property() const */ - QVariant property() const; + QVariant property() const Q_DECL_OVERRIDE; }; /** @@ -550,16 +550,16 @@ public: bool defaultValue = true); /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ - void readConfig(KConfig *config); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */ - void setProperty(const QVariant &p); + void setProperty(const QVariant &p) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */ - bool isEqual(const QVariant &p) const; + bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::property() const */ - QVariant property() const; + QVariant property() const Q_DECL_OVERRIDE; }; /** @@ -573,22 +573,22 @@ public: qint32 defaultValue = 0); /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ - void readConfig(KConfig *config); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */ - void setProperty(const QVariant &p); + void setProperty(const QVariant &p) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */ - bool isEqual(const QVariant &p) const; + bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::property() */ - QVariant property() const; + QVariant property() const Q_DECL_OVERRIDE; /** Get the minimum value that is allowed to be stored in this item */ - QVariant minValue() const; + QVariant minValue() const Q_DECL_OVERRIDE; /** Get the maximum value this is allowed to be stored in this item */ - QVariant maxValue() const; + QVariant maxValue() const Q_DECL_OVERRIDE; /** Set the minimum value for the item @sa minValue() @@ -618,22 +618,22 @@ public: qint64 defaultValue = 0); /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ - void readConfig(KConfig *config); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */ - void setProperty(const QVariant &p); + void setProperty(const QVariant &p) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */ - bool isEqual(const QVariant &p) const; + bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::property() */ - QVariant property() const; + QVariant property() const Q_DECL_OVERRIDE; /** @copydoc ItemInt::minValue() */ - QVariant minValue() const; + QVariant minValue() const Q_DECL_OVERRIDE; /** @copydoc ItemInt::maxValue() */ - QVariant maxValue() const; + QVariant maxValue() const Q_DECL_OVERRIDE; /** @copydoc ItemInt::setMinValue(qint32) */ void setMinValue(qint64); @@ -673,10 +673,10 @@ public: QList<Choice> choices() const; /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ - void readConfig(KConfig *config); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::writeConfig(KConfig*) */ - void writeConfig(KConfig *config); + void writeConfig(KConfig *config) Q_DECL_OVERRIDE; // Source compatibility with 4.x typedef Choice Choice2; @@ -697,22 +697,22 @@ public: quint32 &reference, quint32 defaultValue = 0); /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ - void readConfig(KConfig *config); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */ - void setProperty(const QVariant &p); + void setProperty(const QVariant &p) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */ - bool isEqual(const QVariant &p) const; + bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::property() */ - QVariant property() const; + QVariant property() const Q_DECL_OVERRIDE; /** @copydoc ItemInt::minValue() */ - QVariant minValue() const; + QVariant minValue() const Q_DECL_OVERRIDE; /** @copydoc ItemInt::maxValue() */ - QVariant maxValue() const; + QVariant maxValue() const Q_DECL_OVERRIDE; /** @copydoc ItemInt::setMinValue(qint32) */ void setMinValue(quint32); @@ -738,22 +738,22 @@ public: quint64 defaultValue = 0); /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ - void readConfig(KConfig *config); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */ - void setProperty(const QVariant &p); + void setProperty(const QVariant &p) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */ - bool isEqual(const QVariant &p) const; + bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::property() */ - QVariant property() const; + QVariant property() const Q_DECL_OVERRIDE; /** @copydoc ItemInt::minValue() */ - QVariant minValue() const; + QVariant minValue() const Q_DECL_OVERRIDE; /** @copydoc ItemInt::maxValue() */ - QVariant maxValue() const; + QVariant maxValue() const Q_DECL_OVERRIDE; /** @copydoc ItemInt::setMinValue(qint32) */ void setMinValue(quint64); @@ -782,22 +782,22 @@ public: double &reference, double defaultValue = 0); /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ - void readConfig(KConfig *config); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */ - void setProperty(const QVariant &p); + void setProperty(const QVariant &p) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */ - bool isEqual(const QVariant &p) const; + bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::property() */ - QVariant property() const; + QVariant property() const Q_DECL_OVERRIDE; /** @copydoc ItemInt::minValue() */ - QVariant minValue() const; + QVariant minValue() const Q_DECL_OVERRIDE; /** @copydoc ItemInt::maxValue() */ - QVariant maxValue() const; + QVariant maxValue() const Q_DECL_OVERRIDE; /** @copydoc ItemInt::setMinValue() */ void setMinValue(double); @@ -823,16 +823,16 @@ public: const QRect &defaultValue = QRect()); /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ - void readConfig(KConfig *config); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */ - void setProperty(const QVariant &p); + void setProperty(const QVariant &p) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */ - bool isEqual(const QVariant &p) const; + bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::property() */ - QVariant property() const; + QVariant property() const Q_DECL_OVERRIDE; }; /** @@ -846,16 +846,16 @@ public: const QPoint &defaultValue = QPoint()); /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ - void readConfig(KConfig *config); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */ - void setProperty(const QVariant &p); + void setProperty(const QVariant &p) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */ - bool isEqual(const QVariant &p) const; + bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::property() */ - QVariant property() const; + QVariant property() const Q_DECL_OVERRIDE; }; /** @@ -869,16 +869,16 @@ public: const QSize &defaultValue = QSize()); /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ - void readConfig(KConfig *config); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */ - void setProperty(const QVariant &p); + void setProperty(const QVariant &p) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */ - bool isEqual(const QVariant &p) const; + bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::property() */ - QVariant property() const; + QVariant property() const Q_DECL_OVERRIDE; }; /** @@ -893,16 +893,16 @@ public: const QDateTime &defaultValue = QDateTime()); /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ - void readConfig(KConfig *config); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */ - void setProperty(const QVariant &p); + void setProperty(const QVariant &p) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */ - bool isEqual(const QVariant &p) const; + bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::property() */ - QVariant property() const; + QVariant property() const Q_DECL_OVERRIDE; }; /** @@ -917,16 +917,16 @@ public: const QStringList &defaultValue = QStringList()); /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ - void readConfig(KConfig *config); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */ - void setProperty(const QVariant &p); + void setProperty(const QVariant &p) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */ - bool isEqual(const QVariant &p) const; + bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::property() */ - QVariant property() const; + QVariant property() const Q_DECL_OVERRIDE; }; /** @@ -941,9 +941,9 @@ public: const QStringList &defaultValue = QStringList()); /** @copydoc KConfigSkeletonItem::readConfig */ - void readConfig(KConfig *config); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::writeConfig */ - void writeConfig(KConfig *config); + void writeConfig(KConfig *config) Q_DECL_OVERRIDE; }; /** @@ -958,19 +958,19 @@ public: const QList<QUrl> &defaultValue = QList<QUrl>()); /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ - void readConfig(KConfig *config); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::writeConfig(KConfig*) */ - void writeConfig(KConfig *config); + void writeConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */ - void setProperty(const QVariant &p); + void setProperty(const QVariant &p) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */ - bool isEqual(const QVariant &p) const; + bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::property() */ - QVariant property() const; + QVariant property() const Q_DECL_OVERRIDE; }; /** @@ -985,16 +985,16 @@ public: const QList < int > &defaultValue = QList < int >()); /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ - void readConfig(KConfig *config); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */ - void setProperty(const QVariant &p); + void setProperty(const QVariant &p) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) const */ - bool isEqual(const QVariant &p) const; + bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::property() */ - QVariant property() const; + QVariant property() const Q_DECL_OVERRIDE; }; public: diff --git a/src/core/ksharedconfig.h b/src/core/ksharedconfig.h index b2317afd..d0791e46 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); - virtual const KConfigGroup groupImpl(const QByteArray &aGroup) const; + virtual KConfigGroup groupImpl(const QByteArray &aGroup) Q_DECL_OVERRIDE; + virtual const KConfigGroup groupImpl(const QByteArray &aGroup) const Q_DECL_OVERRIDE; KSharedConfig(const QString &file, OpenFlags mode, QStandardPaths::StandardLocation resourceType); diff --git a/src/gui/kconfigloader.h b/src/gui/kconfigloader.h index aadb19a5..341bdc4f 100644 --- a/src/gui/kconfigloader.h +++ b/src/gui/kconfigloader.h @@ -169,7 +169,7 @@ protected: /** * Hack used to force writing when no default exists in config file. */ - bool usrWriteConfig(); + bool usrWriteConfig() Q_DECL_OVERRIDE; private: ConfigLoaderPrivate *const d; diff --git a/src/gui/kconfigloaderhandler_p.h b/src/gui/kconfigloaderhandler_p.h index 1c7c5a1d..d936b3be 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); + const QString &qName, const QXmlAttributes &atts) Q_DECL_OVERRIDE; bool endElement(const QString &namespaceURI, const QString &localName, - const QString &qName); - bool characters(const QString &ch); + const QString &qName) Q_DECL_OVERRIDE; + bool characters(const QString &ch) Q_DECL_OVERRIDE; QString name() const; void setName(const QString &name); diff --git a/src/gui/kconfigskeleton.h b/src/gui/kconfigskeleton.h index 4cd8d140..6990a870 100644 --- a/src/gui/kconfigskeleton.h +++ b/src/gui/kconfigskeleton.h @@ -53,16 +53,16 @@ public: const QColor &defaultValue = QColor(128, 128, 128)); /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ - void readConfig(KConfig *config); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */ - void setProperty(const QVariant &p); + void setProperty(const QVariant &p) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) */ - bool isEqual(const QVariant &p) const; + bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::property() */ - QVariant property() const; + QVariant property() const Q_DECL_OVERRIDE; }; /** @@ -76,16 +76,16 @@ public: const QFont &defaultValue = QFont()); /** @copydoc KConfigSkeletonItem::readConfig(KConfig*) */ - void readConfig(KConfig *config); + void readConfig(KConfig *config) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::setProperty(const QVariant&) */ - void setProperty(const QVariant &p); + void setProperty(const QVariant &p) Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::isEqual(const QVariant &) */ - bool isEqual(const QVariant &p) const; + bool isEqual(const QVariant &p) const Q_DECL_OVERRIDE; /** @copydoc KConfigSkeletonItem::property() */ - QVariant property() const; + QVariant property() const Q_DECL_OVERRIDE; }; public: |