Update to latest tqt3 automated conversion

34 files changed, 91 insertions, 91 deletions

diff --git a/qmake/book/qmake-pch.leaf b/qmake/book/qmake-pch.leaf
index 60ea1f4f9..b4a41e8a0 100644
--- a/qmake/book/qmake-pch.leaf
+++ b/qmake/book/qmake-pch.leaf
@@ -56,9 +56,9 @@ like this:
 	#include <stdlib>
 	#include <iostream>
 	#include <vector>
-	#include <qapplication.h> // Qt includes
-	#include <qpushbutton.h>
-	#include <qlabel.h>
+	#include <ntqapplication.h> // Qt includes
+	#include <ntqpushbutton.h>
+	#include <ntqlabel.h>
 	#include "thirdparty/include/libmain.h"
 	#include "my_stable_class.h"
 	...
diff --git a/qmake/examples/precompile/main.cpp b/qmake/examples/precompile/main.cpp
index 259f66ad0..80fc704d4 100644
--- a/qmake/examples/precompile/main.cpp
+++ b/qmake/examples/precompile/main.cpp
@@ -1,6 +1,6 @@
-#include <qapplication.h>
-#include <qpushbutton.h>
-#include <qlabel.h>
+#include <ntqapplication.h>
+#include <ntqpushbutton.h>
+#include <ntqlabel.h>
 #include "myobject.h"
 #include "mydialog.h"
 
diff --git a/qmake/examples/precompile/myobject.cpp b/qmake/examples/precompile/myobject.cpp
index 88c755e74..687116dfc 100644
--- a/qmake/examples/precompile/myobject.cpp
+++ b/qmake/examples/precompile/myobject.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include <qobject.h>
+#include <ntqobject.h>
 #include "myobject.h"
 
 MyObject::MyObject()
diff --git a/qmake/examples/precompile/myobject.h b/qmake/examples/precompile/myobject.h
index 80be4d4f8..5819267eb 100644
--- a/qmake/examples/precompile/myobject.h
+++ b/qmake/examples/precompile/myobject.h
@@ -1,4 +1,4 @@
-#include <qobject.h>
+#include <ntqobject.h>
 
 class MyObject : public TQObject
 {
diff --git a/qmake/examples/precompile/stable.h b/qmake/examples/precompile/stable.h
index 76ec45bad..62db7215b 100644
--- a/qmake/examples/precompile/stable.h
+++ b/qmake/examples/precompile/stable.h
@@ -4,7 +4,7 @@
 /* Add C++ includes here */
 
 # include <iostream>
-# include <qapplication.h>
-# include <qpushbutton.h>
-# include <qlabel.h>
+# include <ntqapplication.h>
+# include <ntqpushbutton.h>
+# include <ntqlabel.h>
 #endif
diff --git a/qmake/examples/tutorial/hello.h b/qmake/examples/tutorial/hello.h
index 37d3f05d3..650108aad 100644
--- a/qmake/examples/tutorial/hello.h
+++ b/qmake/examples/tutorial/hello.h
@@ -1,4 +1,4 @@
-#include <qpushbutton.h>
+#include <ntqpushbutton.h>
 
 class MyPushButton : public TQPushButton
 {
diff --git a/qmake/examples/tutorial/main.cpp b/qmake/examples/tutorial/main.cpp
index f63c7e27c..70015ff41 100644
--- a/qmake/examples/tutorial/main.cpp
+++ b/qmake/examples/tutorial/main.cpp
@@ -1,4 +1,4 @@
-#include <qapplication.h>
+#include <ntqapplication.h>
 #include "hello.h"
 
 int main( int argc, char **argv )
diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp
index 9633ef3d1..00260f8e3 100644
--- a/qmake/generators/mac/metrowerks_xml.cpp
+++ b/qmake/generators/mac/metrowerks_xml.cpp
@@ -38,9 +38,9 @@
 
 #include "metrowerks_xml.h"
 #include "option.h"
-#include <qdir.h>
-#include <qdict.h>
-#include <qregexp.h>
+#include <ntqdir.h>
+#include <ntqdict.h>
+#include <ntqregexp.h>
 #include <stdlib.h>
 #include <time.h>
 #if !defined(TQWS) && defined(Q_OS_MAC)
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index ebbcb3ce9..04c8ab8e0 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -39,9 +39,9 @@
 #include "pbuilder_pbx.h"
 #include "option.h"
 #include "meta.h"
-#include <qdir.h>
-#include <qdict.h>
-#include <qregexp.h>
+#include <ntqdir.h>
+#include <ntqdict.h>
+#include <ntqregexp.h>
 #include <stdlib.h>
 #include <time.h>
 #include "qtmd5.h"
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index c769e93eb..476e9f9bf 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -39,11 +39,11 @@
 #include "makefile.h"
 #include "option.h"
 #include "meta.h"
-#include <qdir.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qregexp.h>
-#include <qdict.h>
+#include <ntqdir.h>
+#include <ntqfile.h>
+#include <ntqtextstream.h>
+#include <ntqregexp.h>
+#include <ntqdict.h>
 #if defined(Q_OS_UNIX)
 #include <unistd.h>
 #else
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index 7aa76d06e..79659507b 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -40,7 +40,7 @@
 
 #include "option.h"
 #include "project.h"
-#include <qtextstream.h>
+#include <ntqtextstream.h>
 
 #ifdef Q_OS_WIN32
 #define QT_POPEN _popen
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp
index 1e49949bc..18b976728 100644
--- a/qmake/generators/projectgenerator.cpp
+++ b/qmake/generators/projectgenerator.cpp
@@ -38,10 +38,10 @@
 
 #include "projectgenerator.h"
 #include "option.h"
-#include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qregexp.h>
+#include <ntqdir.h>
+#include <ntqfile.h>
+#include <ntqfileinfo.h>
+#include <ntqregexp.h>
 
 TQString project_builtin_regx() //calculate the builtin regular expression..
 { 
@@ -274,7 +274,7 @@ ProjectGenerator::init()
 			if(!h_ext.isEmpty()) {
 			    if((*dep_it).left(1).lower() == "q") {
 				TQString qhdr = (*dep_it).lower();
-				if(file_no_path == "qthread.h")
+				if(file_no_path == "ntqthread.h")
 				    addConfig("thread");
 			    }
 			    for(TQStringList::Iterator cppit = Option::cpp_ext.begin();
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index f55132d4a..f4049c2c6 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -38,10 +38,10 @@
 
 #include "unixmake.h"
 #include "option.h"
-#include <qregexp.h>
-#include <qfile.h>
-#include <qdict.h>
-#include <qdir.h>
+#include <ntqregexp.h>
+#include <ntqfile.h>
+#include <ntqdict.h>
+#include <ntqdir.h>
 #include <time.h>
 
 
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index a7f7dc6bd..edaa8d131 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -39,9 +39,9 @@
 #include "unixmake.h"
 #include "option.h"
 #include "meta.h"
-#include <qregexp.h>
-#include <qfile.h>
-#include <qdir.h>
+#include <ntqregexp.h>
+#include <ntqfile.h>
+#include <ntqdir.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 1f942417b..b7ca9c1a0 100644
--- a/qmake/generators/win32/borland_bmake.cpp
+++ b/qmake/generators/win32/borland_bmake.cpp
@@ -38,8 +38,8 @@
 
 #include "borland_bmake.h"
 #include "option.h"
-#include <qdir.h>
-#include <qregexp.h>
+#include <ntqdir.h>
+#include <ntqregexp.h>
 #include <time.h>
 #include <stdlib.h>
 
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index d08359ca1..06cc0f764 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -38,8 +38,8 @@
 
 #include "mingw_make.h"
 #include "option.h"
-#include <qregexp.h>
-#include <qdir.h>
+#include <ntqregexp.h>
+#include <ntqdir.h>
 #include <stdlib.h>
 #include <time.h>
 
diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp
index 2ab133e48..010007375 100644
--- a/qmake/generators/win32/msvc_dsp.cpp
+++ b/qmake/generators/win32/msvc_dsp.cpp
@@ -38,8 +38,8 @@
 
 #include "msvc_dsp.h"
 #include "option.h"
-#include <qdir.h>
-#include <qregexp.h>
+#include <ntqdir.h>
+#include <ntqregexp.h>
 #include <stdlib.h>
 #include <time.h>
 
diff --git a/qmake/generators/win32/msvc_dsp.h b/qmake/generators/win32/msvc_dsp.h
index eedc81a95..8656df692 100644
--- a/qmake/generators/win32/msvc_dsp.h
+++ b/qmake/generators/win32/msvc_dsp.h
@@ -40,7 +40,7 @@
 #define __MSVC_DSP_H__
 
 #include "winmakefile.h"
-#include <qvaluestack.h>
+#include <ntqvaluestack.h>
 
 class DspMakefileGenerator : public Win32MakefileGenerator
 {
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 49eaf0515..2422a8a6d 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -38,9 +38,9 @@
 
 #include "msvc_nmake.h"
 #include "option.h"
-#include <qregexp.h>
-#include <qdict.h>
-#include <qdir.h>
+#include <ntqregexp.h>
+#include <ntqdict.h>
+#include <ntqdir.h>
 #include <stdlib.h>
 #include <time.h>
 
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index e4695962d..03653f40f 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -38,9 +38,9 @@
 
 #include "msvc_objectmodel.h"
 #include "msvc_vcproj.h"
-#include <qtextstream.h>
-#include <qstringlist.h>
-#include <qfileinfo.h>
+#include <ntqtextstream.h>
+#include <ntqstringlist.h>
+#include <ntqfileinfo.h>
 
 extern DotNET which_dotnet_version();
 
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index a84971683..13b928974 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 <qstring.h>
-#include <qstringlist.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
 
 enum DotNET {
     NETUnknown = 0,
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index b11b9a934..843d3aad7 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 <qdir.h>
-#include <qregexp.h>
-#include <qdict.h>
-#include <quuid.h>
+#include <ntqdir.h>
+#include <ntqregexp.h>
+#include <ntqdict.h>
+#include <ntquuid.h>
 #include <stdlib.h>
-#include <qsettings.h>
+#include <ntqsettings.h>
 
 //#define DEBUG_SOLUTION_GEN
 //#define DEBUG_PROJECT_GEN
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index a4fbbde45..872d0fb1c 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -40,12 +40,12 @@
 #include "option.h"
 #include "project.h"
 #include "meta.h"
-#include <qtextstream.h>
-#include <qstring.h>
-#include <qdict.h>
-#include <qregexp.h>
-#include <qstringlist.h>
-#include <qdir.h>
+#include <ntqtextstream.h>
+#include <ntqstring.h>
+#include <ntqdict.h>
+#include <ntqregexp.h>
+#include <ntqstringlist.h>
+#include <ntqdir.h>
 
 
 Win32MakefileGenerator::Win32MakefileGenerator(TQMakeProject *p) : MakefileGenerator(p)
diff --git a/qmake/main.cpp b/qmake/main.cpp
index 9ff668cb6..ac65f5ca8 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -40,9 +40,9 @@
 #include "property.h"
 #include "option.h"
 #include "makefile.h"
-#include <qnamespace.h>
-#include <qregexp.h>
-#include <qdir.h>
+#include <ntqnamespace.h>
+#include <ntqregexp.h>
+#include <ntqdir.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/qmake/meta.cpp b/qmake/meta.cpp
index 326fcfabf..05ffec549 100644
--- a/qmake/meta.cpp
+++ b/qmake/meta.cpp
@@ -39,7 +39,7 @@
 #include "meta.h"
 #include "project.h"
 #include "option.h"
-#include <qdir.h>
+#include <ntqdir.h>
 
 TQMap<TQString, TQMap<TQString, TQStringList> > TQMakeMetaInfo::cache_vars;
 
diff --git a/qmake/meta.h b/qmake/meta.h
index b2b831d17..535a2d8bb 100644
--- a/qmake/meta.h
+++ b/qmake/meta.h
@@ -39,9 +39,9 @@
 #ifndef __META_H__
 #define __META_H__
 
-#include <qmap.h>
-#include <qstringlist.h>
-#include <qstring.h>
+#include <ntqmap.h>
+#include <ntqstringlist.h>
+#include <ntqstring.h>
 
 class TQMakeMetaInfo 
 {
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 123856e6e..8865720eb 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -37,8 +37,8 @@
 **********************************************************************/
 
 #include "option.h"
-#include <qdir.h>
-#include <qregexp.h>
+#include <ntqdir.h>
+#include <ntqregexp.h>
 #include <stdlib.h>
 #include <stdarg.h>
 
diff --git a/qmake/option.h b/qmake/option.h
index 7eee7548d..6b02d1352 100644
--- a/qmake/option.h
+++ b/qmake/option.h
@@ -40,9 +40,9 @@
 #define __OPTION_H__
 
 #include "project.h"
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qfile.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqfile.h>
 
 #define QMAKE_VERSION_MAJOR 1
 #define QMAKE_VERSION_MINOR 7
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 5b883b3c4..0a2379455 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -39,11 +39,11 @@
 #include "project.h"
 #include "property.h"
 #include "option.h"
-#include <qfile.h>
-#include <qdir.h>
-#include <qregexp.h>
-#include <qtextstream.h>
-#include <qvaluestack.h>
+#include <ntqfile.h>
+#include <ntqdir.h>
+#include <ntqregexp.h>
+#include <ntqtextstream.h>
+#include <ntqvaluestack.h>
 #ifdef Q_OS_UNIX
 # include <unistd.h>
 #endif
diff --git a/qmake/project.h b/qmake/project.h
index c65de1e5f..3d7f17779 100644
--- a/qmake/project.h
+++ b/qmake/project.h
@@ -39,9 +39,9 @@
 #ifndef __PROJECT_H__
 #define __PROJECT_H__
 
-#include <qstringlist.h>
-#include <qstring.h>
-#include <qmap.h>
+#include <ntqstringlist.h>
+#include <ntqstring.h>
+#include <ntqmap.h>
 
 class TQMakeProperty;
 
diff --git a/qmake/property.cpp b/qmake/property.cpp
index 7450688f7..846b45128 100644
--- a/qmake/property.cpp
+++ b/qmake/property.cpp
@@ -38,10 +38,10 @@
 
 #include "property.h"
 #include "option.h"
-#include <qsettings.h>
-#include <qdir.h>
-#include <qmap.h>
-#include <qstringlist.h>
+#include <ntqsettings.h>
+#include <ntqdir.h>
+#include <ntqmap.h>
+#include <ntqstringlist.h>
 #include <stdio.h>
 
 TQStringList qmake_mkspec_paths(); //project.cpp
diff --git a/qmake/property.h b/qmake/property.h
index 3cc100fd8..edad8af28 100644
--- a/qmake/property.h
+++ b/qmake/property.h
@@ -39,7 +39,7 @@
 #ifndef __PROPERTY_H__
 #define __PROPERTY_H__
 
-#include <qstring.h>
+#include <ntqstring.h>
 
 class TQSettings;
 
diff --git a/qmake/qtmd5.cpp b/qmake/qtmd5.cpp
index a275f4612..6dc123579 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 <qstring.h>
+#include <ntqstring.h>
 #include "qtmd5.h"
 
 typedef unsigned char *POINTER;
diff --git a/qmake/qtmd5.h b/qmake/qtmd5.h
index 307633a90..10d2b1daf 100644
--- a/qmake/qtmd5.h
+++ b/qmake/qtmd5.h
@@ -1,7 +1,7 @@
 #ifndef TQTMD5_H
 #define TQTMD5_H
-#include <qstring.h>
-#include <qcstring.h>
+#include <ntqstring.h>
+#include <ntqcstring.h>
 
 void qtMD5(const TQByteArray &src, unsigned char *digest);
 TQString qtMD5(const TQByteArray &src);