QRegExp include cleanup

QRegExp includes can be found in several files where there's not even a
use of the class. This patch aims to avoid needless includes as well as
follow the "include only what you use" moto.

This patch removes a QRegExp include from the QStringList header which
means that there is likely going to be code breaking since QStringList
is used in many places and would get QRegExp in.

[ChangeLog][Potentially Source-Incompatible Changes] qstringlist.h no
longer includes qregexp.h.

Change-Id: I32847532f16e419d4cb735ddc11a26551127e923
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

qmake/generators/metamakefile.cpp

@@ -27,7 +27,6 @@
 ****************************************************************************/
 
 #include "metamakefile.h"
-#include "qregexp.h"
 #include "qdir.h"
 #include "qdebug.h"
 #include "makefile.h"

qmake/generators/unix/unixmake.cpp

@@ -28,7 +28,6 @@
 
 #include "unixmake.h"
 #include "option.h"
-#include <qregexp.h>
 #include <qfile.h>
 #include <qhash.h>
 #include <qdir.h>

qmake/generators/win32/msbuild_objectmodel.cpp

@@ -34,6 +34,7 @@
 #include <qscopedpointer.h>
 #include <qstringlist.h>
 #include <qfileinfo.h>
+#include <qregexp.h>
 
 QT_BEGIN_NAMESPACE
 

qmake/generators/win32/msvc_objectmodel.cpp

@@ -34,6 +34,7 @@
 
 #include <qscopedpointer.h>
 #include <qfileinfo.h>
+#include <qregexp.h>
 
 using namespace QMakeInternal;
 

qmake/library/ioutils.cpp

@@ -30,6 +30,7 @@
 
 #include <qdir.h>
 #include <qfile.h>
+#include <qregexp.h>
 
 #ifdef Q_OS_WIN
 #  include <windows.h>

qmake/library/qmakeevaluator_p.h

@@ -31,8 +31,6 @@
 
 #include "proitems.h"
 
-#include <qregexp.h>
-
 #define debugMsg if (!m_debugLevel) {} else debugMsgInternal
 #define traceMsg if (!m_debugLevel) {} else traceMsgInternal
 #ifdef PROEVALUATOR_DEBUG

qmake/library/qmakeglobals.cpp

@@ -38,7 +38,6 @@
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qlist.h>
-#include <qregexp.h>
 #include <qset.h>
 #include <qstack.h>
 #include <qstring.h>

src/corelib/io/qdiriterator.cpp

@@ -93,6 +93,7 @@
 #include "qdir_p.h"
 #include "qabstractfileengine_p.h"
 
+#include <QtCore/qregexp.h>
 #include <QtCore/qset.h>
 #include <QtCore/qstack.h>
 #include <QtCore/qvariant.h>

src/corelib/itemmodels/qabstractitemmodel.cpp

@@ -45,6 +45,7 @@
 #include <qmimedata.h>
 #include <qdebug.h>
 #include <qvector.h>
+#include <qregexp.h>
 #include <qstack.h>
 #include <qbitarray.h>
 #include <qdatetime.h>

src/corelib/kernel/qmetatype.cpp

@@ -51,6 +51,7 @@
 #include "quuid.h"
 #include "qvariant.h"
 #include "qdatastream.h"
+#include "qregexp.h"
 #include "qmetatypeswitcher_p.h"
 
 #if QT_CONFIG(regularexpression)

src/corelib/kernel/qvariant.cpp

@@ -55,6 +55,7 @@
 #include "qstringlist.h"
 #include "qurl.h"
 #include "qlocale.h"
+#include "qregexp.h"
 #include "quuid.h"
 #if QT_CONFIG(itemmodel)
 #include "qabstractitemmodel.h"

src/corelib/tools/qdatetimeparser.cpp

@@ -47,7 +47,6 @@
 #if QT_CONFIG(timezone)
 #include "qtimezone.h"
 #endif
-#include "qregexp.h"
 #include "qdebug.h"
 
 //#define QDATETIMEPARSER_DEBUG

src/corelib/tools/qstringlist.cpp

@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include <qstringlist.h>
+#include <qregexp.h>
 #include <qset.h>
 #if QT_CONFIG(regularexpression)
 #  include <qregularexpression.h>

src/gui/image/qpicture.cpp

@@ -54,6 +54,7 @@
 #include "qpainter.h"
 #include "qpainterpath.h"
 #include "qpixmap.h"
+#include "qregexp.h"
 #include "qregion.h"
 #include "qdebug.h"
 

src/gui/image/qxbmhandler.cpp

@@ -44,6 +44,7 @@
 
 #include <qimage.h>
 #include <qiodevice.h>
+#include <qregexp.h>
 #include <qvariant.h>
 
 #include <stdio.h>

src/gui/image/qxpmhandler.cpp

@@ -45,6 +45,7 @@
 #include <qbytearraymatcher.h>
 #include <qimage.h>
 #include <qmap.h>
+#include <qregexp.h>
 #include <qtextstream.h>
 #include <qvariant.h>
 

src/gui/kernel/qkeysequence.cpp

@@ -46,9 +46,6 @@
 
 #include "qdebug.h"
 #include <QtCore/qhashfunctions.h>
-#ifndef QT_NO_REGEXP
-# include "qregexp.h"
-#endif
 #ifndef QT_NO_DATASTREAM
 # include "qdatastream.h"
 #endif

src/gui/kernel/qsimpledrag.cpp

@@ -48,7 +48,6 @@
 #include "qpoint.h"
 #include "qbuffer.h"
 #include "qimage.h"
-#include "qregexp.h"
 #include "qdir.h"
 #include "qimagereader.h"
 #include "qimagewriter.h"

src/network/access/qnetworkcookie.cpp

@@ -46,6 +46,7 @@
 #include "QtCore/qdebug.h"
 #include "QtCore/qlist.h"
 #include "QtCore/qlocale.h"
+#include <QtCore/qregexp.h>
 #include "QtCore/qstring.h"
 #include "QtCore/qstringlist.h"
 #include "QtCore/qurl.h"

src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft.cpp

@@ -48,7 +48,11 @@
 #include <QtCore/QDir>
 #include <QtCore/QDirIterator>
 #include <QtCore/QSettings>
+#if QT_CONFIG(regularexpression)
 #include <QtCore/QRegularExpression>
+#else
+#include <QtCore/QRegExp>
+#endif
 #include <QtGui/QGuiApplication>
 #include <QtGui/QFontDatabase>
 

src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm

@@ -51,7 +51,6 @@
 #include "qt_mac_p.h"
 #include "qcocoahelpers.h"
 #include "qcocoaeventdispatcher.h"
-#include <qregexp.h>
 #include <qbuffer.h>
 #include <qdebug.h>
 #include <qstringlist.h>

src/plugins/platforms/cocoa/qcocoamenuitem.mm

@@ -53,6 +53,7 @@
 #include <QtGui/private/qcoregraphics_p.h>
 
 #include <QtCore/QDebug>
+#include <QtCore/QRegExp>
 
 QT_BEGIN_NAMESPACE
 

src/plugins/sqldrivers/sqlite2/qsql_sqlite2.cpp

@@ -43,7 +43,6 @@
 #include <qvariant.h>
 #include <qdatetime.h>
 #include <qfile.h>
-#include <qregexp.h>
 #include <qsqlerror.h>
 #include <qsqlfield.h>
 #include <qsqlindex.h>

src/sql/kernel/qsqlresult.cpp

@@ -41,7 +41,6 @@
 
 #include "qvariant.h"
 #include "qhash.h"
-#include "qregexp.h"
 #include "qsqlerror.h"
 #include "qsqlfield.h"
 #include "qsqlrecord.h"

src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp

@@ -32,7 +32,6 @@
 #include <qfile.h>
 #include <qlist.h>
 #include <qbuffer.h>
-#include <qregexp.h>
 #include <qvector.h>
 #include <qdebug.h>
 

src/tools/rcc/rcc.cpp

@@ -37,6 +37,7 @@
 #include <qfile.h>
 #include <qiodevice.h>
 #include <qlocale.h>
+#include <qregexp.h>
 #include <qstack.h>
 #include <qxmlstream.h>
 

src/tools/tracegen/etw.cpp

@@ -45,7 +45,6 @@
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
-#include <qregexp.h>
 #include <quuid.h>
 
 static inline QString providerVar(const QString &providerName)

src/tools/tracegen/lttng.cpp

@@ -46,7 +46,6 @@
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qtextstream.h>
-#include <qregexp.h>
 #include <qdebug.h>
 
 static void writeCtfMacro(QTextStream &stream, const Tracepoint::Field &field)

src/widgets/dialogs/qcolordialog.cpp

@@ -57,6 +57,11 @@
 #include "qpainter.h"
 #include "qpixmap.h"
 #include "qpushbutton.h"
+#if QT_CONFIG(regularexpression)
+#include <qregularexpression.h>
+#else
+#include <qregexp.h>
+#endif
 #if QT_CONFIG(settings)
 #include "qsettings.h"
 #endif

tests/auto/other/lancelot/paintcommands.h

@@ -37,6 +37,7 @@
 #include <qpixmap.h>
 #include <qbrush.h>
 #include <qhash.h>
+#include <qregexp.h>
 
 QT_FORWARD_DECLARE_CLASS(QPainter)
 #ifndef QT_NO_OPENGL

tests/baselineserver/shared/baselineprotocol.cpp

@@ -38,6 +38,7 @@
 #include <QDir>
 #include <QTime>
 #include <QPointer>
+#include <QRegExp>
 
 const QString PI_Project(QLS("Project"));
 const QString PI_TestCase(QLS("TestCase"));