diff options
| author | Samuel Gaist <samuel.gaist@idiap.ch> | 2018-09-27 00:19:49 +0200 |
|---|---|---|
| committer | Samuel Gaist <samuel.gaist@idiap.ch> | 2019-04-19 21:21:17 +0000 |
| commit | e2906ea5c4b97ca9bb4ebf9710207097c44cc8ce (patch) | |
| tree | d8d2abe5451dd78f25d12ba3b69ddaba55aa24a1 /src/gui | |
| parent | 642ef0c7311e18b9b4414af6ec3a2d8210bb6880 (diff) | |
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>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qpicture.cpp | 1 | ||||
| -rw-r--r-- | src/gui/image/qxbmhandler.cpp | 1 | ||||
| -rw-r--r-- | src/gui/image/qxpmhandler.cpp | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qkeysequence.cpp | 3 | ||||
| -rw-r--r-- | src/gui/kernel/qsimpledrag.cpp | 1 |
5 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index 56b82abcfa..350fda19ac 100644 --- a/src/gui/image/qpicture.cpp +++ b/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" diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp index 65a5b63bc7..3cd15b3e4d 100644 --- a/src/gui/image/qxbmhandler.cpp +++ b/src/gui/image/qxbmhandler.cpp @@ -44,6 +44,7 @@ #include <qimage.h> #include <qiodevice.h> +#include <qregexp.h> #include <qvariant.h> #include <stdio.h> diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp index a32dfda96d..7349a400a6 100644 --- a/src/gui/image/qxpmhandler.cpp +++ b/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> diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 0fa3dcfbdb..8688bb8403 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/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 diff --git a/src/gui/kernel/qsimpledrag.cpp b/src/gui/kernel/qsimpledrag.cpp index 9aab332ef5..bba2a863a9 100644 --- a/src/gui/kernel/qsimpledrag.cpp +++ b/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" |