From 87471e14b370fb0c7bc1854fbc646454d5df7ae9 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 24 Jan 2020 08:17:53 +0100 Subject: QXmlInputSource is deprecated in qt5.15. Port it to QXmlStreamReader Summary: QXmlInputSource is deprecated in qt5.15 Test Plan: autotest ok Reviewers: dfaure, apol Reviewed By: apol Subscribers: apol, kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D26890 --- src/gui/kconfigloaderhandler_p.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/gui/kconfigloaderhandler_p.h') diff --git a/src/gui/kconfigloaderhandler_p.h b/src/gui/kconfigloaderhandler_p.h index cae92495..fa313f5b 100644 --- a/src/gui/kconfigloaderhandler_p.h +++ b/src/gui/kconfigloaderhandler_p.h @@ -21,17 +21,20 @@ #ifndef KCONFIGLOADERHANDLER_P_H #define KCONFIGLOADERHANDLER_P_H -#include +#include -class ConfigLoaderHandler : public QXmlDefaultHandler +class ConfigLoaderHandler { public: ConfigLoaderHandler(KConfigLoader *config, ConfigLoaderPrivate *d); - bool startElement(const QString &namespaceURI, const QString &localName, - const QString &qName, const QXmlAttributes &atts) override; - bool endElement(const QString &namespaceURI, const QString &localName, - const QString &qName) override; - bool characters(const QString &ch) override; + + bool parse(QIODevice *input); + + bool startElement(const QStringRef &namespaceURI, const QStringRef &localName, + const QStringRef &qName, const QXmlStreamAttributes &atts); + bool endElement(const QStringRef &namespaceURI, const QStringRef &localName, + const QStringRef &qName); + bool characters(const QStringRef &ch); QString name() const; void setName(const QString &name); @@ -41,7 +44,7 @@ public: QString defaultValue() const; private: - virtual void addItem(); + void addItem(); void resetState(); KConfigLoader *m_config; -- cgit v1.2.1