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

Signed-off-by: Michele Calgaro <[email protected]>

13 files changed, 29 insertions, 29 deletions

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)