From 164392548e3e1c7526d4eef4896748ef5162cf2d Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sat, 22 Apr 2017 00:03:55 +0200 Subject: Disentangle string-related headers It's starting to hinder QStringView development (QString::append(QStringView), e.g.). - qbytearray.h includes qstring.h, but is included by qstring.h -> remove qstring.h include from qbytearray.h - the QStringLiteral definition is used from both qstring.h and qstringview.h -> extract into its own header, move QStringViewLiteral definition there, too - the qCompareStrings(), qConvertTo*() functions are used by QString and QStringView -> also extract into own header, included from qstring.h and qstringview.h - QStringView::toString() depends on QString, which depends on QStringView -> move QStringView::toString() definition to qstring.h, after the definition of QString -> move qstringview.h up to all the other includes in qstring.h This is starting to look like a DAG again, and allows to remove the unholy #ifndef QSTRING_H # include #endif hack from qstringview.h. [ChangeLog][Potentially Source-Incompatible Changes][QByteArray] qbytearray.h no longer includes qstring.h. In particular, this means that in order to use QStringBuilder with QByteArray, you need to include both qbytearray.h and qstring.h now (or and , resp.). Change-Id: I7f8acf9c11bc1731266cd25c6eda9fb36723f364 Reviewed-by: Anton Kudryavtsev Reviewed-by: Edward Welbourne --- src/corelib/tools/tools.pri | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/corelib/tools/tools.pri') diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 8dd3550617..3d6cc97205 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -57,10 +57,12 @@ HEADERS += \ tools/qsize.h \ tools/qstack.h \ tools/qstring.h \ + tools/qstringalgorithms.h \ tools/qstringalgorithms_p.h \ tools/qstringbuilder.h \ tools/qstringiterator_p.h \ tools/qstringlist.h \ + tools/qstringliteral.h \ tools/qstringmatcher.h \ tools/qstringview.h \ tools/qtextboundaryfinder.h \ -- cgit v1.2.3