Update to latest tqt3 automated conversion

7 files changed, 57 insertions, 57 deletions

diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp
index 555b20a81..aa00988ea 100644
--- a/tools/designer/uic/embed.cpp
+++ b/tools/designer/uic/embed.cpp
@@ -32,11 +32,11 @@
 **********************************************************************/
 
 #include "uic.h"
-#include <qfile.h>
-#include <qimage.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
-#include <qfileinfo.h>
+#include <ntqfile.h>
+#include <ntqimage.h>
+#include <ntqstringlist.h>
+#include <ntqdatetime.h>
+#include <ntqfileinfo.h>
 #include <stdio.h>
 #include <ctype.h>
 
@@ -143,10 +143,10 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
     out << "****************************************************************************/\n";
     out << "\n";
 
-    out << "#include <qimage.h>\n";
-    out << "#include <qdict.h>\n";
-    out << "#include <qmime.h>\n";
-    out << "#include <qdragobject.h>\n";
+    out << "#include <ntqimage.h>\n";
+    out << "#include <ntqdict.h>\n";
+    out << "#include <ntqmime.h>\n";
+    out << "#include <ntqdragobject.h>\n";
     out << "\n";
 
     TQPtrList<EmbedImage> list_image;
diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp
index be21ee9e0..e185af6c3 100644
--- a/tools/designer/uic/form.cpp
+++ b/tools/designer/uic/form.cpp
@@ -35,12 +35,12 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qdir.h>
-#include <qregexp.h>
+#include <ntqstringlist.h>
+#include <ntqvaluelist.h>
+#include <ntqfile.h>
+#include <ntqfileinfo.h>
+#include <ntqdir.h>
+#include <ntqregexp.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 
@@ -196,10 +196,10 @@ void Uic::createFormDecl( const TQDomElement &e )
     out << "#ifndef " << protector << endl;
     out << "#define " << protector << endl;
     out << endl;
-    out << "#include <qvariant.h>" << endl; // for broken HP-UX compilers
+    out << "#include <ntqvariant.h>" << endl; // for broken HP-UX compilers
 
     if ( !imageMembers.isEmpty() )
-	out << "#include <qpixmap.h>" << endl;
+	out << "#include <ntqpixmap.h>" << endl;
 
     TQStringList globalIncludes, localIncludes;
     int wid = WidgetDatabase::idFromClassName( objClass );
@@ -753,9 +753,9 @@ void Uic::createFormImpl( const TQDomElement &e )
     registerDatabases( e );
     dbConnections = unique( dbConnections );
     if ( dbConnections.count() )
-	globalIncludes += "qsqldatabase.h";
+	globalIncludes += "ntqsqldatabase.h";
     if ( dbCursors.count() )
-	globalIncludes += "qsqlcursor.h";
+	globalIncludes += "ntqsqlcursor.h";
     bool dbForm = FALSE;
     if ( dbForms[ "(default)" ].count() )
 	dbForm = TRUE;
@@ -769,8 +769,8 @@ void Uic::createFormImpl( const TQDomElement &e )
 	}
     }
     if ( dbForm || subDbForms ) {
-	globalIncludes += "qsqlform.h";
-	globalIncludes += "qsqlrecord.h";
+	globalIncludes += "ntqsqlform.h";
+	globalIncludes += "ntqsqlrecord.h";
     }
 
     // do the local includes afterwards, since global includes have priority on clashes
@@ -803,12 +803,12 @@ void Uic::createFormImpl( const TQDomElement &e )
 	for ( i = 1; i < (int) nl.length(); i++ ) { // start at 1, 0 is the toplevel widget
 	    TQString name = getClassName( nl.item(i).toElement() );
 	    if ( name == "Spacer" ) {
-		globalIncludes += "qlayout.h";
-		globalIncludes += "qapplication.h";
+		globalIncludes += "ntqlayout.h";
+		globalIncludes += "ntqapplication.h";
 		continue;
 	    }
 	    if (( name.mid( 1 ) == "ListView" ) || ( name.mid( 2 ) == "ListView" ))
-		globalIncludes += "qheader.h";
+		globalIncludes += "ntqheader.h";
 	    if ( name != objClass ) {
 		int wid = WidgetDatabase::idFromClassName( name );
 		TQMap<TQString, CustomInclude>::Iterator it = customWidgetIncludes.find( name );
@@ -818,7 +818,7 @@ void Uic::createFormImpl( const TQDomElement &e )
 	}
     }
 
-    out << "#include <qvariant.h>" << endl; // first for gcc 2.7.2
+    out << "#include <ntqvariant.h>" << endl; // first for gcc 2.7.2
 
     globalIncludes = unique( globalIncludes );
     for ( it = globalIncludes.begin(); it != globalIncludes.end(); ++it ) {
@@ -826,14 +826,14 @@ void Uic::createFormImpl( const TQDomElement &e )
 	    out << "#include <" << *it << ">" << endl;
     }
 
-    out << "#include <qlayout.h>" << endl;
-    out << "#include <qtooltip.h>" << endl;
-    out << "#include <qwhatsthis.h>" << endl;
+    out << "#include <ntqlayout.h>" << endl;
+    out << "#include <ntqtooltip.h>" << endl;
+    out << "#include <ntqwhatsthis.h>" << endl;
     if ( objClass == "TQMainWindow" ) {
-	out << "#include <qaction.h>" << endl;
-	out << "#include <qmenubar.h>" << endl;
-	out << "#include <qpopupmenu.h>" << endl;
-	out << "#include <qtoolbar.h>" << endl;
+	out << "#include <ntqaction.h>" << endl;
+	out << "#include <ntqmenubar.h>" << endl;
+	out << "#include <ntqpopupmenu.h>" << endl;
+	out << "#include <ntqtoolbar.h>" << endl;
     }
 
     // find out what images are required
@@ -851,8 +851,8 @@ void Uic::createFormImpl( const TQDomElement &e )
     }
 
     if ( !requiredImages.isEmpty() || externPixmaps ) {
-	out << "#include <qimage.h>" << endl;
-	out << "#include <qpixmap.h>" << endl << endl;
+	out << "#include <ntqimage.h>" << endl;
+	out << "#include <ntqpixmap.h>" << endl << endl;
     }
 
     /*
diff --git a/tools/designer/uic/main.cpp b/tools/designer/uic/main.cpp
index 19a4854d8..452aad978 100644
--- a/tools/designer/uic/main.cpp
+++ b/tools/designer/uic/main.cpp
@@ -36,11 +36,11 @@
 #if defined(UIB)
 #include "ui2uib.h"
 #endif
-#include <qapplication.h>
-#include <qfile.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
-#include <qsettings.h>
+#include <ntqapplication.h>
+#include <ntqfile.h>
+#include <ntqstringlist.h>
+#include <ntqdatetime.h>
+#include <ntqsettings.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 #include <stdio.h>
diff --git a/tools/designer/uic/object.cpp b/tools/designer/uic/object.cpp
index 87dbd3b31..82aabee32 100644
--- a/tools/designer/uic/object.cpp
+++ b/tools/designer/uic/object.cpp
@@ -34,9 +34,9 @@
 #include "uic.h"
 #include "parser.h"
 #include "domtool.h"
-#include <qregexp.h>
-#include <qsizepolicy.h>
-#include <qstringlist.h>
+#include <ntqregexp.h>
+#include <ntqsizepolicy.h>
+#include <ntqstringlist.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 #include "../interfaces/widgetinterface.h"
diff --git a/tools/designer/uic/subclassing.cpp b/tools/designer/uic/subclassing.cpp
index d5da48f91..f89b2ffb4 100644
--- a/tools/designer/uic/subclassing.cpp
+++ b/tools/designer/uic/subclassing.cpp
@@ -35,12 +35,12 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <qfile.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
+#include <ntqfile.h>
+#include <ntqstringlist.h>
+#include <ntqdatetime.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <qregexp.h>
+#include <ntqregexp.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tools/designer/uic/uic.cpp b/tools/designer/uic/uic.cpp
index 8faea579d..59a9a1d1d 100644
--- a/tools/designer/uic/uic.cpp
+++ b/tools/designer/uic/uic.cpp
@@ -35,12 +35,12 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <qfile.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
+#include <ntqfile.h>
+#include <ntqstringlist.h>
+#include <ntqdatetime.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <qregexp.h>
+#include <ntqregexp.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tools/designer/uic/uic.h b/tools/designer/uic/uic.h
index 35d9ed0ab..fd616ecd1 100644
--- a/tools/designer/uic/uic.h
+++ b/tools/designer/uic/uic.h
@@ -33,13 +33,13 @@
 
 #ifndef UIC_H
 #define UIC_H
-#include <qdom.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qmap.h>
-#include <qtextstream.h>
-#include <qpalette.h>
-#include <qvariant.h>
+#include <ntqdom.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqmap.h>
+#include <ntqtextstream.h>
+#include <ntqpalette.h>
+#include <ntqvariant.h>
 
 class Uic : public TQt
 {