Move QRegExp and its remaining mentions out of QtCore

Task-number: QTBUG-85235 Change-Id: Ibd6c98d952c1bb9916b64715c6430fb0d3fe3843 Reviewed-by: Lars Knoll <[email protected]>
fwcd · Jul 13, 2020 · 361dc07 · 361dc07
1 parent ac14858
commit 361dc07
Show file tree

Hide file tree

Showing 31 changed files with 5 additions and 7,906 deletions.
diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt
@@ -77,7 +77,6 @@ qt_add_tool(${target_name}
         ../src/corelib/text/qchar.h
         ../src/corelib/text/qlocale.cpp ../src/corelib/text/qlocale.h
         ../src/corelib/text/qlocale_tools.cpp ../src/corelib/text/qlocale_tools_p.h
-        ../src/corelib/text/qregexp.cpp ../src/corelib/text/qregexp.h
         ../src/corelib/text/qregularexpression.cpp ../src/corelib/text/qregularexpression.h
         ../src/corelib/text/qstring.cpp ../src/corelib/text/qstring.h
         ../src/corelib/text/qstringbuilder.cpp ../src/corelib/text/qstringbuilder.h

diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt
@@ -85,7 +85,6 @@ qt_add_tool(${target_name}
         ../src/corelib/text/qchar.h
         ../src/corelib/text/qlocale.cpp ../src/corelib/text/qlocale.h
         ../src/corelib/text/qlocale_tools.cpp ../src/corelib/text/qlocale_tools_p.h
-        ../src/corelib/text/qregexp.cpp ../src/corelib/text/qregexp.h
         ../src/corelib/text/qregularexpression.cpp ../src/corelib/text/qregularexpression.h
         ../src/corelib/text/qstring.cpp ../src/corelib/text/qstring.h
         ../src/corelib/text/qstringbuilder.cpp ../src/corelib/text/qstringbuilder.h
@@ -114,7 +113,6 @@ qt_add_tool(${target_name}
         ../src/corelib/text/qlocale.cpp ../src/corelib/text/qlocale.h
         ../src/corelib/text/qlocale_tools.cpp ../src/corelib/text/qlocale_tools_p.h
         ../src/corelib/tools/qmap.cpp ../src/corelib/tools/qmap.h
-        ../src/corelib/text/qregexp.cpp ../src/corelib/text/qregexp.h
         ../src/corelib/text/qregularexpression.cpp ../src/corelib/text/qregularexpression.h
         ../src/corelib/tools/qringbuffer.cpp # special case
         ../src/corelib/text/qstring.cpp ../src/corelib/text/qstring.h

diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
@@ -30,7 +30,7 @@ QOBJS = \
 	qarraydata.o qbitarray.o qbytearray.o qbytearraylist.o qbytearraymatcher.o \
 	qcalendar.o qgregoriancalendar.o qromancalendar.o \
         qcryptographichash.o qdatetime.o qhash.o \
-        qlocale.o qlocale_tools.o qmap.o qregularexpression.o qregexp.o qringbuffer.o \
+        qlocale.o qlocale_tools.o qmap.o qregularexpression.o qringbuffer.o \
         qstringbuilder.o qstring.o qstringconverter.o qstringlist.o qversionnumber.o \
 	qvsnprintf.o \
         pcre2_auto_possess.o pcre2_chartables.o pcre2_compile.o pcre2_config.o \
@@ -116,7 +116,6 @@ DEPEND_SRC = \
 	   $(SOURCE_PATH)/src/corelib/text/qlocale.cpp \
 	   $(SOURCE_PATH)/src/corelib/text/qlocale_tools.cpp \
 	   $(SOURCE_PATH)/src/corelib/text/qregularexpression.cpp \
-	   $(SOURCE_PATH)/src/corelib/text/qregexp.cpp \
 	   $(SOURCE_PATH)/src/corelib/text/qstringbuilder.cpp \
 	   $(SOURCE_PATH)/src/corelib/text/qstringconverter.cpp \
 	   $(SOURCE_PATH)/src/corelib/text/qstring.cpp \
@@ -449,9 +448,6 @@ qtemporaryfile.o: $(SOURCE_PATH)/src/corelib/io/qtemporaryfile.cpp
 qregularexpression.o: $(SOURCE_PATH)/src/corelib/text/qregularexpression.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 
-qregexp.o: $(SOURCE_PATH)/src/corelib/text/qregexp.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $<
-
 qbitarray.o: $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 

diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
@@ -102,7 +102,6 @@ QTOBJS= \
 	qmap.obj \
 	qoperatingsystemversion.obj \
 	qoperatingsystemversion_win.obj \
-	qregexp.obj \
 	qromancalendar.obj \
 	qstring.obj \
 	qstringconverter.obj \

diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc
@@ -3535,7 +3535,8 @@
     \section2 re_escape(string)
 
     Returns the \c string with every special regular expression character
-    escaped with a backslash. This function is a wrapper around QRegExp::escape.
+    escaped with a backslash. This function is a wrapper around
+    QRegularExpression::escape.
 
     \section2 read_registry(tree, key[, flag])
 

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
@@ -41,7 +41,6 @@
 #include <qdebug.h>
 #include <qbuffer.h>
 #include <qdatetime.h>
-#include <qregexp.h>
 
 #if defined(Q_OS_UNIX)
 #include <unistd.h>

diff --git a/qmake/main.cpp b/qmake/main.cpp
@@ -110,7 +110,7 @@ static int doSed(int argc, char **argv)
                         && (c == QLatin1Char('+') || c == QLatin1Char('?') || c == QLatin1Char('|')
                             || c == QLatin1Char('{') || c == QLatin1Char('}')
                             || c == QLatin1Char('(') || c == QLatin1Char(')'))) {
-                        // translate sed rx to QRegExp
+                        // translate sed rx to QRegularExpression
                         escaped ^= 1;
                     }
                     if (escaped) {

diff --git a/qmake/qmake.pro b/qmake/qmake.pro
@@ -152,7 +152,6 @@ SOURCES += \
     qmap.cpp \
     qmetatype.cpp \
     qnumeric.cpp \
-    qregexp.cpp \
     qregularexpression.cpp \
     qromancalendar.cpp \
     qsettings.cpp \
@@ -209,7 +208,6 @@ HEADERS += \
     qmap.h \
     qmetatype.h \
     qnumeric.h \
-    qregexp.h \
     qregularexpression.h \
     qromancalendar_p.h \
     qstring.h \

diff --git a/qmake/qmake_pch.h b/qmake/qmake_pch.h
@@ -52,7 +52,6 @@
 #include <qhash.h>
 #include <time.h>
 #include <stdlib.h>
-#include <qregexp.h>
 
 //#include <qdir.h>
 //#include "option.h"

diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
@@ -145,7 +145,6 @@ qt_add_module(Core
         text/qlocale.cpp text/qlocale.h text/qlocale_p.h
         text/qlocale_data_p.h
         text/qlocale_tools.cpp text/qlocale_tools_p.h
-        text/qregexp.cpp text/qregexp.h
         text/qstring.cpp text/qstring.h
         text/qstring_compat.cpp
         text/qstringalgorithms.h text/qstringalgorithms_p.h

diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
@@ -164,7 +164,6 @@ qt_add_module(Core
         text/qlocale.cpp text/qlocale.h text/qlocale_p.h
         text/qlocale_data_p.h
         text/qlocale_tools.cpp text/qlocale_tools_p.h
-        text/qregexp.cpp text/qregexp.h
         text/qstring.cpp text/qstring.h
         text/qstring_compat.cpp
         text/qstringalgorithms.h text/qstringalgorithms_p.h

diff --git a/src/corelib/doc/snippets/code/src_corelib_text_qregexp.cpp b/src/corelib/doc/snippets/code/src_corelib_text_qregexp.cpp