From 28ddbf8138c865e19e8836b49af74f9d3bc20401 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Thu, 12 Feb 2015 00:17:57 +0100 Subject: Use Q_DECL_OVERRIDE where possible With -Winconsistent-missing-override (Clang), headers from KConfig are throwing a lot of warnings. REVIEW: 122539 --- src/gui/kconfigloader.h | 2 +- src/gui/kconfigloaderhandler_p.h | 6 +++--- src/gui/kconfigskeleton.h | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/gui') 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: -- cgit v1.2.1