From ea318d1431c89e647598c510c4245c6571aa5f46 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 26 Jan 2012 23:32:43 -0600
Subject: Update to latest tqt3 automated conversion

---
 qmake/generators/mac/metrowerks_xml.cpp     |  6 +++---
 qmake/generators/mac/pbuilder_pbx.cpp       |  6 +++---
 qmake/generators/makefile.cpp               | 10 +++++-----
 qmake/generators/makefile.h                 |  2 +-
 qmake/generators/projectgenerator.cpp       | 10 +++++-----
 qmake/generators/unix/unixmake.cpp          |  8 ++++----
 qmake/generators/unix/unixmake2.cpp         |  6 +++---
 qmake/generators/win32/borland_bmake.cpp    |  4 ++--
 qmake/generators/win32/mingw_make.cpp       |  4 ++--
 qmake/generators/win32/msvc_dsp.cpp         |  4 ++--
 qmake/generators/win32/msvc_dsp.h           |  2 +-
 qmake/generators/win32/msvc_nmake.cpp       |  6 +++---
 qmake/generators/win32/msvc_objectmodel.cpp |  6 +++---
 qmake/generators/win32/msvc_objectmodel.h   |  4 ++--
 qmake/generators/win32/msvc_vcproj.cpp      | 10 +++++-----
 qmake/generators/win32/winmakefile.cpp      | 12 ++++++------
 16 files changed, 50 insertions(+), 50 deletions(-)

(limited to 'qmake/generators')

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)
-- 
cgit v1.2.1