From e83247a2b96e657b43d86df93b5e67d9f5d63d99 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sun, 12 Mar 2017 22:43:04 +0100 Subject: [PATCH] Do not assume QStringRef(const QString*) to be implicit It won't be for very much longer. Change-Id: I30e3e0cd8c8ecf0833f759557382a3ded7bdea34 Reviewed-by: Edward Welbourne Reviewed-by: Thiago Macieira --- src/corelib/tools/qdatetime.cpp | 2 +- src/corelib/tools/qlocale.cpp | 2 +- src/corelib/xml/qxmlutils_p.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index e9f740b7c5..a4a7aabacb 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -1971,7 +1971,7 @@ QTime QTime::fromString(const QString& string, Qt::DateFormat format) case Qt::ISODateWithMs: case Qt::TextDate: default: - return fromIsoTimeString(&string, format, 0); + return fromIsoTimeString(QStringRef(&string), format, 0); } } diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 47d64c0df6..59952bd107 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -972,7 +972,7 @@ QLocale::NumberOptions QLocale::numberOptions() const */ QString QLocale::quoteString(const QString &str, QuotationStyle style) const { - return quoteString(&str, style); + return quoteString(QStringRef(&str), style); } /*! diff --git a/src/corelib/xml/qxmlutils_p.h b/src/corelib/xml/qxmlutils_p.h index d8d25e0efe..6db347b3ee 100644 --- a/src/corelib/xml/qxmlutils_p.h +++ b/src/corelib/xml/qxmlutils_p.h @@ -73,7 +73,7 @@ public: static bool isNameChar(const QChar c); static bool isLetter(const QChar c); static bool isNCName(const QStringRef &ncName); - static inline bool isNCName(const QString &ncName) { return isNCName(&ncName); } + static inline bool isNCName(const QString &ncName) { return isNCName(QStringRef(&ncName)); } static bool isPublicID(const QString &candidate); private: