Update to latest tqt3 automated conversion

2 files changed, 23 insertions, 23 deletions

diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp
index a56001132..f0b6772f9 100644
--- a/tools/qconfig/main.cpp
+++ b/tools/qconfig/main.cpp
@@ -32,19 +32,19 @@
 **********************************************************************/
 
 #include "main.h"
-#include <qapplication.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qlistview.h>
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qmessagebox.h>
-#include <qpopupmenu.h>
-#include <qmenubar.h>
-#include <qtoolbutton.h>
-#include <qstatusbar.h>
-#include <qsplitter.h>
-#include <qregexp.h>
+#include <ntqapplication.h>
+#include <ntqfile.h>
+#include <ntqtextstream.h>
+#include <ntqlistview.h>
+#include <ntqhbox.h>
+#include <ntqlabel.h>
+#include <ntqmessagebox.h>
+#include <ntqpopupmenu.h>
+#include <ntqmenubar.h>
+#include <ntqtoolbutton.h>
+#include <ntqstatusbar.h>
+#include <ntqsplitter.h>
+#include <ntqregexp.h>
 #if defined(Q_OS_WIN32)
 #include <direct.h>
 #else
@@ -363,11 +363,11 @@ void Main::testAll()
     // system("./feature_size_calculator");
 
 #if 0
-    system("mv ../include/qconfig.h ../include/qconfig.h-orig");
+    system("mv ../include/ntqconfig.h ../include/ntqconfig.h-orig");
     for (TQStringList::ConstIterator it = choices.begin(); it != choices.end(); ++it)
     {
 	TQString choice = *it;
-	TQFile f("../include/qconfig.h");
+	TQFile f("../include/ntqconfig.h");
 	f.open(IO_WriteOnly);
 	TQCString s = "#define ";
 	s += choice.latin1();
@@ -378,7 +378,7 @@ void Main::testAll()
 	if ( err != 0 )
 	    break;
     }
-    system("mv ../include/qconfig.h-orig ../include/qconfig.h");
+    system("mv ../include/ntqconfig.h-orig ../include/ntqconfig.h");
 #endif
 }
 
@@ -582,7 +582,7 @@ void Main::loadConfig(const TQString& filename)
 	    if ( i )
 		i->setDefined(TRUE);
 	    else
-		qDebug("The item %s is not used by qfeatures.h", token[1].latin1());
+		qDebug("The item %s is not used by ntqfeatures.h", token[1].latin1());
 	}
     } while (!s.atEnd());
 }
@@ -714,8 +714,8 @@ int main(int argc, char** argv)
     Main m;
     TQString qtdir = getenv("QTDIR");
     TQString qfeatures = qtdir + "/src/tools/qfeatures.txt";
-    //TQString qfeatures = qtdir + "/include/qfeatures.h";
-    TQString qconfig = qtdir + "/include/qconfig.h";
+    //TQString qfeatures = qtdir + "/include/ntqfeatures.h";
+    TQString qconfig = qtdir + "/include/ntqconfig.h";
     for (int i=1; i<argc; i++) {
 	TQString arg = argv[i];
 	if ( arg == "-f" && i+i<argc ) {
diff --git a/tools/qconfig/main.h b/tools/qconfig/main.h
index 6e4f1fb03..6d68b97db 100644
--- a/tools/qconfig/main.h
+++ b/tools/qconfig/main.h
@@ -31,10 +31,10 @@
 **
 **********************************************************************/
 
-#include <qmainwindow.h>
-#include <qmap.h>
-#include <qstringlist.h>
-#include <qtextbrowser.h>
+#include <ntqmainwindow.h>
+#include <ntqmap.h>
+#include <ntqstringlist.h>
+#include <ntqtextbrowser.h>
 
 class ChoiceItem;
 class TQListViewItem;