Rename IO and network class nt* related files to equivalent tq*

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

22 files changed, 114 insertions, 114 deletions

diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index ee59bfa0d..db997d9cf 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -5,11 +5,11 @@ 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=tqstring.o tqtextstream.o qiodevice.o qglobal.o qgdict.o tqcstring.o \
-      qdatastream.o qgarray.o qbuffer.o qglist.o tqptrcollection.o qfile.o \
-      qfile_unix.o tqregexp.o qgvector.o qgcache.o tqbitarray.o qdir.o quuid.o \
-      qfileinfo_unix.o qdir_unix.o qfileinfo.o tqdatetime.o tqstringlist.o tqmap.o \
-      qconfig.o qunicodetables.o qsettings.o qlocale.o @QMAKE_QTOBJS@
+QOBJS=tqstring.o tqtextstream.o tqiodevice.o qglobal.o qgdict.o tqcstring.o \
+      tqdatastream.o qgarray.o tqbuffer.o qglist.o tqptrcollection.o tqfile.o \
+      tqfile_unix.o tqregexp.o qgvector.o qgcache.o tqbitarray.o tqdir.o quuid.o \
+      tqfileinfo_unix.o tqdir_unix.o tqfileinfo.o tqdatetime.o tqstringlist.o tqmap.o \
+      qconfig.o qunicodetables.o tqsettings.o qlocale.o @QMAKE_QTOBJS@
 
 #all sources, used for the depend target
 DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makefile.cpp generators/unix/unixmake2.cpp \
@@ -17,20 +17,20 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makef
 	   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/tqstring.cpp @SOURCE_PATH@/src/tools/tqtextstream.cpp \
-	   @SOURCE_PATH@/src/tools/qiodevice.cpp @SOURCE_PATH@/src/tools/qglobal.cpp \
+	   @SOURCE_PATH@/src/tools/tqiodevice.cpp @SOURCE_PATH@/src/tools/qglobal.cpp \
 	   @SOURCE_PATH@/src/tools/qgdict.cpp @SOURCE_PATH@/src/tools/tqcstring.cpp \
-	   @SOURCE_PATH@/src/tools/qdatastream.cpp @SOURCE_PATH@/src/tools/qgarray.cpp \
-	   @SOURCE_PATH@/src/tools/qbuffer.cpp @SOURCE_PATH@/src/tools/qglist.cpp \
-	   @SOURCE_PATH@/src/tools/tqptrcollection.cpp @SOURCE_PATH@/src/tools/qfile.cpp \
-	   @SOURCE_PATH@/src/tools/qfile_unix.cpp @SOURCE_PATH@/src/tools/tqregexp.cpp \
+	   @SOURCE_PATH@/src/tools/tqdatastream.cpp @SOURCE_PATH@/src/tools/qgarray.cpp \
+	   @SOURCE_PATH@/src/tools/tqbuffer.cpp @SOURCE_PATH@/src/tools/qglist.cpp \
+	   @SOURCE_PATH@/src/tools/tqptrcollection.cpp @SOURCE_PATH@/src/tools/tqfile.cpp \
+	   @SOURCE_PATH@/src/tools/tqfile_unix.cpp @SOURCE_PATH@/src/tools/tqregexp.cpp \
 	   @SOURCE_PATH@/src/tools/qgvector.cpp @SOURCE_PATH@/src/tools/qgcache.cpp \
-	   @SOURCE_PATH@/src/tools/tqbitarray.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/tqbitarray.cpp @SOURCE_PATH@/src/tools/tqdir.cpp \
+	   @SOURCE_PATH@/src/tools/quuid.cpp @SOURCE_PATH@/src/tools/tqfileinfo_unix.cpp \
+	   @SOURCE_PATH@/src/tools/tqdir_unix.cpp @SOURCE_PATH@/src/tools/tqfileinfo.cpp \
 	   @SOURCE_PATH@/src/tools/tqdatetime.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
+	   @SOURCE_PATH@/src/tools/tqsettings.cpp @SOURCE_PATH@/src/tools/tqurl.cpp \
+	   @SOURCE_PATH@/src/tools/tqsettings_mac.cpp @SOURCE_PATH@/src/tools/qlocale.cpp
 
 CXXFLAGS= @QMAKE_CXXFLAGS@ \
 	-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
@@ -63,8 +63,8 @@ depend:
 tqtextstream.o: @SOURCE_PATH@/src/tools/tqtextstream.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqtextstream.cpp
 
-qiodevice.o: @SOURCE_PATH@/src/tools/qiodevice.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qiodevice.cpp
+tqiodevice.o: @SOURCE_PATH@/src/tools/tqiodevice.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqiodevice.cpp
 
 qglobal.o: @SOURCE_PATH@/src/tools/qglobal.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qglobal.cpp
@@ -75,14 +75,14 @@ qgdict.o: @SOURCE_PATH@/src/tools/qgdict.cpp
 tqcstring.o: @SOURCE_PATH@/src/tools/tqcstring.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqcstring.cpp
 
-qsettings.o: @SOURCE_PATH@/src/tools/qsettings.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qsettings.cpp
+tqsettings.o: @SOURCE_PATH@/src/tools/tqsettings.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqsettings.cpp
 
-qsettings_mac.o: @SOURCE_PATH@/src/tools/qsettings_mac.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qsettings_mac.cpp
+tqsettings_mac.o: @SOURCE_PATH@/src/tools/tqsettings_mac.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqsettings_mac.cpp
 
-qurl.o: @SOURCE_PATH@/src/kernel/qurl.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/kernel/qurl.cpp
+tqurl.o: @SOURCE_PATH@/src/kernel/tqurl.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/kernel/tqurl.cpp
 
 tqstring.o: @SOURCE_PATH@/src/tools/tqstring.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqstring.cpp
@@ -90,8 +90,8 @@ tqstring.o: @SOURCE_PATH@/src/tools/tqstring.cpp
 qlocale.o: @SOURCE_PATH@/src/tools/qlocale.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qlocale.cpp
 
-qdatastream.o: @SOURCE_PATH@/src/tools/qdatastream.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qdatastream.cpp
+tqdatastream.o: @SOURCE_PATH@/src/tools/tqdatastream.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqdatastream.cpp
 
 qunicodetables.o: @SOURCE_PATH@/src/tools/qunicodetables.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qunicodetables.cpp
@@ -99,8 +99,8 @@ qunicodetables.o: @SOURCE_PATH@/src/tools/qunicodetables.cpp
 qgarray.o: @SOURCE_PATH@/src/tools/qgarray.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qgarray.cpp
 
-qbuffer.o: @SOURCE_PATH@/src/tools/qbuffer.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qbuffer.cpp
+tqbuffer.o: @SOURCE_PATH@/src/tools/tqbuffer.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqbuffer.cpp
 
 qglist.o: @SOURCE_PATH@/src/tools/qglist.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qglist.cpp
@@ -108,11 +108,11 @@ qglist.o: @SOURCE_PATH@/src/tools/qglist.cpp
 tqptrcollection.o: @SOURCE_PATH@/src/tools/tqptrcollection.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqptrcollection.cpp
 
-qfile.o: @SOURCE_PATH@/src/tools/qfile.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qfile.cpp
+tqfile.o: @SOURCE_PATH@/src/tools/tqfile.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqfile.cpp
 
-qfile_unix.o: @SOURCE_PATH@/src/tools/qfile_unix.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qfile_unix.cpp
+tqfile_unix.o: @SOURCE_PATH@/src/tools/tqfile_unix.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqfile_unix.cpp
 
 tqregexp.o: @SOURCE_PATH@/src/tools/tqregexp.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqregexp.cpp
@@ -126,20 +126,20 @@ qgcache.o: @SOURCE_PATH@/src/tools/qgcache.cpp
 tqbitarray.o: @SOURCE_PATH@/src/tools/tqbitarray.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqbitarray.cpp
 
-qdir.o: @SOURCE_PATH@/src/tools/qdir.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qdir.cpp
+tqdir.o: @SOURCE_PATH@/src/tools/tqdir.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqdir.cpp
 
 quuid.o: @SOURCE_PATH@/src/tools/quuid.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/quuid.cpp
 
-qfileinfo_unix.o: @SOURCE_PATH@/src/tools/qfileinfo_unix.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qfileinfo_unix.cpp
+tqfileinfo_unix.o: @SOURCE_PATH@/src/tools/tqfileinfo_unix.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqfileinfo_unix.cpp
 
-qdir_unix.o: @SOURCE_PATH@/src/tools/qdir_unix.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qdir_unix.cpp
+tqdir_unix.o: @SOURCE_PATH@/src/tools/tqdir_unix.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqdir_unix.cpp
 
-qfileinfo.o: @SOURCE_PATH@/src/tools/qfileinfo.cpp
-	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qfileinfo.cpp
+tqfileinfo.o: @SOURCE_PATH@/src/tools/tqfileinfo.cpp
+	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqfileinfo.cpp
 
 tqdatetime.o: @SOURCE_PATH@/src/tools/tqdatetime.cpp
 	$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqdatetime.cpp
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index 38a0653be..d700023b1 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=tqstring.o quuid.o tqtextstream.o qiodevice.o qglobal.o qgdict.o tqcstring.o qdatastream.o \
- 	qgarray.o qbuffer.o qglist.o tqptrcollection.o qfile.o qfile_win.o tqregexp.o qgvector.o \
- 	qgcache.o tqbitarray.o qdir.o qfileinfo_win.o qdir_win.o qfileinfo.o tqdatetime.o \
- 	tqstringlist.o tqmap.o qlibrary.o qlibrary_win.o qconfig.o qsettings.o qsettings_win.o qunicodetables.o \
+QTOBJS=tqstring.o quuid.o tqtextstream.o tqiodevice.o qglobal.o qgdict.o tqcstring.o tqdatastream.o \
+ 	qgarray.o tqbuffer.o qglist.o tqptrcollection.o tqfile.o tqfile_win.o tqregexp.o qgvector.o \
+ 	qgcache.o tqbitarray.o tqdir.o tqfileinfo_win.o tqdir_win.o tqfileinfo.o tqdatetime.o \
+ 	tqstringlist.o tqmap.o qlibrary.o qlibrary_win.o qconfig.o tqsettings.o tqsettings_win.o qunicodetables.o \
 	qlocale.o
 
 
@@ -55,8 +55,8 @@ qlibrary_win.o: ..\src\tools\qlibrary_win.cpp
 tqtextstream.o: ..\src\tools\tqtextstream.cpp
 	$(CXX) $(CXXFLAGS) ..\src\tools\tqtextstream.cpp
 
-qiodevice.o: ..\src\tools\qiodevice.cpp
-	$(CXX) $(CXXFLAGS) ..\src\tools\qiodevice.cpp
+tqiodevice.o: ..\src\tools\tqiodevice.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\tqiodevice.cpp
 
 qglobal.o: ..\src\tools\qglobal.cpp
 	$(CXX) $(CXXFLAGS) ..\src\tools\qglobal.cpp
@@ -76,14 +76,14 @@ qlocale.o: ..\src\tools\qlocale.cpp
 quuid.o: ..\src\tools\quuid.cpp
 	$(CXX) $(CXXFLAGS) ..\src\tools\quuid.cpp
 
-qdatastream.o: ..\src\tools\qdatastream.cpp
-	$(CXX) $(CXXFLAGS) ..\src\tools\qdatastream.cpp
+tqdatastream.o: ..\src\tools\tqdatastream.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\tqdatastream.cpp
 
 qgarray.o: ..\src\tools\qgarray.cpp
 	$(CXX) $(CXXFLAGS) ..\src\tools\qgarray.cpp
 
-qbuffer.o: ..\src\tools\qbuffer.cpp
-	$(CXX) $(CXXFLAGS) ..\src\tools\qbuffer.cpp
+tqbuffer.o: ..\src\tools\tqbuffer.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\tqbuffer.cpp
 
 qglist.o: ..\src\tools\qglist.cpp
 	$(CXX) $(CXXFLAGS) ..\src\tools\qglist.cpp
@@ -91,11 +91,11 @@ qglist.o: ..\src\tools\qglist.cpp
 tqptrcollection.o: ..\src\tools\tqptrcollection.cpp
 	$(CXX) $(CXXFLAGS) ..\src\tools\tqptrcollection.cpp
 
-qfile.o: ..\src\tools\qfile.cpp
-	$(CXX) $(CXXFLAGS) ..\src\tools\qfile.cpp
+tqfile.o: ..\src\tools\tqfile.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\tqfile.cpp
 
-qfile_win.o: ..\src\tools\qfile_win.cpp
-	$(CXX) $(CXXFLAGS) ..\src\tools\qfile_win.cpp
+tqfile_win.o: ..\src\tools\tqfile_win.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\tqfile_win.cpp
 
 tqtextcodec.o: ..\src\codecs\tqtextcodec.cpp
 	$(CXX) $(CXXFLAGS) ..\src\codecs\tqtextcodec.cpp
@@ -112,23 +112,23 @@ qgcache.o: ..\src\tools\qgcache.cpp
 tqbitarray.o: ..\src\tools\tqbitarray.cpp
 	$(CXX) $(CXXFLAGS) ..\src\tools\tqbitarray.cpp
 
-qdir.o: ..\src\tools\qdir.cpp
-	$(CXX) $(CXXFLAGS) ..\src\tools\qdir.cpp
+tqdir.o: ..\src\tools\tqdir.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\tqdir.cpp
 
-qsettings.o: ..\src\tools\qsettings.cpp
-	$(CXX) $(CXXFLAGS) ..\src\tools\qsettings.cpp
+tqsettings.o: ..\src\tools\tqsettings.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\tqsettings.cpp
 
-qsettings_win.o: ..\src\tools\qsettings_win.cpp
-	$(CXX) $(CXXFLAGS) ..\src\tools\qsettings_win.cpp
+tqsettings_win.o: ..\src\tools\tqsettings_win.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\tqsettings_win.cpp
 
-qfileinfo_win.o: ..\src\tools\qfileinfo_win.cpp
-	$(CXX) $(CXXFLAGS) ..\src\tools\qfileinfo_win.cpp
+tqfileinfo_win.o: ..\src\tools\tqfileinfo_win.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\tqfileinfo_win.cpp
 
-qdir_win.o: ..\src\tools\qdir_win.cpp
-	$(CXX) $(CXXFLAGS) ..\src\tools\qdir_win.cpp
+tqdir_win.o: ..\src\tools\tqdir_win.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\tqdir_win.cpp
 
-qfileinfo.o: ..\src\tools\qfileinfo.cpp
-	$(CXX) $(CXXFLAGS) ..\src\tools\qfileinfo.cpp
+tqfileinfo.o: ..\src\tools\tqfileinfo.cpp
+	$(CXX) $(CXXFLAGS) ..\src\tools\tqfileinfo.cpp
 
 tqdatetime.o: ..\src\tools\tqdatetime.cpp
 	$(CXX) $(CXXFLAGS) ..\src\tools\tqdatetime.cpp
diff --git a/qmake/book/qmake-commandreference.leaf b/qmake/book/qmake-commandreference.leaf
index 3cc198b0b..9b0a1b964 100644
--- a/qmake/book/qmake-commandreference.leaf
+++ b/qmake/book/qmake-commandreference.leaf
@@ -1891,7 +1891,7 @@ qmake -query VARIABLE
 qmake -query #queries all current VARIABLE/VALUE pairs..
 \endcode
 
-This information will be saved into a QSettings object (meaning it
+This information will be saved into a TQSettings object (meaning it
 will be stored in different places for different platforms). As
 VARIABLE is versioned as well, you can set one value in an older
 version of qmake, and newer versions will retrieve this value, however
diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp
index 6a98e1ea8..a197b0e40 100644
--- a/qmake/generators/mac/metrowerks_xml.cpp
+++ b/qmake/generators/mac/metrowerks_xml.cpp
@@ -38,7 +38,7 @@
 
 #include "metrowerks_xml.h"
 #include "option.h"
-#include <ntqdir.h>
+#include <tqdir.h>
 #include <tqdict.h>
 #include <tqregexp.h>
 #include <stdlib.h>
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index 6cc95d481..efd17ee62 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -39,7 +39,7 @@
 #include "pbuilder_pbx.h"
 #include "option.h"
 #include "meta.h"
-#include <ntqdir.h>
+#include <tqdir.h>
 #include <tqdict.h>
 #include <tqregexp.h>
 #include <stdlib.h>
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 0e331cf87..99b10d3e4 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -39,8 +39,8 @@
 #include "makefile.h"
 #include "option.h"
 #include "meta.h"
-#include <ntqdir.h>
-#include <ntqfile.h>
+#include <tqdir.h>
+#include <tqfile.h>
 #include <tqtextstream.h>
 #include <tqregexp.h>
 #include <tqdict.h>
@@ -2231,15 +2231,15 @@ MakefileGenerator::fileFixify(const TQString& file0, const TQString &out_d,
     TQString orig_file = file;
     if(!force_fix && project->isActiveConfig("no_fixpath")) {
 	if(!project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH")) { //absoluteify it
-	    TQString qfile = Option::fixPathToLocalOS(file, TRUE, canon);
+	    TQString tqfile = Option::fixPathToLocalOS(file, TRUE, canon);
 	    if(TQDir::isRelativePath(file)) { //already absolute
-		TQFileInfo fi(qfile);
+		TQFileInfo fi(tqfile);
 		if(!fi.convertToAbs()) //strange
 		    file = fi.filePath();
 	    }
 	}
     } else { //fix it..
-	TQString qfile(Option::fixPathToLocalOS(file, TRUE, canon)), in_dir(in_d), out_dir(out_d);
+	TQString tqfile(Option::fixPathToLocalOS(file, TRUE, canon)), in_dir(in_d), out_dir(out_d);
 	{
 	    if(out_dir.isNull() || TQDir::isRelativePath(out_dir))
 		out_dir.prepend(Option::output_dir + TQDir::separator());
@@ -2265,8 +2265,8 @@ MakefileGenerator::fileFixify(const TQString& file0, const TQString &out_d,
 	    if(!out_canonical_dir.isEmpty())
 		out_dir = out_canonical_dir;
 	}
-	if(out_dir != in_dir || !TQDir::isRelativePath(qfile)) {
-	    if(TQDir::isRelativePath(qfile)) {
+	if(out_dir != in_dir || !TQDir::isRelativePath(tqfile)) {
+	    if(TQDir::isRelativePath(tqfile)) {
 		if(file.left(Option::dir_sep.length()) != Option::dir_sep &&
 		   in_dir.right(Option::dir_sep.length()) != Option::dir_sep)
 		    file.prepend(Option::dir_sep);
@@ -2386,16 +2386,16 @@ MakefileGenerator::specdir()
     spec = Option::mkfile::qmakespec;
 #if 0
     if(const char *d = getenv("TQTDIR")) {
-	TQString qdir = Option::fixPathToTargetOS(TQString(d));
-	if(qdir.endsWith(TQString(TQChar(TQDir::separator()))))
-	    qdir.truncate(qdir.length()-1);
+	TQString tqdir = Option::fixPathToTargetOS(TQString(d));
+	if(tqdir.endsWith(TQString(TQChar(TQDir::separator()))))
+	    tqdir.truncate(tqdir.length()-1);
 	//fix path
 	TQFileInfo fi(spec);
 	TQString absSpec(fi.absFilePath());
 	absSpec = Option::fixPathToTargetOS(absSpec);
 	//replace what you can
-	if(absSpec.startsWith(qdir)) {
-	    absSpec.replace(0, qdir.length(), "$(TQTDIR)");
+	if(absSpec.startsWith(tqdir)) {
+	    absSpec.replace(0, tqdir.length(), "$(TQTDIR)");
 	    spec = absSpec;
 	}
     }
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp
index 6c6c46a8d..48a93b69f 100644
--- a/qmake/generators/projectgenerator.cpp
+++ b/qmake/generators/projectgenerator.cpp
@@ -38,9 +38,9 @@
 
 #include "projectgenerator.h"
 #include "option.h"
-#include <ntqdir.h>
-#include <ntqfile.h>
-#include <ntqfileinfo.h>
+#include <tqdir.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
 #include <tqregexp.h>
 
 TQString project_builtin_regx() //calculate the builtin regular expression..
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index b10d720eb..dad6ca7d4 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -39,9 +39,9 @@
 #include "unixmake.h"
 #include "option.h"
 #include <tqregexp.h>
-#include <ntqfile.h>
+#include <tqfile.h>
 #include <tqdict.h>
-#include <ntqdir.h>
+#include <tqdir.h>
 #include <time.h>
 
 
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index cbb96d02d..347186d75 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -40,8 +40,8 @@
 #include "option.h"
 #include "meta.h"
 #include <tqregexp.h>
-#include <ntqfile.h>
-#include <ntqdir.h>
+#include <tqfile.h>
+#include <tqdir.h>
 #include <time.h>
 
 TQString mkdir_p_asstring(const TQString &dir);
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp
index 3ae25cffe..61906de29 100644
--- a/qmake/generators/win32/borland_bmake.cpp
+++ b/qmake/generators/win32/borland_bmake.cpp
@@ -38,7 +38,7 @@
 
 #include "borland_bmake.h"
 #include "option.h"
-#include <ntqdir.h>
+#include <tqdir.h>
 #include <tqregexp.h>
 #include <time.h>
 #include <stdlib.h>
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index da4a3c83a..18aa73c21 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -39,7 +39,7 @@
 #include "mingw_make.h"
 #include "option.h"
 #include <tqregexp.h>
-#include <ntqdir.h>
+#include <tqdir.h>
 #include <stdlib.h>
 #include <time.h>
 
diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp
index 43de317c4..910400315 100644
--- a/qmake/generators/win32/msvc_dsp.cpp
+++ b/qmake/generators/win32/msvc_dsp.cpp
@@ -38,7 +38,7 @@
 
 #include "msvc_dsp.h"
 #include "option.h"
-#include <ntqdir.h>
+#include <tqdir.h>
 #include <tqregexp.h>
 #include <stdlib.h>
 #include <time.h>
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 827c2a5c7..302e2532d 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -40,7 +40,7 @@
 #include "option.h"
 #include <tqregexp.h>
 #include <tqdict.h>
-#include <ntqdir.h>
+#include <tqdir.h>
 #include <stdlib.h>
 #include <time.h>
 
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index fcc7672f2..e6c31f5f4 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -40,7 +40,7 @@
 #include "msvc_vcproj.h"
 #include <tqtextstream.h>
 #include <tqstringlist.h>
-#include <ntqfileinfo.h>
+#include <tqfileinfo.h>
 
 extern DotNET which_dotnet_version();
 
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index a6c1302bb..156f69c63 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -39,12 +39,12 @@
 #include "msvc_vcproj.h"
 #include "option.h"
 #include "qtmd5.h" // SG's MD5 addon
-#include <ntqdir.h>
+#include <tqdir.h>
 #include <tqregexp.h>
 #include <tqdict.h>
 #include <ntquuid.h>
 #include <stdlib.h>
-#include <ntqsettings.h>
+#include <tqsettings.h>
 
 //#define DEBUG_SOLUTION_GEN
 //#define DEBUG_PROJECT_GEN
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index 857012170..7c635d32c 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -45,7 +45,7 @@
 #include <tqdict.h>
 #include <tqregexp.h>
 #include <tqstringlist.h>
-#include <ntqdir.h>
+#include <tqdir.h>
 
 
 Win32MakefileGenerator::Win32MakefileGenerator(TQMakeProject *p) : MakefileGenerator(p)
diff --git a/qmake/main.cpp b/qmake/main.cpp
index 2ea4acbc8..d11e30531 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -42,7 +42,7 @@
 #include "makefile.h"
 #include <ntqnamespace.h>
 #include <tqregexp.h>
-#include <ntqdir.h>
+#include <tqdir.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -53,7 +53,7 @@
 // for Borland, main is defined to qMain which breaks qmake
 #undef main
 #ifdef Q_OS_MAC
-// for qurl
+// for tqurl
 bool tqt_resolve_symlinks = FALSE;
 #endif
 
diff --git a/qmake/meta.cpp b/qmake/meta.cpp
index 36ae25744..9770a7972 100644
--- a/qmake/meta.cpp
+++ b/qmake/meta.cpp
@@ -39,7 +39,7 @@
 #include "meta.h"
 #include "project.h"
 #include "option.h"
-#include <ntqdir.h>
+#include <tqdir.h>
 
 TQMap<TQString, TQMap<TQString, TQStringList> > TQMakeMetaInfo::cache_vars;
 
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 73d53d3ec..b3a4a3917 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -37,7 +37,7 @@
 **********************************************************************/
 
 #include "option.h"
-#include <ntqdir.h>
+#include <tqdir.h>
 #include <tqregexp.h>
 #include <stdlib.h>
 #include <stdarg.h>
diff --git a/qmake/option.h b/qmake/option.h
index bdc101567..27059b498 100644
--- a/qmake/option.h
+++ b/qmake/option.h
@@ -42,7 +42,7 @@
 #include "project.h"
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <ntqfile.h>
+#include <tqfile.h>
 
 #define QMAKE_VERSION_MAJOR 1
 #define QMAKE_VERSION_MINOR 7
diff --git a/qmake/project.cpp b/qmake/project.cpp
index ed2afbbb9..f6082f009 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -39,8 +39,8 @@
 #include "project.h"
 #include "property.h"
 #include "option.h"
-#include <ntqfile.h>
-#include <ntqdir.h>
+#include <tqfile.h>
+#include <tqdir.h>
 #include <tqregexp.h>
 #include <tqtextstream.h>
 #include <tqvaluestack.h>
@@ -463,17 +463,17 @@ TQMakeProject::read(const TQString &file, TQMap<TQString, TQStringList> &place)
     TQString filename = Option::fixPathToLocalOS(file);
     doVariableReplace(filename, place);
     bool ret = FALSE, using_stdin = FALSE;
-    TQFile qfile;
+    TQFile tqfile;
     if(!strcmp(filename, "-")) {
-	qfile.setName("");
-	ret = qfile.open(IO_ReadOnly, stdin);
+	tqfile.setName("");
+	ret = tqfile.open(IO_ReadOnly, stdin);
 	using_stdin = TRUE;
     } else {
-	qfile.setName(filename);
-	ret = qfile.open(IO_ReadOnly);
+	tqfile.setName(filename);
+	ret = tqfile.open(IO_ReadOnly);
     }
     if ( ret ) {
-	TQTextStream t( &qfile );
+	TQTextStream t( &tqfile );
 	TQString s, line;
 	parser.file = filename;
 	parser.line_no = 0;
@@ -503,7 +503,7 @@ TQMakeProject::read(const TQString &file, TQMap<TQString, TQStringList> &place)
 	    }
 	}
 	if(!using_stdin)
-	    qfile.close();
+	    tqfile.close();
     }
     parser = pi;
     if(scope_block != 0)
@@ -1375,9 +1375,9 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 			msg += "?";
 		    fprintf(stderr, "Project %s: %s ", val.upper().latin1(), msg.latin1());
 
-		    TQFile qfile;
-		    if(qfile.open(IO_ReadOnly, stdin)) {
-			TQTextStream t(&qfile);
+		    TQFile tqfile;
+		    if(tqfile.open(IO_ReadOnly, stdin)) {
+			TQTextStream t(&tqfile);
 			replacement = t.readLine();
 		    }
 		}
diff --git a/qmake/property.cpp b/qmake/property.cpp
index 318f89f8b..77d827004 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -38,8 +38,8 @@
 
 #include "property.h"
 #include "option.h"
-#include <ntqsettings.h>
-#include <ntqdir.h>
+#include <tqsettings.h>
+#include <tqdir.h>
 #include <tqmap.h>
 #include <tqstringlist.h>
 #include <stdio.h>