Move the UTF conversion methods to qstringconverter

Separate them from the qutfcodec, so that the codec
can later on be moved out of Qt Core.

Fix the QUtf methods to take qsizetype instead of int
for length arguments.

This also makes it possible to not build QTextCodec into
the bootstrap lib anymore.

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

4 files changed, 10 insertions, 10 deletions

diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt
index d724b44d59..fa7d50f234 100644
--- a/qmake/CMakeLists.txt
+++ b/qmake/CMakeLists.txt
@@ -40,7 +40,6 @@ qt_add_tool(qmake # special case
         ../src/3rdparty/pcre2/src/pcre2_ucp.h
         ../src/3rdparty/pcre2/src/pcre2_valid_utf.c
         ../src/3rdparty/pcre2/src/pcre2_xclass.c
-        ../src/corelib/codecs/qutfcodec.cpp ../src/corelib/codecs/qutfcodec_p.h
         ../src/corelib/global/qendian.cpp # special case
         ../src/corelib/global/qglobal.cpp ../src/corelib/global/qglobal.h
         ../src/corelib/global/qlibraryinfo.cpp
@@ -105,6 +104,7 @@ qt_add_tool(qmake # special case
         ../src/corelib/tools/qringbuffer.cpp # special case
         ../src/corelib/text/qstring.cpp ../src/corelib/text/qstring.h
         ../src/corelib/text/qstringbuilder.cpp ../src/corelib/text/qstringbuilder.h
+        ../src/corelib/text/qstringconverter.cpp ../src/corelib/text/qstringconverter.h ../src/corelib/text/qstringconverter_p.h
         ../src/corelib/text/qstringlist.cpp ../src/corelib/text/qstringlist.h
         ../src/corelib/text/qstringmatcher.h
         ../src/corelib/tools/qvector.h
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index 98d255f2d5..c0b6704351 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -17,7 +17,6 @@ OBJS = \
 
 #qt code (please keep in order matching DEPEND_SRC)
 QOBJS = \
-	qutfcodec.o \
 	qendian.o qglobal.o qlogging.o qmalloc.o qnumeric.o qoperatingsystemversion.o qrandom.o \
 	qabstractfileengine.o qbuffer.o qdatastream.o qdebug.o \
 	qdir.o qdiriterator.o \
@@ -32,7 +31,7 @@ QOBJS = \
 	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 \
-	qstringbuilder.o qstring.o qstringlist.o qversionnumber.o \
+        qstringbuilder.o qstring.o qstringconverter.o qstringlist.o qversionnumber.o \
 	qvsnprintf.o qxmlstream.o qxmlutils.o \
         pcre2_auto_possess.o pcre2_chartables.o pcre2_compile.o pcre2_config.o \
         pcre2_context.o pcre2_dfa_match.o pcre2_error.o pcre2_extuni.o \
@@ -74,7 +73,6 @@ DEPEND_SRC = \
 	   $(QMKGENSRC)/win32/msvc_vcxproj.cpp \
 	   $(QMKGENSRC)/win32/winmakefile.cpp \
 	   $(QMKGENSRC)/xmloutput.cpp \
-	   $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp \
 	   $(SOURCE_PATH)/src/corelib/global/qendian.cpp \
 	   $(SOURCE_PATH)/src/corelib/global/qglobal.cpp \
 	   $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp \
@@ -122,6 +120,7 @@ DEPEND_SRC = \
 	   $(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 \
 	   $(SOURCE_PATH)/src/corelib/text/qstringlist.cpp \
 	   $(SOURCE_PATH)/src/corelib/text/qvsnprintf.cpp \
@@ -380,15 +379,15 @@ qoperatingsystemversion_darwin.o: $(SOURCE_PATH)/src/corelib/global/qoperatingsy
 qcore_foundation.o: $(SOURCE_PATH)/src/corelib/kernel/qcore_foundation.mm
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 
-qutfcodec.o: $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) $<
-
 qstring.o: $(SOURCE_PATH)/src/corelib/text/qstring.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 
 qstringbuilder.o: $(SOURCE_PATH)/src/corelib/text/qstringbuilder.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 
+qstringconverter.o: $(SOURCE_PATH)/src/corelib/text/qstringconverter.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) $<
+
 qlocale.o: $(SOURCE_PATH)/src/corelib/text/qlocale.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) $<
 
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index d3a85c17b2..df47dacd15 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -104,8 +104,8 @@ QTOBJS= \
 	qoperatingsystemversion_win.obj \
 	qregexp.obj \
 	qromancalendar.obj \
-	qutfcodec.obj \
 	qstring.obj \
+	qstringconverter.obj \
 	qstringlist.obj \
 	qstringbuilder.obj \
 	qsystemerror.obj \
diff --git a/qmake/qmake.pro b/qmake/qmake.pro
index 243f07ac2c..fcd1c17dcf 100644
--- a/qmake/qmake.pro
+++ b/qmake/qmake.pro
@@ -159,11 +159,11 @@ SOURCES += \
     qsettings.cpp \
     qstring.cpp \
     qstringbuilder.cpp \
+    qstringconverter.cpp \
     qstringlist.cpp \
     qsystemerror.cpp \
     qtemporaryfile.cpp \
     qtextstream.cpp \
-    qutfcodec.cpp \
     quuid.cpp \
     qvariant.cpp \
     qversionnumber.cpp \
@@ -217,12 +217,13 @@ HEADERS += \
     qromancalendar_p.h \
     qstring.h \
     qstringbuilder.h \
+    qstringconverter_p.h \
+    qstringconverter.h \
     qstringlist.h \
     qstringmatcher.h \
     qsystemerror_p.h \
     qtemporaryfile.h \
     qtextstream.h \
-    qutfcodec_p.h \
     quuid.h \
     qvector.h \
     qversionnumber.h \