From e6077c30d14e9d662e8843c554db86c0d366d0b6 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 6 Jun 2024 13:44:12 +0900 Subject: Rename str nt* related files to equivalent tq* Signed-off-by: Michele Calgaro --- qmake/Makefile.unix | 16 ++++++++-------- qmake/Makefile.win32-g++ | 12 ++++++------ qmake/generators/win32/msvc_objectmodel.cpp | 2 +- qmake/generators/win32/msvc_objectmodel.h | 4 ++-- qmake/generators/win32/msvc_vcproj.cpp | 2 +- qmake/generators/win32/winmakefile.cpp | 4 ++-- qmake/meta.h | 4 ++-- qmake/option.h | 4 ++-- qmake/project.h | 4 ++-- qmake/property.cpp | 2 +- qmake/property.h | 2 +- qmake/qtmd5.cpp | 2 +- qmake/qtmd5.h | 2 +- 13 files changed, 30 insertions(+), 30 deletions(-) (limited to 'qmake') diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 51042f19d..4b772cb49 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -5,10 +5,10 @@ OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o msvc_objectmodel.o meta.o qtmd5.o #qt code -QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \ +QOBJS=tqstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \ qdatastream.o qgarray.o qbuffer.o qglist.o tqptrcollection.o qfile.o \ qfile_unix.o qregexp.o qgvector.o qgcache.o qbitarray.o qdir.o quuid.o \ - qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o tqmap.o \ + qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o tqstringlist.o tqmap.o \ qconfig.o qunicodetables.o qsettings.o qlocale.o @QMAKE_QTOBJS@ #all sources, used for the depend target @@ -16,7 +16,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makef generators/unix/unixmake.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \ generators/win32/winmakefile.cpp generators/projectgenerator.cpp generators/mac/metrowerks_xml.cpp \ generators/mac/pbuilder_pbx.cpp generators/win32/msvc_objectmodel.cpp \ - @SOURCE_PATH@/src/tools/qstring.cpp @SOURCE_PATH@/src/tools/qtextstream.cpp \ + @SOURCE_PATH@/src/tools/tqstring.cpp @SOURCE_PATH@/src/tools/qtextstream.cpp \ @SOURCE_PATH@/src/tools/qiodevice.cpp @SOURCE_PATH@/src/tools/qglobal.cpp \ @SOURCE_PATH@/src/tools/qgdict.cpp @SOURCE_PATH@/src/tools/qcstring.cpp \ @SOURCE_PATH@/src/tools/qdatastream.cpp @SOURCE_PATH@/src/tools/qgarray.cpp \ @@ -27,7 +27,7 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makef @SOURCE_PATH@/src/tools/qbitarray.cpp @SOURCE_PATH@/src/tools/qdir.cpp \ @SOURCE_PATH@/src/tools/quuid.cpp @SOURCE_PATH@/src/tools/qfileinfo_unix.cpp \ @SOURCE_PATH@/src/tools/qdir_unix.cpp @SOURCE_PATH@/src/tools/qfileinfo.cpp \ - @SOURCE_PATH@/src/tools/qdatetime.cpp @SOURCE_PATH@/src/tools/qstringlist.cpp \ + @SOURCE_PATH@/src/tools/qdatetime.cpp @SOURCE_PATH@/src/tools/tqstringlist.cpp \ @SOURCE_PATH@/src/tools/tqmap.cpp @SOURCE_PATH@/src/tools/qconfig.cpp \ @SOURCE_PATH@/src/tools/qsettings.cpp @SOURCE_PATH@/src/tools/qurl.cpp \ @SOURCE_PATH@/src/tools/qsettings_mac.cpp @SOURCE_PATH@/src/tools/qlocale.cpp @@ -84,8 +84,8 @@ qsettings_mac.o: @SOURCE_PATH@/src/tools/qsettings_mac.cpp qurl.o: @SOURCE_PATH@/src/kernel/qurl.cpp $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/kernel/qurl.cpp -qstring.o: @SOURCE_PATH@/src/tools/qstring.cpp - $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qstring.cpp +tqstring.o: @SOURCE_PATH@/src/tools/tqstring.cpp + $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqstring.cpp qlocale.o: @SOURCE_PATH@/src/tools/qlocale.cpp $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qlocale.cpp @@ -144,8 +144,8 @@ qfileinfo.o: @SOURCE_PATH@/src/tools/qfileinfo.cpp qdatetime.o: @SOURCE_PATH@/src/tools/qdatetime.cpp $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qdatetime.cpp -qstringlist.o: @SOURCE_PATH@/src/tools/qstringlist.cpp - $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qstringlist.cpp +tqstringlist.o: @SOURCE_PATH@/src/tools/tqstringlist.cpp + $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqstringlist.cpp tqmap.o: @SOURCE_PATH@/src/tools/tqmap.cpp $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqmap.cpp diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index f961f6118..64ffb38cf 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -19,10 +19,10 @@ OBJS=project.o main.o makefile.o unixmake.o unixmake2.o borland_bmake.o mingw_ma metrowerks_xml.o pbuilder_pbx.o msvc_objectmodel.o property.o meta.o qtmd5.o #qt code -QTOBJS=qstring.o quuid.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o qdatastream.o \ +QTOBJS=tqstring.o quuid.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o qdatastream.o \ qgarray.o qbuffer.o qglist.o tqptrcollection.o qfile.o qfile_win.o qregexp.o qgvector.o \ qgcache.o qbitarray.o qdir.o qfileinfo_win.o qdir_win.o qfileinfo.o qdatetime.o \ - qstringlist.o tqmap.o qlibrary.o qlibrary_win.o qconfig.o qsettings.o qsettings_win.o qunicodetables.o \ + tqstringlist.o tqmap.o qlibrary.o qlibrary_win.o qconfig.o qsettings.o qsettings_win.o qunicodetables.o \ qlocale.o @@ -67,8 +67,8 @@ qgdict.o: ..\src\tools\qgdict.cpp qcstring.o: ..\src\tools\qcstring.cpp $(CXX) $(CXXFLAGS) ..\src\tools\qcstring.cpp -qstring.o: ..\src\tools\qstring.cpp - $(CXX) $(CXXFLAGS) ..\src\tools\qstring.cpp +tqstring.o: ..\src\tools\tqstring.cpp + $(CXX) $(CXXFLAGS) ..\src\tools\tqstring.cpp qlocale.o: ..\src\tools\qlocale.cpp $(CXX) $(CXXFLAGS) ..\src\tools\qlocale.cpp @@ -133,8 +133,8 @@ qfileinfo.o: ..\src\tools\qfileinfo.cpp qdatetime.o: ..\src\tools\qdatetime.cpp $(CXX) $(CXXFLAGS) ..\src\tools\qdatetime.cpp -qstringlist.o: ..\src\tools\qstringlist.cpp - $(CXX) $(CXXFLAGS) ..\src\tools\qstringlist.cpp +tqstringlist.o: ..\src\tools\tqstringlist.cpp + $(CXX) $(CXXFLAGS) ..\src\tools\tqstringlist.cpp tqmap.o: ..\src\tools\tqmap.cpp $(CXX) $(CXXFLAGS) ..\src\tools\tqmap.cpp diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 13dd83390..da327f74e 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -39,7 +39,7 @@ #include "msvc_objectmodel.h" #include "msvc_vcproj.h" #include -#include +#include #include extern DotNET which_dotnet_version(); diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h index 13b928974..fc2a39e20 100644 --- a/qmake/generators/win32/msvc_objectmodel.h +++ b/qmake/generators/win32/msvc_objectmodel.h @@ -40,8 +40,8 @@ #define __MSVC_OBJECTMODEL_H__ #include "project.h" -#include -#include +#include +#include enum DotNET { NETUnknown = 0, diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 999b05f04..5eb30160b 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -863,7 +863,7 @@ void VcprojGenerator::initPreLinkEventTools() // ------------------------------------------------------------------ // Helper functions to do proper sorting of the -// qstringlists, for both flat and non-flat modes. +// tqstringlists, for both flat and non-flat modes. inline bool XLessThanY( TQString &x, TQString &y, bool flat_mode ) { if ( flat_mode ) { diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 872d0fb1c..be38541bd 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -41,10 +41,10 @@ #include "project.h" #include "meta.h" #include -#include +#include #include #include -#include +#include #include diff --git a/qmake/meta.h b/qmake/meta.h index 0cf10c4fc..1e29487f7 100644 --- a/qmake/meta.h +++ b/qmake/meta.h @@ -40,8 +40,8 @@ #define __META_H__ #include -#include -#include +#include +#include class TQMakeMetaInfo { diff --git a/qmake/option.h b/qmake/option.h index 6b02d1352..bdc101567 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -40,8 +40,8 @@ #define __OPTION_H__ #include "project.h" -#include -#include +#include +#include #include #define QMAKE_VERSION_MAJOR 1 diff --git a/qmake/project.h b/qmake/project.h index 92c2304e6..cf349ee03 100644 --- a/qmake/project.h +++ b/qmake/project.h @@ -39,8 +39,8 @@ #ifndef __PROJECT_H__ #define __PROJECT_H__ -#include -#include +#include +#include #include class TQMakeProperty; diff --git a/qmake/property.cpp b/qmake/property.cpp index be7c0d4f7..318f89f8b 100644 --- a/qmake/property.cpp +++ b/qmake/property.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include TQStringList qmake_mkspec_paths(); //project.cpp diff --git a/qmake/property.h b/qmake/property.h index edad8af28..69a273859 100644 --- a/qmake/property.h +++ b/qmake/property.h @@ -39,7 +39,7 @@ #ifndef __PROPERTY_H__ #define __PROPERTY_H__ -#include +#include class TQSettings; diff --git a/qmake/qtmd5.cpp b/qmake/qtmd5.cpp index 6dc123579..9aabd4f4f 100644 --- a/qmake/qtmd5.cpp +++ b/qmake/qtmd5.cpp @@ -1,5 +1,5 @@ /* derived from the RSA Data Security, Inc. MD5 Message-Digest Algorithm */ -#include +#include #include "qtmd5.h" typedef unsigned char *POINTER; diff --git a/qmake/qtmd5.h b/qmake/qtmd5.h index 10d2b1daf..a6cfd9d67 100644 --- a/qmake/qtmd5.h +++ b/qmake/qtmd5.h @@ -1,6 +1,6 @@ #ifndef TQTMD5_H #define TQTMD5_H -#include +#include #include void qtMD5(const TQByteArray &src, unsigned char *digest); -- cgit v1.2.1