Update to latest tqt3 automated conversion

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2012-01-26 23:32:43 -0600
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2012-01-26 23:32:43 -0600
commit: ea318d1431c89e647598c510c4245c6571aa5f46 (patch)
tree: 996d29b80c30d453dda86d1a23162d441628f169 /tools
parent: aaf89d4b48f69c9293feb187db26362e550b5561 (diff)
download: tqt3-ea318d1431c89e647598c510c4245c6571aa5f46.tar.gz
tqt3-ea318d1431c89e647598c510c4245c6571aa5f46.zip
332 files changed, 1738 insertions, 1738 deletions
diff --git a/tools/assistant/config.cpp b/tools/assistant/config.cpp
index 931985bd..9a829589 100644
--- a/tools/assistant/config.cpp
+++ b/tools/assistant/config.cpp
@@ -35,12 +35,12 @@
 #include "profile.h"
 #include "docuparser.h"
 
-#include <qapplication.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qsettings.h>
-#include <qxml.h>
+#include <ntqapplication.h>
+#include <ntqdir.h>
+#include <ntqfile.h>
+#include <ntqfileinfo.h>
+#include <ntqsettings.h>
+#include <ntqxml.h>
 
 static Config *static_configuration = 0;
 
diff --git a/tools/assistant/config.h b/tools/assistant/config.h
index 9a38fb8a..3bf6c6ad 100644
--- a/tools/assistant/config.h
+++ b/tools/assistant/config.h
@@ -36,10 +36,10 @@
 
 #include "profile.h"
 
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qpixmap.h>
-#include <qmap.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqpixmap.h>
+#include <ntqmap.h>
 
 class Profile;
 
diff --git a/tools/assistant/docuparser.cpp b/tools/assistant/docuparser.cpp
index 3d21d286..158d10d9 100644
--- a/tools/assistant/docuparser.cpp
+++ b/tools/assistant/docuparser.cpp
@@ -34,12 +34,12 @@
 #include "docuparser.h"
 #include "profile.h"
 
-#include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qregexp.h>
-#include <qstring.h>
-#include <qxml.h>
+#include <ntqdir.h>
+#include <ntqfile.h>
+#include <ntqfileinfo.h>
+#include <ntqregexp.h>
+#include <ntqstring.h>
+#include <ntqxml.h>
 
 TQDataStream &operator>>( TQDataStream &s, ContentItem &ci )
 {
diff --git a/tools/assistant/docuparser.h b/tools/assistant/docuparser.h
index 820766c3..919c3145 100644
--- a/tools/assistant/docuparser.h
+++ b/tools/assistant/docuparser.h
@@ -34,9 +34,9 @@
 #ifndef DOCUPARSER_H
 #define DOCUPARSER_H
 
-#include <qxml.h>
-#include <qptrlist.h>
-#include <qmap.h>
+#include <ntqxml.h>
+#include <ntqptrlist.h>
+#include <ntqmap.h>
 
 class Profile;
 
diff --git a/tools/assistant/finddialog.ui b/tools/assistant/finddialog.ui
index 6e7e8253..7b09fe96 100644
--- a/tools/assistant/finddialog.ui
+++ b/tools/assistant/finddialog.ui
@@ -254,8 +254,8 @@
     <tabstop>PushButton2</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in implementation">qstatusbar.h</include>
-    <include location="global" impldecl="in implementation">qtextbrowser.h</include>
+    <include location="global" impldecl="in implementation">ntqstatusbar.h</include>
+    <include location="global" impldecl="in implementation">ntqtextbrowser.h</include>
     <include location="local" impldecl="in implementation">mainwindow.h</include>
     <include location="local" impldecl="in implementation">tabbedbrowser.h</include>
     <include location="local" impldecl="in implementation">finddialog.ui.h</include>
diff --git a/tools/assistant/finddialog.ui.h b/tools/assistant/finddialog.ui.h
index 7e07a4f9..f356dd4c 100644
--- a/tools/assistant/finddialog.ui.h
+++ b/tools/assistant/finddialog.ui.h
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <qapplication.h>
+#include <ntqapplication.h>
 
 void FindDialog::init()
 {
diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp
index 81d216f8..f299ee8e 100644
--- a/tools/assistant/helpdialogimpl.cpp
+++ b/tools/assistant/helpdialogimpl.cpp
@@ -39,31 +39,31 @@
 #include "config.h"
 #include "tabbedbrowser.h"
 
-#include <qaccel.h>
-#include <qapplication.h>
-#include <qcursor.h>
-#include <qdir.h>
-#include <qeventloop.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qheader.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qmessagebox.h>
-#include <qpixmap.h>
-#include <qprogressbar.h>
-#include <qptrlist.h>
-#include <qptrstack.h>
-#include <qpushbutton.h>
-#include <qregexp.h>
-#include <qsettings.h>
-#include <qstatusbar.h>
-#include <qtabwidget.h>
-#include <qtextbrowser.h>
-#include <qtextstream.h>
-#include <qtimer.h>
-#include <qurl.h>
-#include <qvalidator.h>
+#include <ntqaccel.h>
+#include <ntqapplication.h>
+#include <ntqcursor.h>
+#include <ntqdir.h>
+#include <ntqeventloop.h>
+#include <ntqfile.h>
+#include <ntqfileinfo.h>
+#include <ntqheader.h>
+#include <ntqlabel.h>
+#include <ntqlineedit.h>
+#include <ntqmessagebox.h>
+#include <ntqpixmap.h>
+#include <ntqprogressbar.h>
+#include <ntqptrlist.h>
+#include <ntqptrstack.h>
+#include <ntqpushbutton.h>
+#include <ntqregexp.h>
+#include <ntqsettings.h>
+#include <ntqstatusbar.h>
+#include <ntqtabwidget.h>
+#include <ntqtextbrowser.h>
+#include <ntqtextstream.h>
+#include <ntqtimer.h>
+#include <ntqurl.h>
+#include <ntqvalidator.h>
 
 #include <stdlib.h>
 #include <limits.h>
diff --git a/tools/assistant/helpdialogimpl.h b/tools/assistant/helpdialogimpl.h
index a12317b8..04faa1f5 100644
--- a/tools/assistant/helpdialogimpl.h
+++ b/tools/assistant/helpdialogimpl.h
@@ -39,14 +39,14 @@
 #include "helpwindow.h"
 #include "docuparser.h"
 
-#include <qlistbox.h>
-#include <qlistview.h>
-#include <qmap.h>
-#include <qstringlist.h>
-#include <qvalidator.h>
-#include <qpopupmenu.h>
-#include <qdict.h>
-#include <qpopupmenu.h>
+#include <ntqlistbox.h>
+#include <ntqlistview.h>
+#include <ntqmap.h>
+#include <ntqstringlist.h>
+#include <ntqvalidator.h>
+#include <ntqpopupmenu.h>
+#include <ntqdict.h>
+#include <ntqpopupmenu.h>
 
 class TQProgressBar;
 class MainWindow;
diff --git a/tools/assistant/helpwindow.cpp b/tools/assistant/helpwindow.cpp
index 3230afce..266fa972 100644
--- a/tools/assistant/helpwindow.cpp
+++ b/tools/assistant/helpwindow.cpp
@@ -37,19 +37,19 @@
 #include "helpdialogimpl.h"
 #include "config.h"
 
-#include <qapplication.h>
-#include <qclipboard.h>
-#include <qurl.h>
-#include <qmessagebox.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qprocess.h>
-#include <qpopupmenu.h>
-#include <qaction.h>
-#include <qfileinfo.h>
-#include <qevent.h>
-#include <qtextstream.h>
-#include <qtextcodec.h>
+#include <ntqapplication.h>
+#include <ntqclipboard.h>
+#include <ntqurl.h>
+#include <ntqmessagebox.h>
+#include <ntqdir.h>
+#include <ntqfile.h>
+#include <ntqprocess.h>
+#include <ntqpopupmenu.h>
+#include <ntqaction.h>
+#include <ntqfileinfo.h>
+#include <ntqevent.h>
+#include <ntqtextstream.h>
+#include <ntqtextcodec.h>
 
 #if defined(Q_OS_WIN32)
 #include <windows.h>
diff --git a/tools/assistant/helpwindow.h b/tools/assistant/helpwindow.h
index d12ece1f..db89947d 100644
--- a/tools/assistant/helpwindow.h
+++ b/tools/assistant/helpwindow.h
@@ -34,7 +34,7 @@
 #ifndef HELPWINDOW_H
 #define HELPWINDOW_H
 
-#include <qtextbrowser.h>
+#include <ntqtextbrowser.h>
 
 class MainWindow;
 class TQKeyEvent;
diff --git a/tools/assistant/index.cpp b/tools/assistant/index.cpp
index 4f04f595..4ce081de 100644
--- a/tools/assistant/index.cpp
+++ b/tools/assistant/index.cpp
@@ -33,11 +33,11 @@
 
 #include "index.h"
 
-#include <qfile.h>
-#include <qdir.h>
-#include <qstringlist.h>
-#include <qdict.h>
-#include <qapplication.h>
+#include <ntqfile.h>
+#include <ntqdir.h>
+#include <ntqstringlist.h>
+#include <ntqdict.h>
+#include <ntqapplication.h>
 
 #include <ctype.h>
 
diff --git a/tools/assistant/index.h b/tools/assistant/index.h
index 236b03db..333e41b7 100644
--- a/tools/assistant/index.h
+++ b/tools/assistant/index.h
@@ -34,10 +34,10 @@
 #ifndef INDEX_H
 #define INDEX_H
 
-#include <qstringlist.h>
-#include <qdict.h>
-#include <qdatastream.h>
-#include <qobject.h>
+#include <ntqstringlist.h>
+#include <ntqdict.h>
+#include <ntqdatastream.h>
+#include <ntqobject.h>
 
 struct Document {
     Document( int d, int f ) : docNumber( d ), frequency( f ) {}
diff --git a/tools/assistant/lib/lib.pro b/tools/assistant/lib/lib.pro
index 09beced5..af1b1c6c 100644
--- a/tools/assistant/lib/lib.pro
+++ b/tools/assistant/lib/lib.pro
@@ -7,7 +7,7 @@ CONFIG		+= staticlib
 CONFIG		-= dll
 
 SOURCES		= qassistantclient.cpp
-HEADERS         += $$QT_SOURCE_TREE/include/qassistantclient.h
+HEADERS         += $$QT_SOURCE_TREE/include/ntqassistantclient.h
 
 
 DEFINES		+= QT_INTERNAL_NETWORK
diff --git a/tools/assistant/lib/qassistantclient.h b/tools/assistant/lib/ntqassistantclient.h
index 891dc1ba..28fd6693 100644
--- a/tools/assistant/lib/qassistantclient.h
+++ b/tools/assistant/lib/ntqassistantclient.h
@@ -34,7 +34,7 @@
 #ifndef TQASSISTANTCLIENT_H
 #define TQASSISTANTCLIENT_H
 
-#include <qobject.h>
+#include <ntqobject.h>
 
 class TQSocket;
 class TQProcess;
diff --git a/tools/assistant/lib/qassistantclient.cpp b/tools/assistant/lib/qassistantclient.cpp
index d6acac3c..b0fc0df3 100644
--- a/tools/assistant/lib/qassistantclient.cpp
+++ b/tools/assistant/lib/qassistantclient.cpp
@@ -31,13 +31,13 @@
 **
 **********************************************************************/
 
-#include "qassistantclient.h"
+#include "ntqassistantclient.h"
 
-#include <qsocket.h>
-#include <qtextstream.h>
-#include <qprocess.h>
-#include <qtimer.h>
-#include <qfileinfo.h>
+#include <ntqsocket.h>
+#include <ntqtextstream.h>
+#include <ntqprocess.h>
+#include <ntqtimer.h>
+#include <ntqfileinfo.h>
 
 class TQAssistantClientPrivate
 {
diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp
index b0c0082a..dc99b7a1 100644
--- a/tools/assistant/main.cpp
+++ b/tools/assistant/main.cpp
@@ -35,18 +35,18 @@
 #include "helpdialogimpl.h"
 #include "config.h"
 
-#include <qapplication.h>
-#include <qserversocket.h>
-#include <qsocket.h>
-#include <qpixmap.h>
-#include <qptrlist.h>
-#include <qstringlist.h>
-#include <qdir.h>
-#include <qmessagebox.h>
-#include <qguardedptr.h>
+#include <ntqapplication.h>
+#include <ntqserversocket.h>
+#include <ntqsocket.h>
+#include <ntqpixmap.h>
+#include <ntqptrlist.h>
+#include <ntqstringlist.h>
+#include <ntqdir.h>
+#include <ntqmessagebox.h>
+#include <ntqguardedptr.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <qtextcodec.h>
+#include <ntqtextcodec.h>
 
 #ifdef Q_WS_WIN
 #define INDEX_CHECK( text ) if( i+1 >= argc ) { TQMessageBox::information( 0, "TQt Assistant", text ); return 1; }
diff --git a/tools/assistant/mainwindow.ui b/tools/assistant/mainwindow.ui
index a5d87237..7087e2f3 100644
--- a/tools/assistant/mainwindow.ui
+++ b/tools/assistant/mainwindow.ui
@@ -570,37 +570,37 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in implementation">qtoolbutton.h</include>
+    <include location="global" impldecl="in implementation">ntqtoolbutton.h</include>
     <include location="local" impldecl="in implementation">settingsdialogimpl.h</include>
-    <include location="global" impldecl="in implementation">qmessagebox.h</include>
-    <include location="global" impldecl="in implementation">qfontdatabase.h</include>
-    <include location="global" impldecl="in implementation">qaccel.h</include>
-    <include location="global" impldecl="in implementation">qcombobox.h</include>
-    <include location="global" impldecl="in implementation">qpaintdevicemetrics.h</include>
-    <include location="global" impldecl="in implementation">qsimplerichtext.h</include>
-    <include location="global" impldecl="in implementation">qfileinfo.h</include>
-    <include location="global" impldecl="in implementation">qtextstream.h</include>
-    <include location="global" impldecl="in implementation">qdockwindow.h</include>
+    <include location="global" impldecl="in implementation">ntqmessagebox.h</include>
+    <include location="global" impldecl="in implementation">ntqfontdatabase.h</include>
+    <include location="global" impldecl="in implementation">ntqaccel.h</include>
+    <include location="global" impldecl="in implementation">ntqcombobox.h</include>
+    <include location="global" impldecl="in implementation">ntqpaintdevicemetrics.h</include>
+    <include location="global" impldecl="in implementation">ntqsimplerichtext.h</include>
+    <include location="global" impldecl="in implementation">ntqfileinfo.h</include>
+    <include location="global" impldecl="in implementation">ntqtextstream.h</include>
+    <include location="global" impldecl="in implementation">ntqdockwindow.h</include>
     <include location="global" impldecl="in implementation">stdlib.h</include>
-    <include location="global" impldecl="in implementation">qmime.h</include>
+    <include location="global" impldecl="in implementation">ntqmime.h</include>
     <include location="local" impldecl="in implementation">helpwindow.h</include>
-    <include location="global" impldecl="in implementation">qstylesheet.h</include>
-    <include location="global" impldecl="in implementation">qapplication.h</include>
+    <include location="global" impldecl="in implementation">ntqstylesheet.h</include>
+    <include location="global" impldecl="in implementation">ntqapplication.h</include>
     <include location="local" impldecl="in implementation">helpdialogimpl.h</include>
-    <include location="global" impldecl="in implementation">qdir.h</include>
-    <include location="global" impldecl="in implementation">qprinter.h</include>
-    <include location="global" impldecl="in implementation">qpainter.h</include>
-    <include location="global" impldecl="in implementation">qurl.h</include>
-    <include location="global" impldecl="in implementation">qstatusbar.h</include>
-    <include location="global" impldecl="in implementation">qlineedit.h</include>
-    <include location="global" impldecl="in implementation">qsettings.h</include>
-    <include location="global" impldecl="in implementation">qcheckbox.h</include>
+    <include location="global" impldecl="in implementation">ntqdir.h</include>
+    <include location="global" impldecl="in implementation">ntqprinter.h</include>
+    <include location="global" impldecl="in implementation">ntqpainter.h</include>
+    <include location="global" impldecl="in implementation">ntqurl.h</include>
+    <include location="global" impldecl="in implementation">ntqstatusbar.h</include>
+    <include location="global" impldecl="in implementation">ntqlineedit.h</include>
+    <include location="global" impldecl="in implementation">ntqsettings.h</include>
+    <include location="global" impldecl="in implementation">ntqcheckbox.h</include>
     <include location="local" impldecl="in implementation">tabbedbrowser.h</include>
-    <include location="global" impldecl="in declaration">qptrlist.h</include>
-    <include location="global" impldecl="in declaration">qguardedptr.h</include>
-    <include location="global" impldecl="in declaration">qmap.h</include>
+    <include location="global" impldecl="in declaration">ntqptrlist.h</include>
+    <include location="global" impldecl="in declaration">ntqguardedptr.h</include>
+    <include location="global" impldecl="in declaration">ntqmap.h</include>
     <include location="local" impldecl="in declaration">finddialog.h</include>
-    <include location="global" impldecl="in declaration">qstringlist.h</include>
+    <include location="global" impldecl="in declaration">ntqstringlist.h</include>
     <include location="local" impldecl="in declaration">helpwindow.h</include>
     <include location="local" impldecl="in implementation">mainwindow.ui.h</include>
 </includes>
diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h
index 9b4c7d97..a0824271 100644
--- a/tools/assistant/mainwindow.ui.h
+++ b/tools/assistant/mainwindow.ui.h
@@ -33,16 +33,16 @@
 
 #include "config.h"
 
-#include <qtabwidget.h>
-#include <qfileinfo.h>
-#include <qaccel.h>
-#include <qobjectlist.h>
-#include <qtimer.h>
-#include <qdragobject.h>
-#include <qfontinfo.h>
-#include <qaccel.h>
-#include <qmetaobject.h>
-#include <qeventloop.h>
+#include <ntqtabwidget.h>
+#include <ntqfileinfo.h>
+#include <ntqaccel.h>
+#include <ntqobjectlist.h>
+#include <ntqtimer.h>
+#include <ntqdragobject.h>
+#include <ntqfontinfo.h>
+#include <ntqaccel.h>
+#include <ntqmetaobject.h>
+#include <ntqeventloop.h>
 
 TQPtrList<MainWindow> *MainWindow::windows = 0;
 
diff --git a/tools/assistant/profile.cpp b/tools/assistant/profile.cpp
index 8eb7330d..231520ee 100644
--- a/tools/assistant/profile.cpp
+++ b/tools/assistant/profile.cpp
@@ -31,11 +31,11 @@
 **
 **********************************************************************/
 #include "profile.h"
-#include <qxml.h>
-#include <qtextcodec.h>
-#include <qfileinfo.h>
-#include <qregexp.h>
-#include <qdir.h>
+#include <ntqxml.h>
+#include <ntqtextcodec.h>
+#include <ntqfileinfo.h>
+#include <ntqregexp.h>
+#include <ntqdir.h>
 
 #define QT_TITLE "TQt Reference Documentation"
 #define DESIGNER_TITLE "TQt Designer Manual"
diff --git a/tools/assistant/profile.h b/tools/assistant/profile.h
index dbc14036..5d3dd34e 100644
--- a/tools/assistant/profile.h
+++ b/tools/assistant/profile.h
@@ -34,10 +34,10 @@
 #ifndef PROFILE_H
 #define PROFILE_H
 
-#include <qfileinfo.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qmap.h>
+#include <ntqfileinfo.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqmap.h>
 
 class DocuParser;
 
diff --git a/tools/assistant/settingsdialogimpl.cpp b/tools/assistant/settingsdialogimpl.cpp
index f0edcc13..e9111d6d 100644
--- a/tools/assistant/settingsdialogimpl.cpp
+++ b/tools/assistant/settingsdialogimpl.cpp
@@ -35,23 +35,23 @@
 #include "docuparser.h"
 #include "config.h"
 
-#include <qapplication.h>
-#include <qpushbutton.h>
-#include <qcheckbox.h>
-#include <qcolordialog.h>
-#include <qdir.h>
-#include <qfiledialog.h>
-#include <qfileinfo.h>
-#include <qlineedit.h>
-#include <qlistbox.h>
-#include <qlistview.h>
-#include <qmessagebox.h>
-#include <qptrstack.h>
-#include <qsettings.h>
-#include <qtimer.h>
-#include <qtoolbutton.h>
-#include <qtabwidget.h>
-#include <qmap.h>
+#include <ntqapplication.h>
+#include <ntqpushbutton.h>
+#include <ntqcheckbox.h>
+#include <ntqcolordialog.h>
+#include <ntqdir.h>
+#include <ntqfiledialog.h>
+#include <ntqfileinfo.h>
+#include <ntqlineedit.h>
+#include <ntqlistbox.h>
+#include <ntqlistview.h>
+#include <ntqmessagebox.h>
+#include <ntqptrstack.h>
+#include <ntqsettings.h>
+#include <ntqtimer.h>
+#include <ntqtoolbutton.h>
+#include <ntqtabwidget.h>
+#include <ntqmap.h>
 
 
 SettingsDialog::SettingsDialog( TQWidget *parent, const char* name )
diff --git a/tools/assistant/settingsdialogimpl.h b/tools/assistant/settingsdialogimpl.h
index 3fed9068..77273dc8 100644
--- a/tools/assistant/settingsdialogimpl.h
+++ b/tools/assistant/settingsdialogimpl.h
@@ -36,9 +36,9 @@
 
 #include "settingsdialog.h"
 
-#include <qstringlist.h>
-#include <qptrlist.h>
-#include <qlistview.h>
+#include <ntqstringlist.h>
+#include <ntqptrlist.h>
+#include <ntqlistview.h>
 
 class SettingsDialog : public SettingsDialogBase
 {
diff --git a/tools/assistant/tabbedbrowser.ui b/tools/assistant/tabbedbrowser.ui
index 33dd9170..906fcecb 100644
--- a/tools/assistant/tabbedbrowser.ui
+++ b/tools/assistant/tabbedbrowser.ui
@@ -78,11 +78,11 @@
     </grid>
 </widget>
 <includes>
-    <include location="global" impldecl="in declaration">qsettings.h</include>
+    <include location="global" impldecl="in declaration">ntqsettings.h</include>
     <include location="local" impldecl="in implementation">helpwindow.h</include>
     <include location="local" impldecl="in implementation">mainwindow.h</include>
-    <include location="global" impldecl="in implementation">qstylesheet.h</include>
-    <include location="global" impldecl="in implementation">qmime.h</include>
+    <include location="global" impldecl="in implementation">ntqstylesheet.h</include>
+    <include location="global" impldecl="in implementation">ntqmime.h</include>
     <include location="local" impldecl="in implementation">tabbedbrowser.ui.h</include>
 </includes>
 <forwards>
diff --git a/tools/assistant/tabbedbrowser.ui.h b/tools/assistant/tabbedbrowser.ui.h
index 8f2324e5..6663b53a 100644
--- a/tools/assistant/tabbedbrowser.ui.h
+++ b/tools/assistant/tabbedbrowser.ui.h
@@ -7,12 +7,12 @@
 ** place of a destructor.
 *****************************************************************************/
 
-#include <qfileinfo.h>
-#include <qtoolbutton.h>
-#include <qpixmap.h>
-#include <qiconset.h>
-#include <qstyle.h>
-#include <qtimer.h>
+#include <ntqfileinfo.h>
+#include <ntqtoolbutton.h>
+#include <ntqpixmap.h>
+#include <ntqiconset.h>
+#include <ntqstyle.h>
+#include <ntqtimer.h>
 
 #include "config.h"
 
diff --git a/tools/assistant/topicchooserimpl.cpp b/tools/assistant/topicchooserimpl.cpp
index 7e8e685d..736aa484 100644
--- a/tools/assistant/topicchooserimpl.cpp
+++ b/tools/assistant/topicchooserimpl.cpp
@@ -33,9 +33,9 @@
 
 #include "topicchooserimpl.h"
 
-#include <qlabel.h>
-#include <qlistbox.h>
-#include <qpushbutton.h>
+#include <ntqlabel.h>
+#include <ntqlistbox.h>
+#include <ntqpushbutton.h>
 
 TopicChooser::TopicChooser( TQWidget *parent, const TQStringList &lnkNames,
 			    const TQStringList &lnks, const TQString &title )
diff --git a/tools/assistant/topicchooserimpl.h b/tools/assistant/topicchooserimpl.h
index 34334e6e..bc3fbd41 100644
--- a/tools/assistant/topicchooserimpl.h
+++ b/tools/assistant/topicchooserimpl.h
@@ -36,7 +36,7 @@
 
 #include "topicchooser.h"
 
-#include <qstringlist.h>
+#include <ntqstringlist.h>
 
 class TopicChooser : public TopicChooserBase
 {
diff --git a/tools/designer/app/main.cpp b/tools/designer/app/main.cpp
index 30933ba7..b88eddbf 100644
--- a/tools/designer/app/main.cpp
+++ b/tools/designer/app/main.cpp
@@ -43,11 +43,11 @@
 
 #include "designerapp.h"
 
-#include <qtextstream.h>
-#include <qobjectlist.h>
-#include <qsettings.h>
-#include <qsplashscreen.h>
-#include <qdir.h>
+#include <ntqtextstream.h>
+#include <ntqobjectlist.h>
+#include <ntqsettings.h>
+#include <ntqsplashscreen.h>
+#include <ntqdir.h>
 
 #include <stdlib.h>
 #include <signal.h>
diff --git a/tools/designer/designer/actiondnd.cpp b/tools/designer/designer/actiondnd.cpp
index 81231709..1f9e8328 100644
--- a/tools/designer/designer/actiondnd.cpp
+++ b/tools/designer/designer/actiondnd.cpp
@@ -40,19 +40,19 @@
 #include "widgetfactory.h"
 #include "hierarchyview.h"
 
-#include <qaction.h>
-#include <qapplication.h>
-#include <qbitmap.h>
-#include <qdragobject.h>
-#include <qinputdialog.h>
-#include <qlayout.h>
-#include <qmainwindow.h>
-#include <qmenudata.h>
-#include <qmessagebox.h>
-#include <qobjectlist.h>
-#include <qpainter.h>
-#include <qstyle.h>
-#include <qtimer.h>
+#include <ntqaction.h>
+#include <ntqapplication.h>
+#include <ntqbitmap.h>
+#include <ntqdragobject.h>
+#include <ntqinputdialog.h>
+#include <ntqlayout.h>
+#include <ntqmainwindow.h>
+#include <ntqmenudata.h>
+#include <ntqmessagebox.h>
+#include <ntqobjectlist.h>
+#include <ntqpainter.h>
+#include <ntqstyle.h>
+#include <ntqtimer.h>
 
 TQAction *ActionDrag::the_action = 0;
 
diff --git a/tools/designer/designer/actiondnd.h b/tools/designer/designer/actiondnd.h
index e3a93658..ba21ff5a 100644
--- a/tools/designer/designer/actiondnd.h
+++ b/tools/designer/designer/actiondnd.h
@@ -34,15 +34,15 @@
 #ifndef ACTIONDND_H
 #define ACTIONDND_H
 
-#include <qaction.h>
-#include <qdragobject.h>
-#include <qmap.h>
-#include <qmenubar.h>
-#include <qpixmap.h>
-#include <qpopupmenu.h>
-#include <qptrlist.h>
-#include <qtoolbar.h>
-#include <qguardedptr.h>
+#include <ntqaction.h>
+#include <ntqdragobject.h>
+#include <ntqmap.h>
+#include <ntqmenubar.h>
+#include <ntqpixmap.h>
+#include <ntqpopupmenu.h>
+#include <ntqptrlist.h>
+#include <ntqtoolbar.h>
+#include <ntqguardedptr.h>
 #include "../shared/widgetdatabase.h"
 
 //class TQDesignerPopupMenu;
diff --git a/tools/designer/designer/actioneditorimpl.cpp b/tools/designer/designer/actioneditorimpl.cpp
index e6af9502..88587cdc 100644
--- a/tools/designer/designer/actioneditorimpl.cpp
+++ b/tools/designer/designer/actioneditorimpl.cpp
@@ -40,15 +40,15 @@
 #include "hierarchyview.h"
 #include "formfile.h"
 
-#include <qaction.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qtoolbutton.h>
-#include <qlistview.h>
-#include <qcheckbox.h>
-#include <qpushbutton.h>
-#include <qpopupmenu.h>
-#include <qobjectlist.h>
+#include <ntqaction.h>
+#include <ntqlineedit.h>
+#include <ntqlabel.h>
+#include <ntqtoolbutton.h>
+#include <ntqlistview.h>
+#include <ntqcheckbox.h>
+#include <ntqpushbutton.h>
+#include <ntqpopupmenu.h>
+#include <ntqobjectlist.h>
 
 ActionEditor::ActionEditor( TQWidget* parent,  const char* name, WFlags fl )
     : ActionEditorBase( parent, name, fl ), currentAction( 0 ), formWindow( 0 ),
diff --git a/tools/designer/designer/actionlistview.cpp b/tools/designer/designer/actionlistview.cpp
index 489bbebb..fe3bc92b 100644
--- a/tools/designer/designer/actionlistview.cpp
+++ b/tools/designer/designer/actionlistview.cpp
@@ -33,7 +33,7 @@
 
 #include "actiondnd.h"
 #include "actionlistview.h"
-#include <qheader.h>
+#include <ntqheader.h>
 
 ActionListView::ActionListView( TQWidget *parent, const char *name )
     : TQListView( parent, name )
diff --git a/tools/designer/designer/actionlistview.h b/tools/designer/designer/actionlistview.h
index bedc17ef..d9663368 100644
--- a/tools/designer/designer/actionlistview.h
+++ b/tools/designer/designer/actionlistview.h
@@ -34,7 +34,7 @@
 #ifndef ACTIONLISTVIEW_H
 #define ACTIONLISTVIEW_H
 
-#include <qlistview.h>
+#include <ntqlistview.h>
 #include "actiondnd.h"
 
 class ActionItem : public TQListViewItem
diff --git a/tools/designer/designer/asciivalidator.cpp b/tools/designer/designer/asciivalidator.cpp
index 58e7cc2a..640cd1eb 100644
--- a/tools/designer/designer/asciivalidator.cpp
+++ b/tools/designer/designer/asciivalidator.cpp
@@ -33,7 +33,7 @@
 
 #include "asciivalidator.h"
 
-#include <qstring.h>
+#include <ntqstring.h>
 
 AsciiValidator::AsciiValidator( TQObject * parent, const char *name )
     : TQValidator( parent, name ), functionName( FALSE )
diff --git a/tools/designer/designer/asciivalidator.h b/tools/designer/designer/asciivalidator.h
index 065ed934..d3afdfd2 100644
--- a/tools/designer/designer/asciivalidator.h
+++ b/tools/designer/designer/asciivalidator.h
@@ -35,7 +35,7 @@
 #define ASCIIVALIDATOR_H
 
 
-#include <qvalidator.h>
+#include <ntqvalidator.h>
 
 
 class AsciiValidator: public TQValidator
diff --git a/tools/designer/designer/command.cpp b/tools/designer/designer/command.cpp
index 3ce5d2fc..bb25fa86 100644
--- a/tools/designer/designer/command.cpp
+++ b/tools/designer/designer/command.cpp
@@ -46,22 +46,22 @@
 #include "menubareditor.h"
 #include "popupmenueditor.h"
 
-#include <qfeatures.h>
-#include <qwidget.h>
-#include <qmetaobject.h>
-#include <qapplication.h>
-#include <qlayout.h>
-#include <qmessagebox.h>
-#include <qlistbox.h>
-#include <qiconview.h>
-#include <qtextedit.h>
-#include <qptrstack.h>
-#include <qheader.h>
-#include <qsplitter.h>
+#include <ntqfeatures.h>
+#include <ntqwidget.h>
+#include <ntqmetaobject.h>
+#include <ntqapplication.h>
+#include <ntqlayout.h>
+#include <ntqmessagebox.h>
+#include <ntqlistbox.h>
+#include <ntqiconview.h>
+#include <ntqtextedit.h>
+#include <ntqptrstack.h>
+#include <ntqheader.h>
+#include <ntqsplitter.h>
 #ifndef QT_NO_TABLE
-#include <qtable.h>
+#include <ntqtable.h>
 #endif
-#include <qaction.h>
+#include <ntqaction.h>
 
 CommandHistory::CommandHistory( int s )
     : current( -1 ), steps( s ), savedAt( -1 )
diff --git a/tools/designer/designer/command.h b/tools/designer/designer/command.h
index e1e1d897..d6eef4fe 100644
--- a/tools/designer/designer/command.h
+++ b/tools/designer/designer/command.h
@@ -37,15 +37,15 @@
 #include "metadatabase.h"
 #include "layout.h"
 
-#include <qstring.h>
-#include <qrect.h>
-#include <qvaluelist.h>
-#include <qvariant.h>
-#include <qobject.h>
-#include <qlistview.h>
-#include <qptrlist.h>
-#include <qmap.h>
-#include <qiconset.h>
+#include <ntqstring.h>
+#include <ntqrect.h>
+#include <ntqvaluelist.h>
+#include <ntqvariant.h>
+#include <ntqobject.h>
+#include <ntqlistview.h>
+#include <ntqptrlist.h>
+#include <ntqmap.h>
+#include <ntqiconset.h>
 
 class TQWizard;
 class TQTabWidget;
diff --git a/tools/designer/designer/configtoolboxdialog.ui.h b/tools/designer/designer/configtoolboxdialog.ui.h
index 2fe074bb..7aa13de7 100644
--- a/tools/designer/designer/configtoolboxdialog.ui.h
+++ b/tools/designer/designer/configtoolboxdialog.ui.h
@@ -34,7 +34,7 @@
 #include "mainwindow.h"
 #include "widgetaction.h"
 #include "listviewdnd.h"
-#include <qlistview.h>
+#include <ntqlistview.h>
 
 void ConfigToolboxDialog::init()
 {
diff --git a/tools/designer/designer/connectiondialog.ui b/tools/designer/designer/connectiondialog.ui
index 9292bfe1..b938be93 100644
--- a/tools/designer/designer/connectiondialog.ui
+++ b/tools/designer/designer/connectiondialog.ui
@@ -199,7 +199,7 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">qptrlist.h</include>
+    <include location="global" impldecl="in declaration">ntqptrlist.h</include>
     <include location="local" impldecl="in declaration">connectionitems.h</include>
     <include location="local" impldecl="in implementation">connectiondialog.ui.h</include>
 </includes>
diff --git a/tools/designer/designer/connectionitems.cpp b/tools/designer/designer/connectionitems.cpp
index e9a5fdbf..db73c966 100644
--- a/tools/designer/designer/connectionitems.cpp
+++ b/tools/designer/designer/connectionitems.cpp
@@ -37,13 +37,13 @@
 #include "metadatabase.h"
 #include "widgetfactory.h"
 #include "project.h"
-#include <qpainter.h>
-#include <qcombobox.h>
-#include <qmetaobject.h>
-#include <qcombobox.h>
-#include <qlistbox.h>
-#include <qaction.h>
-#include <qdatabrowser.h>
+#include <ntqpainter.h>
+#include <ntqcombobox.h>
+#include <ntqmetaobject.h>
+#include <ntqcombobox.h>
+#include <ntqlistbox.h>
+#include <ntqaction.h>
+#include <ntqdatabrowser.h>
 
 static const char* const ignore_slots[] = {
     "destroyed()",
diff --git a/tools/designer/designer/connectionitems.h b/tools/designer/designer/connectionitems.h
index 56ca528f..60407ae5 100644
--- a/tools/designer/designer/connectionitems.h
+++ b/tools/designer/designer/connectionitems.h
@@ -36,7 +36,7 @@
 
 class FormWindow;
 
-#include <qtable.h>
+#include <ntqtable.h>
 
 class SenderItem;
 class ReceiverItem;
diff --git a/tools/designer/designer/connectiontable.h b/tools/designer/designer/connectiontable.h
index ca7bd835..6a11ce9f 100644
--- a/tools/designer/designer/connectiontable.h
+++ b/tools/designer/designer/connectiontable.h
@@ -34,7 +34,7 @@
 #ifndef CONNECTIONTABLE_H
 #define CONNECTIONTABLE_H
 
-#include <qtable.h>
+#include <ntqtable.h>
 
 class ConnectionTable : public TQTable
 {
diff --git a/tools/designer/designer/customwidgeteditorimpl.cpp b/tools/designer/designer/customwidgeteditorimpl.cpp
index d87be091..ac517f1d 100644
--- a/tools/designer/designer/customwidgeteditorimpl.cpp
+++ b/tools/designer/designer/customwidgeteditorimpl.cpp
@@ -40,23 +40,23 @@
 #include "widgetfactory.h"
 #include "widgetdatabase.h"
 
-#include <qlistbox.h>
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qcombobox.h>
-#include <qspinbox.h>
-#include <qlabel.h>
-#include <qmessagebox.h>
-#include <qfiledialog.h>
-#include <qmessagebox.h>
-#include <qtimer.h>
-#include <qapplication.h>
-#include <qlistview.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qdom.h>
-#include <qtextcodec.h>
-#include <qcheckbox.h>
+#include <ntqlistbox.h>
+#include <ntqpushbutton.h>
+#include <ntqlineedit.h>
+#include <ntqcombobox.h>
+#include <ntqspinbox.h>
+#include <ntqlabel.h>
+#include <ntqmessagebox.h>
+#include <ntqfiledialog.h>
+#include <ntqmessagebox.h>
+#include <ntqtimer.h>
+#include <ntqapplication.h>
+#include <ntqlistview.h>
+#include <ntqfile.h>
+#include <ntqtextstream.h>
+#include <ntqdom.h>
+#include <ntqtextcodec.h>
+#include <ntqcheckbox.h>
 
 CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw )
     : CustomWidgetEditorBase( parent, 0, TRUE ), mainWindow( mw )
diff --git a/tools/designer/designer/customwidgeteditorimpl.h b/tools/designer/designer/customwidgeteditorimpl.h
index d6f42dec..fd645976 100644
--- a/tools/designer/designer/customwidgeteditorimpl.h
+++ b/tools/designer/designer/customwidgeteditorimpl.h
@@ -37,8 +37,8 @@
 #include "customwidgeteditor.h"
 #include "metadatabase.h"
 
-#include <qmap.h>
-#include <qobjectlist.h>
+#include <ntqmap.h>
+#include <ntqobjectlist.h>
 
 class TQTimer;
 class TQListBoxItem;
diff --git a/tools/designer/designer/database.cpp b/tools/designer/designer/database.cpp
index b0399fc3..ca917c1d 100644
--- a/tools/designer/designer/database.cpp
+++ b/tools/designer/designer/database.cpp
@@ -44,10 +44,10 @@
 #include "mainwindow.h"
 #endif
 
-#include <qsqldatabase.h>
-#include <qsqlform.h>
-#include <qsqlcursor.h>
-#include <qsqlrecord.h>
+#include <ntqsqldatabase.h>
+#include <ntqsqlform.h>
+#include <ntqsqlcursor.h>
+#include <ntqsqlrecord.h>
 
 DatabaseSupport::DatabaseSupport()
 {
diff --git a/tools/designer/designer/database.h b/tools/designer/designer/database.h
index aae034e0..3008f783 100644
--- a/tools/designer/designer/database.h
+++ b/tools/designer/designer/database.h
@@ -34,13 +34,13 @@
 #ifndef DATABASE_H
 #define DATABASE_H
 
-#include "qfeatures.h"
+#include "ntqfeatures.h"
 
 #ifndef QT_NO_SQL
-#include <qdataview.h>
-#include <qdatabrowser.h>
-#include <qsqlcursor.h>
-#include <qstring.h>
+#include <ntqdataview.h>
+#include <ntqdatabrowser.h>
+#include <ntqsqlcursor.h>
+#include <ntqstring.h>
 
 class TQSqlDatabase;
 class TQSqlForm;
diff --git a/tools/designer/designer/database2.h b/tools/designer/designer/database2.h
index 3fd1c96a..fade3b8e 100644
--- a/tools/designer/designer/database2.h
+++ b/tools/designer/designer/database2.h
@@ -34,13 +34,13 @@
 #ifndef DATABASE2_H
 #define DATABASE2_H
 
-#include "qfeatures.h"
+#include "ntqfeatures.h"
 
 #ifndef QT_NO_SQL
-#include <qdataview.h>
-#include <qdatabrowser.h>
-#include <qsqlcursor.h>
-#include <qstring.h>
+#include <ntqdataview.h>
+#include <ntqdatabrowser.h>
+#include <ntqsqlcursor.h>
+#include <ntqstring.h>
 
 class TQSqlDatabase;
 class TQSqlForm;
diff --git a/tools/designer/designer/dbconnectionimpl.cpp b/tools/designer/designer/dbconnectionimpl.cpp
index 4e537810..ae6cbac9 100644
--- a/tools/designer/designer/dbconnectionimpl.cpp
+++ b/tools/designer/designer/dbconnectionimpl.cpp
@@ -35,12 +35,12 @@
 #include "dbconnection.h"
 #include "project.h"
 #include "asciivalidator.h"
-#include <qgroupbox.h>
-#include <qcombobox.h>
-#include <qspinbox.h>
-#include <qlineedit.h>
-#include <qlayout.h>
-#include <qsqldatabase.h>
+#include <ntqgroupbox.h>
+#include <ntqcombobox.h>
+#include <ntqspinbox.h>
+#include <ntqlineedit.h>
+#include <ntqlayout.h>
+#include <ntqsqldatabase.h>
 
 DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent,
 						    const char* name, bool modal, WFlags fl )
diff --git a/tools/designer/designer/dbconnectionsimpl.cpp b/tools/designer/designer/dbconnectionsimpl.cpp
index e6b88d74..0507cb71 100644
--- a/tools/designer/designer/dbconnectionsimpl.cpp
+++ b/tools/designer/designer/dbconnectionsimpl.cpp
@@ -32,18 +32,18 @@
 **********************************************************************/
 
 #include "dbconnectionsimpl.h"
-#include <qptrlist.h>
-#include <qgroupbox.h>
-#include <qlayout.h>
+#include <ntqptrlist.h>
+#include <ntqgroupbox.h>
+#include <ntqlayout.h>
 #include "project.h"
-#include <qlistbox.h>
-#include <qcombobox.h>
-#include <qspinbox.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qsqldatabase.h>
-#include <qmessagebox.h>
-#include <qapplication.h>
+#include <ntqlistbox.h>
+#include <ntqcombobox.h>
+#include <ntqspinbox.h>
+#include <ntqlineedit.h>
+#include <ntqpushbutton.h>
+#include <ntqsqldatabase.h>
+#include <ntqmessagebox.h>
+#include <ntqapplication.h>
 #include "mainwindow.h"
 #include "asciivalidator.h"
 
diff --git a/tools/designer/designer/defs.h b/tools/designer/designer/defs.h
index 29f244cd..1a6bf5cb 100644
--- a/tools/designer/designer/defs.h
+++ b/tools/designer/designer/defs.h
@@ -34,8 +34,8 @@
 #ifndef DEFS_H
 #define DEFS_H
 
-#include <qsizepolicy.h>
-#include <qstring.h>
+#include <ntqsizepolicy.h>
+#include <ntqstring.h>
 
 #define POINTER_TOOL 32000
 #define CONNECT_TOOL 32001
diff --git a/tools/designer/designer/designer_pch.h b/tools/designer/designer/designer_pch.h
index 858cd389..5cc5fd48 100644
--- a/tools/designer/designer/designer_pch.h
+++ b/tools/designer/designer/designer_pch.h
@@ -9,30 +9,30 @@
 #if defined __cplusplus
 
 #include <private/qucomextra_p.h>
-#include <qaction.h>
-#include <qapplication.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qdialog.h>
-#include <qheader.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qlistbox.h>
-#include <qlistview.h>
-#include <qmap.h>
-#include <qmessagebox.h>
-#include <qmetaobject.h>
-#include <qobjectlist.h>
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qpushbutton.h>
-#include <qspinbox.h>
-#include <qstring.h>
-#include <qtooltip.h>
-#include <qvariant.h>
-#include <qwhatsthis.h>
-#include <qwidget.h>
+#include <ntqaction.h>
+#include <ntqapplication.h>
+#include <ntqcheckbox.h>
+#include <ntqcombobox.h>
+#include <ntqdialog.h>
+#include <ntqheader.h>
+#include <ntqlabel.h>
+#include <ntqlayout.h>
+#include <ntqlineedit.h>
+#include <ntqlistbox.h>
+#include <ntqlistview.h>
+#include <ntqmap.h>
+#include <ntqmessagebox.h>
+#include <ntqmetaobject.h>
+#include <ntqobjectlist.h>
+#include <ntqpainter.h>
+#include <ntqpixmap.h>
+#include <ntqpushbutton.h>
+#include <ntqspinbox.h>
+#include <ntqstring.h>
+#include <ntqtooltip.h>
+#include <ntqvariant.h>
+#include <ntqwhatsthis.h>
+#include <ntqwidget.h>
 
 #include "command.h"
 #include "formwindow.h"
diff --git a/tools/designer/designer/designerapp.cpp b/tools/designer/designer/designerapp.cpp
index ea136528..06e8edab 100644
--- a/tools/designer/designer/designerapp.cpp
+++ b/tools/designer/designer/designerapp.cpp
@@ -36,10 +36,10 @@
 #include "mainwindow.h"
 #include "formwindow.h"
 
-#include <qfile.h>
-#include <qdir.h>
-#include <qsettings.h>
-#include <qsplashscreen.h>
+#include <ntqfile.h>
+#include <ntqdir.h>
+#include <ntqsettings.h>
+#include <ntqsplashscreen.h>
 
 #ifdef Q_WS_WIN
 #include <qt_windows.h>
diff --git a/tools/designer/designer/designerapp.h b/tools/designer/designer/designerapp.h
index bffe7fdc..703443f9 100644
--- a/tools/designer/designer/designerapp.h
+++ b/tools/designer/designer/designerapp.h
@@ -36,7 +36,7 @@
 
 class TQSplashScreen;
 
-#include <qapplication.h>
+#include <ntqapplication.h>
 
 class DesignerApplication : public TQApplication
 {
diff --git a/tools/designer/designer/designerappiface.cpp b/tools/designer/designer/designerappiface.cpp
index 97a531b4..d1d215a7 100644
--- a/tools/designer/designer/designerappiface.cpp
+++ b/tools/designer/designer/designerappiface.cpp
@@ -31,8 +31,8 @@
 **
 **********************************************************************/
 
-#include <qmenubar.h>
-#include <qpopupmenu.h>
+#include <ntqmenubar.h>
+#include <ntqpopupmenu.h>
 #include "designerappiface.h"
 #include "mainwindow.h"
 #include "project.h"
@@ -42,14 +42,14 @@
 #include "command.h"
 #include "outputwindow.h"
 #include "../shared/widgetdatabase.h"
-#include <qvariant.h>
-#include <qlistview.h>
-#include <qtextedit.h>
-#include <qstatusbar.h>
+#include <ntqvariant.h>
+#include <ntqlistview.h>
+#include <ntqtextedit.h>
+#include <ntqstatusbar.h>
 #include "pixmapcollection.h"
 #include "hierarchyview.h"
 #include <stdlib.h>
-#include <qmetaobject.h>
+#include <ntqmetaobject.h>
 #include "popupmenueditor.h"
 #include "menubareditor.h"
 
diff --git a/tools/designer/designer/editfunctionsimpl.cpp b/tools/designer/designer/editfunctionsimpl.cpp
index 20e8df4f..49f17328 100644
--- a/tools/designer/designer/editfunctionsimpl.cpp
+++ b/tools/designer/designer/editfunctionsimpl.cpp
@@ -39,17 +39,17 @@
 #include "hierarchyview.h"
 #include "project.h"
 
-#include <qlistview.h>
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qcombobox.h>
-#include <qstrlist.h>
-#include <qmessagebox.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qgroupbox.h>
-#include <qheader.h>
-#include <qcheckbox.h>
+#include <ntqlistview.h>
+#include <ntqpushbutton.h>
+#include <ntqlineedit.h>
+#include <ntqcombobox.h>
+#include <ntqstrlist.h>
+#include <ntqmessagebox.h>
+#include <ntqlayout.h>
+#include <ntqlabel.h>
+#include <ntqgroupbox.h>
+#include <ntqheader.h>
+#include <ntqcheckbox.h>
 
 EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
     : EditFunctionsBase( parent, 0, TRUE ), formWindow( fw )
diff --git a/tools/designer/designer/editfunctionsimpl.h b/tools/designer/designer/editfunctionsimpl.h
index 02a43aaa..d852afcf 100644
--- a/tools/designer/designer/editfunctionsimpl.h
+++ b/tools/designer/designer/editfunctionsimpl.h
@@ -37,7 +37,7 @@
 #include "editfunctions.h"
 #include "hierarchyview.h"
 #include "metadatabase.h"
-#include <qmap.h>
+#include <ntqmap.h>
 
 class FormWindow;
 class TQListViewItem;
diff --git a/tools/designer/designer/finddialog.ui b/tools/designer/designer/finddialog.ui
index 9adaecac..73b00ef6 100644
--- a/tools/designer/designer/finddialog.ui
+++ b/tools/designer/designer/finddialog.ui
@@ -260,7 +260,7 @@
     <tabstop>PushButton2</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in implementation">qlineedit.h</include>
+    <include location="global" impldecl="in implementation">ntqlineedit.h</include>
     <include location="local" impldecl="in implementation">../interfaces/editorinterface.h</include>
     <include location="local" impldecl="in implementation">finddialog.ui.h</include>
 </includes>
diff --git a/tools/designer/designer/formfile.cpp b/tools/designer/designer/formfile.cpp
index aaa17eba..2afe8423 100644
--- a/tools/designer/designer/formfile.cpp
+++ b/tools/designer/designer/formfile.cpp
@@ -41,14 +41,14 @@
 #include "../interfaces/languageinterface.h"
 #include "resource.h"
 #include "workspace.h"
-#include <qmessagebox.h>
-#include <qfile.h>
-#include <qstatusbar.h>
+#include <ntqmessagebox.h>
+#include <ntqfile.h>
+#include <ntqstatusbar.h>
 #include "propertyeditor.h"
-#include <qworkspace.h>
+#include <ntqworkspace.h>
 #include <stdlib.h>
 #include "designerappiface.h"
-#include <qapplication.h>
+#include <ntqapplication.h>
 
 static TQString make_func_pretty( const TQString &s )
 {
diff --git a/tools/designer/designer/formfile.h b/tools/designer/designer/formfile.h
index 41e2199d..8cc493c3 100644
--- a/tools/designer/designer/formfile.h
+++ b/tools/designer/designer/formfile.h
@@ -34,7 +34,7 @@
 #ifndef FORMFILE_H
 #define FORMFILE_H
 
-#include <qobject.h>
+#include <ntqobject.h>
 #include "timestamp.h"
 #include "metadatabase.h"
 
diff --git a/tools/designer/designer/formsettingsimpl.cpp b/tools/designer/designer/formsettingsimpl.cpp
index 73c4f25b..68464918 100644
--- a/tools/designer/designer/formsettingsimpl.cpp
+++ b/tools/designer/designer/formsettingsimpl.cpp
@@ -39,13 +39,13 @@
 #include "mainwindow.h"
 #include "project.h"
 
-#include <qmultilineedit.h>
-#include <qpushbutton.h>
-#include <qcombobox.h>
-#include <qradiobutton.h>
-#include <qlineedit.h>
-#include <qspinbox.h>
-#include <qcheckbox.h>
+#include <ntqmultilineedit.h>
+#include <ntqpushbutton.h>
+#include <ntqcombobox.h>
+#include <ntqradiobutton.h>
+#include <ntqlineedit.h>
+#include <ntqspinbox.h>
+#include <ntqcheckbox.h>
 
 FormSettings::FormSettings( TQWidget *parent, FormWindow *fw )
     : FormSettingsBase( parent, 0, TRUE ), formwindow( fw )
diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp
index 14e440d7..b352b11d 100644
--- a/tools/designer/designer/formwindow.cpp
+++ b/tools/designer/designer/formwindow.cpp
@@ -51,30 +51,30 @@
 
 #include <stdlib.h>
 
-#include <qevent.h>
-#include <qpainter.h>
-#include <qpen.h>
-#include <qlabel.h>
-#include <qobjectlist.h>
-#include <qtimer.h>
-#include <qapplication.h>
-#include <qlayout.h>
-#include <qspinbox.h>
-#include <qstatusbar.h>
-#include <qapplication.h>
-#include <qpalette.h>
-#include <qmessagebox.h>
-#include <qpopupmenu.h>
-#include <qsizegrip.h>
-#include <qpushbutton.h>
-#include <qwhatsthis.h>
-#include <qmetaobject.h>
-#include <qtooltip.h>
-#include <qfeatures.h>
-#include <qaccel.h>
-#include <qpixmapcache.h>
-#include <qbitmap.h>
-#include <qsplitter.h>
+#include <ntqevent.h>
+#include <ntqpainter.h>
+#include <ntqpen.h>
+#include <ntqlabel.h>
+#include <ntqobjectlist.h>
+#include <ntqtimer.h>
+#include <ntqapplication.h>
+#include <ntqlayout.h>
+#include <ntqspinbox.h>
+#include <ntqstatusbar.h>
+#include <ntqapplication.h>
+#include <ntqpalette.h>
+#include <ntqmessagebox.h>
+#include <ntqpopupmenu.h>
+#include <ntqsizegrip.h>
+#include <ntqpushbutton.h>
+#include <ntqwhatsthis.h>
+#include <ntqmetaobject.h>
+#include <ntqtooltip.h>
+#include <ntqfeatures.h>
+#include <ntqaccel.h>
+#include <ntqpixmapcache.h>
+#include <ntqbitmap.h>
+#include <ntqsplitter.h>
 
 // FormWindow should be able to work to some limited degree
 // (existance, loading) without a MainWindow. Functions which require
diff --git a/tools/designer/designer/formwindow.h b/tools/designer/designer/formwindow.h
index 2155c413..b294d679 100644
--- a/tools/designer/designer/formwindow.h
+++ b/tools/designer/designer/formwindow.h
@@ -39,11 +39,11 @@
 #include "sizehandle.h"
 #include "actiondnd.h"
 
-#include <qwidget.h>
-#include <qptrdict.h>
-#include <qpixmap.h>
-#include <qwidgetlist.h>
-#include <qmap.h>
+#include <ntqwidget.h>
+#include <ntqptrdict.h>
+#include <ntqpixmap.h>
+#include <ntqwidgetlist.h>
+#include <ntqmap.h>
 
 class TQPaintEvent;
 class TQMouseEvent;
diff --git a/tools/designer/designer/hierarchyview.cpp b/tools/designer/designer/hierarchyview.cpp
index cbb1a4fa..77c84d0b 100644
--- a/tools/designer/designer/hierarchyview.cpp
+++ b/tools/designer/designer/hierarchyview.cpp
@@ -49,21 +49,21 @@
 #include "popupmenueditor.h"
 #include "menubareditor.h"
 
-#include <qpalette.h>
-#include <qobjectlist.h>
-#include <qheader.h>
-#include <qpopupmenu.h>
-#include <qtabwidget.h>
-#include <qwizard.h>
-#include <qwidgetstack.h>
-#include <qtabbar.h>
-#include <qfeatures.h>
-#include <qapplication.h>
-#include <qtimer.h>
+#include <ntqpalette.h>
+#include <ntqobjectlist.h>
+#include <ntqheader.h>
+#include <ntqpopupmenu.h>
+#include <ntqtabwidget.h>
+#include <ntqwizard.h>
+#include <ntqwidgetstack.h>
+#include <ntqtabbar.h>
+#include <ntqfeatures.h>
+#include <ntqapplication.h>
+#include <ntqtimer.h>
 #include "../interfaces/languageinterface.h"
-#include <qworkspace.h>
-#include <qaccel.h>
-#include <qmessagebox.h>
+#include <ntqworkspace.h>
+#include <ntqaccel.h>
+#include <ntqmessagebox.h>
 
 #include <stdlib.h>
 
diff --git a/tools/designer/designer/hierarchyview.h b/tools/designer/designer/hierarchyview.h
index d1813463..29c20055 100644
--- a/tools/designer/designer/hierarchyview.h
+++ b/tools/designer/designer/hierarchyview.h
@@ -34,10 +34,10 @@
 #ifndef HIRARCHYVIEW_H
 #define HIRARCHYVIEW_H
 
-#include <qvariant.h>
-#include <qlistview.h>
-#include <qtabwidget.h>
-#include <qguardedptr.h>
+#include <ntqvariant.h>
+#include <ntqlistview.h>
+#include <ntqtabwidget.h>
+#include <ntqguardedptr.h>
 #include <private/qcom_p.h>
 #include "../interfaces/classbrowserinterface.h"
 
diff --git a/tools/designer/designer/iconvieweditorimpl.cpp b/tools/designer/designer/iconvieweditorimpl.cpp
index f8fe7e44..73723e8f 100644
--- a/tools/designer/designer/iconvieweditorimpl.cpp
+++ b/tools/designer/designer/iconvieweditorimpl.cpp
@@ -36,11 +36,11 @@
 #include "mainwindow.h"
 #include "pixmapchooser.h"
 
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qiconview.h>
-#include <qpushbutton.h>
-#include <qcheckbox.h>
+#include <ntqlineedit.h>
+#include <ntqlabel.h>
+#include <ntqiconview.h>
+#include <ntqpushbutton.h>
+#include <ntqcheckbox.h>
 
 IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
     : IconViewEditorBase( parent, 0, TRUE ), formwindow( fw )
diff --git a/tools/designer/designer/layout.cpp b/tools/designer/designer/layout.cpp
index ce6f7780..2f0393b1 100644
--- a/tools/designer/designer/layout.cpp
+++ b/tools/designer/designer/layout.cpp
@@ -36,14 +36,14 @@
 #include <widgetdatabase.h>
 #include "widgetfactory.h"
 
-#include <qlayout.h>
-#include <qevent.h>
-#include <qpainter.h>
-#include <qpen.h>
-#include <qbitmap.h>
-#include <qsplitter.h>
-#include <qvaluevector.h>
-#include <qmainwindow.h>
+#include <ntqlayout.h>
+#include <ntqevent.h>
+#include <ntqpainter.h>
+#include <ntqpen.h>
+#include <ntqbitmap.h>
+#include <ntqsplitter.h>
+#include <ntqvaluevector.h>
+#include <ntqmainwindow.h>
 
 bool operator<( const TQGuardedPtr<TQWidget> &p1, const TQGuardedPtr<TQWidget> &p2 )
 {
diff --git a/tools/designer/designer/layout.h b/tools/designer/designer/layout.h
index 53e0d48a..97bd997b 100644
--- a/tools/designer/designer/layout.h
+++ b/tools/designer/designer/layout.h
@@ -34,13 +34,13 @@
 #ifndef LAYOUT_H
 #define LAYOUT_H
 
-#include <qwidget.h>
-#include <qmap.h>
-#include <qguardedptr.h>
-#include <qobject.h>
-#include <qlayout.h>
-#include <qmap.h>
-#include <qwidgetlist.h>
+#include <ntqwidget.h>
+#include <ntqmap.h>
+#include <ntqguardedptr.h>
+#include <ntqobject.h>
+#include <ntqlayout.h>
+#include <ntqmap.h>
+#include <ntqwidgetlist.h>
 
 class FormWindow;
 class TQPaintEvent;
diff --git a/tools/designer/designer/listboxdnd.cpp b/tools/designer/designer/listboxdnd.cpp
index aa50c0b5..11f38868 100644
--- a/tools/designer/designer/listboxdnd.cpp
+++ b/tools/designer/designer/listboxdnd.cpp
@@ -32,11 +32,11 @@
 **********************************************************************/
 
 #include "listboxdnd.h"
-#include <qwidget.h>
-#include <qheader.h>
-#include <qpainter.h>
-#include <qdragobject.h>
-#include <qvaluelist.h>
+#include <ntqwidget.h>
+#include <ntqheader.h>
+#include <ntqpainter.h>
+#include <ntqdragobject.h>
+#include <ntqvaluelist.h>
 
 // The Dragobject Declaration ---------------------------------------
 class ListBoxItemDrag : public TQStoredDrag
diff --git a/tools/designer/designer/listboxdnd.h b/tools/designer/designer/listboxdnd.h
index fbea6a9f..50e8db89 100644
--- a/tools/designer/designer/listboxdnd.h
+++ b/tools/designer/designer/listboxdnd.h
@@ -34,8 +34,8 @@
 #ifndef LISTBOXDND_H
 #define LISTBOXDND_H
 
-#include <qptrlist.h>
-#include <qlistbox.h>
+#include <ntqptrlist.h>
+#include <ntqlistbox.h>
 #include "listdnd.h"
 
 typedef TQPtrList<TQListBoxItem> ListBoxItemList;
diff --git a/tools/designer/designer/listboxeditorimpl.cpp b/tools/designer/designer/listboxeditorimpl.cpp
index 7e3684d0..08d4560a 100644
--- a/tools/designer/designer/listboxeditorimpl.cpp
+++ b/tools/designer/designer/listboxeditorimpl.cpp
@@ -39,11 +39,11 @@
 #include "listboxdnd.h"
 #include "listboxrename.h"
 
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qlistbox.h>
-#include <qpushbutton.h>
-#include <qcheckbox.h>
+#include <ntqlineedit.h>
+#include <ntqlabel.h>
+#include <ntqlistbox.h>
+#include <ntqpushbutton.h>
+#include <ntqcheckbox.h>
 
 ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
     : ListBoxEditorBase( parent, 0, TRUE ), formwindow( fw )
diff --git a/tools/designer/designer/listboxrename.cpp b/tools/designer/designer/listboxrename.cpp
index 17ca1300..c78f6461 100644
--- a/tools/designer/designer/listboxrename.cpp
+++ b/tools/designer/designer/listboxrename.cpp
@@ -31,9 +31,9 @@
 **
 **********************************************************************/
 
-#include <qheader.h>
-#include <qlineedit.h>
-#include <qtimer.h>
+#include <ntqheader.h>
+#include <ntqlineedit.h>
+#include <ntqtimer.h>
 #include "listboxrename.h"
 
 class EditableListBoxItem : public TQListBoxItem
diff --git a/tools/designer/designer/listboxrename.h b/tools/designer/designer/listboxrename.h
index 27c4d1d0..e857fcfe 100644
--- a/tools/designer/designer/listboxrename.h
+++ b/tools/designer/designer/listboxrename.h
@@ -34,8 +34,8 @@
 #ifndef LISTBOXRENAME_H
 #define LISTBOXRENAME_H
 
-#include <qobject.h>
-#include <qlistbox.h>
+#include <ntqobject.h>
+#include <ntqlistbox.h>
 
 class TQLineEdit;
 
diff --git a/tools/designer/designer/listdnd.cpp b/tools/designer/designer/listdnd.cpp
index 46374632..137237ad 100644
--- a/tools/designer/designer/listdnd.cpp
+++ b/tools/designer/designer/listdnd.cpp
@@ -32,8 +32,8 @@
 **********************************************************************/
 
 #include "listdnd.h"
-#include <qwidget.h>
-#include <qpainter.h>
+#include <ntqwidget.h>
+#include <ntqpainter.h>
 
 ListDnd::ListDnd( TQScrollView * eventSource, const char * name )
     : TQObject( eventSource, name ),
diff --git a/tools/designer/designer/listdnd.h b/tools/designer/designer/listdnd.h
index 97794bcd..08820f70 100644
--- a/tools/designer/designer/listdnd.h
+++ b/tools/designer/designer/listdnd.h
@@ -34,8 +34,8 @@
 #ifndef LISTDND_H
 #define LISTDND_H
 
-#include <qobject.h>
-#include <qscrollview.h>
+#include <ntqobject.h>
+#include <ntqscrollview.h>
 
 class ListDnd : public TQObject
 {
diff --git a/tools/designer/designer/listeditor.ui.h b/tools/designer/designer/listeditor.ui.h
index 35df155e..5468f796 100644
--- a/tools/designer/designer/listeditor.ui.h
+++ b/tools/designer/designer/listeditor.ui.h
@@ -6,8 +6,8 @@
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
 
-#include <qheader.h>
-#include <qapplication.h>
+#include <ntqheader.h>
+#include <ntqapplication.h>
 
 void ListEditor::init()
 {
diff --git a/tools/designer/designer/listviewdnd.cpp b/tools/designer/designer/listviewdnd.cpp
index b0fb1bf3..49c7980f 100644
--- a/tools/designer/designer/listviewdnd.cpp
+++ b/tools/designer/designer/listviewdnd.cpp
@@ -32,11 +32,11 @@
 **********************************************************************/
 
 #include "listviewdnd.h"
-#include <qwidget.h>
-#include <qheader.h>
-#include <qpainter.h>
-#include <qdragobject.h>
-#include <qvaluelist.h>
+#include <ntqwidget.h>
+#include <ntqheader.h>
+#include <ntqpainter.h>
+#include <ntqdragobject.h>
+#include <ntqvaluelist.h>
 
 // The Dragobject Declaration ---------------------------------------
 class ListViewItemDrag : public TQStoredDrag
diff --git a/tools/designer/designer/listviewdnd.h b/tools/designer/designer/listviewdnd.h
index 3b0255bb..dee4ce43 100644
--- a/tools/designer/designer/listviewdnd.h
+++ b/tools/designer/designer/listviewdnd.h
@@ -34,8 +34,8 @@
 #ifndef LISTVIEWDND_H
 #define LISTVIEWDND_H
 
-#include <qptrlist.h>
-#include <qlistview.h>
+#include <ntqptrlist.h>
+#include <ntqlistview.h>
 #include "listdnd.h"
 
 class TQWidget;
diff --git a/tools/designer/designer/listvieweditorimpl.cpp b/tools/designer/designer/listvieweditorimpl.cpp
index 59c31732..c65ac833 100644
--- a/tools/designer/designer/listvieweditorimpl.cpp
+++ b/tools/designer/designer/listvieweditorimpl.cpp
@@ -40,16 +40,16 @@
 #include "listboxdnd.h"
 #include "listboxrename.h"
 
-#include <qlistview.h>
-#include <qheader.h>
-#include <qlistbox.h>
-#include <qlineedit.h>
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qtabwidget.h>
-#include <qspinbox.h>
-#include <qpushbutton.h>
-#include <qptrstack.h>
+#include <ntqlistview.h>
+#include <ntqheader.h>
+#include <ntqlistbox.h>
+#include <ntqlineedit.h>
+#include <ntqcheckbox.h>
+#include <ntqlabel.h>
+#include <ntqtabwidget.h>
+#include <ntqspinbox.h>
+#include <ntqpushbutton.h>
+#include <ntqptrstack.h>
 
 ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw )
     : ListViewEditorBase( parent, 0, TRUE ), listview( lv ), formwindow( fw )
diff --git a/tools/designer/designer/listvieweditorimpl.h b/tools/designer/designer/listvieweditorimpl.h
index c0351e66..f3258fb6 100644
--- a/tools/designer/designer/listvieweditorimpl.h
+++ b/tools/designer/designer/listvieweditorimpl.h
@@ -36,9 +36,9 @@
 
 #include "listvieweditor.h"
 
-#include <qmap.h>
-#include <qpixmap.h>
-#include <qvaluelist.h>
+#include <ntqmap.h>
+#include <ntqpixmap.h>
+#include <ntqvaluelist.h>
 
 class FormWindow;
 
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index 868d349f..822f35eb 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -54,12 +54,12 @@
 #include "actiondnd.h"
 #include "project.h"
 #include "projectsettingsimpl.h"
-#include "qwidgetfactory.h"
+#include "ntqwidgetfactory.h"
 #include "pixmapcollection.h"
 #include "qcompletionedit.h"
 #include "sourcefile.h"
 #include "orderindicator.h"
-#include <qtoolbox.h>
+#include <ntqtoolbox.h>
 #include "widgetaction.h"
 #include "propertyobject.h"
 #include "popupmenueditor.h"
@@ -87,37 +87,37 @@
 #include "replacedialog.h"
 #include "gotolinedialog.h"
 
-#include <qinputdialog.h>
-#include <qtoolbar.h>
-#include <qfeatures.h>
-#include <qmetaobject.h>
-#include <qaction.h>
-#include <qpixmap.h>
-#include <qworkspace.h>
-#include <qfiledialog.h>
-#include <qclipboard.h>
-#include <qmessagebox.h>
-#include <qbuffer.h>
-#include <qdir.h>
-#include <qstyle.h>
-#include <qlabel.h>
-#include <qstatusbar.h>
-#include <qfile.h>
-#include <qcheckbox.h>
-#include <qwhatsthis.h>
-#include <qwizard.h>
-#include <qtimer.h>
-#include <qlistbox.h>
-#include <qdockwindow.h>
-#include <qstylefactory.h>
-#include <qvbox.h>
-#include <qprocess.h>
-#include <qsettings.h>
-#include <qaccel.h>
-#include <qtooltip.h>
-#include <qsizegrip.h>
-#include <qtextview.h>
-#include <qassistantclient.h>
+#include <ntqinputdialog.h>
+#include <ntqtoolbar.h>
+#include <ntqfeatures.h>
+#include <ntqmetaobject.h>
+#include <ntqaction.h>
+#include <ntqpixmap.h>
+#include <ntqworkspace.h>
+#include <ntqfiledialog.h>
+#include <ntqclipboard.h>
+#include <ntqmessagebox.h>
+#include <ntqbuffer.h>
+#include <ntqdir.h>
+#include <ntqstyle.h>
+#include <ntqlabel.h>
+#include <ntqstatusbar.h>
+#include <ntqfile.h>
+#include <ntqcheckbox.h>
+#include <ntqwhatsthis.h>
+#include <ntqwizard.h>
+#include <ntqtimer.h>
+#include <ntqlistbox.h>
+#include <ntqdockwindow.h>
+#include <ntqstylefactory.h>
+#include <ntqvbox.h>
+#include <ntqprocess.h>
+#include <ntqsettings.h>
+#include <ntqaccel.h>
+#include <ntqtooltip.h>
+#include <ntqsizegrip.h>
+#include <ntqtextview.h>
+#include <ntqassistantclient.h>
 #include <stdlib.h>
 
 static bool mblockNewForms = FALSE;
@@ -774,10 +774,10 @@ void MainWindow::helpContents()
 	    } else if ( cp == "layoutSpacing" ) {
 		source = propertyDocumentation[ "TQLayout/spacing" ];
 	    } else if ( cp == "toolTip" ) {
-		source = "qtooltip.html#details";
+		source = "ntqtooltip.html#details";
 	    } else if ( mo && qstrcmp( mo->className(), "Spacer" ) == 0 ) {
 		if ( cp != "name" )
-		    source = "qsizepolicy.html#SizeType";
+		    source = "ntqsizepolicy.html#SizeType";
 		else
 		    source = propertyDocumentation[ "TQObject/name" ];
 	    } else {
@@ -832,7 +832,7 @@ void MainWindow::helpAboutTQt()
 
 #if defined(_WS_WIN_)
 #include <qt_windows.h>
-#include <qprocess.h>
+#include <ntqprocess.h>
 #endif
 
 void MainWindow::helpRegister()
diff --git a/tools/designer/designer/mainwindow.h b/tools/designer/designer/mainwindow.h
index 4acc2051..602f8a56 100644
--- a/tools/designer/designer/mainwindow.h
+++ b/tools/designer/designer/mainwindow.h
@@ -46,12 +46,12 @@
 #include "../interfaces/sourcetemplateiface.h"
 #include "sourceeditor.h"
 
-#include <qaction.h>
-#include <qmainwindow.h>
-#include <qmap.h>
-#include <qguardedptr.h>
+#include <ntqaction.h>
+#include <ntqmainwindow.h>
+#include <ntqmap.h>
+#include <ntqguardedptr.h>
 #include <private/qpluginmanager_p.h>
-#include <qobjectlist.h>
+#include <ntqobjectlist.h>
 
 class TQToolBox;
 class PropertyEditor;
@@ -75,7 +75,7 @@ class FormFile;
 class TQAssistantClient;
 
 #if defined(Q_FULL_TEMPLATE_INSTANTIATION)
-#include <qtoolbar.h>
+#include <ntqtoolbar.h>
 #else
 class TQToolBar;
 #endif
diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp
index d89ed165..86da0e52 100644
--- a/tools/designer/designer/mainwindowactions.cpp
+++ b/tools/designer/designer/mainwindowactions.cpp
@@ -34,25 +34,25 @@
 #include "mainwindow.h"
 
 #include <stdlib.h>
-#include <qaction.h>
-#include <qwhatsthis.h>
-#include <qpopupmenu.h>
-#include <qmenubar.h>
-#include <qlineedit.h>
-#include <qtooltip.h>
-#include <qapplication.h>
-#include <qsignalmapper.h>
-#include <qstylefactory.h>
-#include <qworkspace.h>
-#include <qmessagebox.h>
-#include <qstatusbar.h>
-#include <qlistbox.h>
-#include <qclipboard.h>
-#include <qcombobox.h>
-#include <qspinbox.h>
-#include <qinputdialog.h>
-#include <qdatetimeedit.h>
-#include <qtextedit.h>
+#include <ntqaction.h>
+#include <ntqwhatsthis.h>
+#include <ntqpopupmenu.h>
+#include <ntqmenubar.h>
+#include <ntqlineedit.h>
+#include <ntqtooltip.h>
+#include <ntqapplication.h>
+#include <ntqsignalmapper.h>
+#include <ntqstylefactory.h>
+#include <ntqworkspace.h>
+#include <ntqmessagebox.h>
+#include <ntqstatusbar.h>
+#include <ntqlistbox.h>
+#include <ntqclipboard.h>
+#include <ntqcombobox.h>
+#include <ntqspinbox.h>
+#include <ntqinputdialog.h>
+#include <ntqdatetimeedit.h>
+#include <ntqtextedit.h>
 
 #include "defs.h"
 #include "project.h"
@@ -79,7 +79,7 @@
 #include "dbconnectionimpl.h"
 #endif
 #include "widgetaction.h"
-#include <qtoolbox.h>
+#include <ntqtoolbox.h>
 #include "startdialogimpl.h"
 #include "designerappiface.h"
 #include "connectiondialog.h"
diff --git a/tools/designer/designer/menubareditor.cpp b/tools/designer/designer/menubareditor.cpp
index 56ad84f4..6687eddb 100644
--- a/tools/designer/designer/menubareditor.cpp
+++ b/tools/designer/designer/menubareditor.cpp
@@ -31,14 +31,14 @@
 **
 **********************************************************************/
 
-#include <qaction.h>
-#include <qapplication.h>
-#include <qbitmap.h>
-#include <qdragobject.h>
-#include <qlineedit.h>
-#include <qmainwindow.h>
-#include <qpainter.h>
-#include <qstyle.h>
+#include <ntqaction.h>
+#include <ntqapplication.h>
+#include <ntqbitmap.h>
+#include <ntqdragobject.h>
+#include <ntqlineedit.h>
+#include <ntqmainwindow.h>
+#include <ntqpainter.h>
+#include <ntqstyle.h>
 #include "command.h"
 #include "formwindow.h"
 #include "menubareditor.h"
diff --git a/tools/designer/designer/menubareditor.h b/tools/designer/designer/menubareditor.h
index ff569987..495d4112 100644
--- a/tools/designer/designer/menubareditor.h
+++ b/tools/designer/designer/menubareditor.h
@@ -34,8 +34,8 @@
 #ifndef MENUBAREDITOR_H
 #define MENUBAREDITOR_H
 
-#include <qmenubar.h>
-#include <qptrlist.h>
+#include <ntqmenubar.h>
+#include <ntqptrlist.h>
 
 class PopupMenuEditor;
 class MenuBarEditor;
diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp
index b773732c..302ee532 100644
--- a/tools/designer/designer/metadatabase.cpp
+++ b/tools/designer/designer/metadatabase.cpp
@@ -41,21 +41,21 @@
 #include "project.h"
 #include "mainwindow.h"
 
-#include <qapplication.h>
-#include <qobject.h>
-#include <qlayout.h>
-#include <qptrdict.h>
-#include <qobjectlist.h>
-#include <qstrlist.h>
-#include <qmetaobject.h>
-#include <qwidgetlist.h>
-#include <qmainwindow.h>
-#include <qregexp.h>
+#include <ntqapplication.h>
+#include <ntqobject.h>
+#include <ntqlayout.h>
+#include <ntqptrdict.h>
+#include <ntqobjectlist.h>
+#include <ntqstrlist.h>
+#include <ntqmetaobject.h>
+#include <ntqwidgetlist.h>
+#include <ntqmainwindow.h>
+#include <ntqregexp.h>
 #include <private/qpluginmanager_p.h>
-#include <qdatetime.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qtextstream.h>
+#include <ntqdatetime.h>
+#include <ntqfile.h>
+#include <ntqfileinfo.h>
+#include <ntqtextstream.h>
 
 #include <stdlib.h>
 
diff --git a/tools/designer/designer/metadatabase.h b/tools/designer/designer/metadatabase.h
index eba00e45..92e98900 100644
--- a/tools/designer/designer/metadatabase.h
+++ b/tools/designer/designer/metadatabase.h
@@ -34,15 +34,15 @@
 #ifndef METADATABASE_H
 #define METADATABASE_H
 
-#include <qvariant.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qmap.h>
-#include <qptrlist.h>
-#include <qsizepolicy.h>
-#include <qsize.h>
-#include <qwidgetlist.h>
-#include <qcursor.h>
+#include <ntqvariant.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqmap.h>
+#include <ntqptrlist.h>
+#include <ntqsizepolicy.h>
+#include <ntqsize.h>
+#include <ntqwidgetlist.h>
+#include <ntqcursor.h>
 
 #include "pixmapchooser.h"
 #include "../interfaces/languageinterface.h"
diff --git a/tools/designer/designer/multilineeditorimpl.cpp b/tools/designer/designer/multilineeditorimpl.cpp
index 9417454c..d257d163 100644
--- a/tools/designer/designer/multilineeditorimpl.cpp
+++ b/tools/designer/designer/multilineeditorimpl.cpp
@@ -39,14 +39,14 @@
 #include "syntaxhighlighter_html.h"
 #include "widgetfactory.h"
 
-#include <qtextedit.h>
+#include <ntqtextedit.h>
 #include <./private/qrichtext_p.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qtoolbutton.h>
-#include <qapplication.h>
-#include <qaction.h>
-#include <qmetaobject.h>
+#include <ntqpushbutton.h>
+#include <ntqlayout.h>
+#include <ntqtoolbutton.h>
+#include <ntqapplication.h>
+#include <ntqaction.h>
+#include <ntqmetaobject.h>
 
 ToolBarItem::ToolBarItem( TQWidget *parent, TQWidget *toolBar,
 			  const TQString &label, const TQString &tagstr,
diff --git a/tools/designer/designer/multilineeditorimpl.h b/tools/designer/designer/multilineeditorimpl.h
index c841a3c3..603578db 100644
--- a/tools/designer/designer/multilineeditorimpl.h
+++ b/tools/designer/designer/multilineeditorimpl.h
@@ -34,8 +34,8 @@
 #ifndef MULTILINEEDITORIMPL_H
 #define MULTILINEEDITORIMPL_H
 
-#include <qaction.h>
-#include <qtextedit.h>
+#include <ntqaction.h>
+#include <ntqtextedit.h>
 #include <private/qrichtext_p.h>
 #include "multilineeditor.h"
 
diff --git a/tools/designer/designer/newformimpl.cpp b/tools/designer/designer/newformimpl.cpp
index dc47df05..4636bc9d 100644
--- a/tools/designer/designer/newformimpl.cpp
+++ b/tools/designer/designer/newformimpl.cpp
@@ -44,15 +44,15 @@
 #include "projectsettingsimpl.h"
 #include "sourcefile.h"
 
-#include <qiconview.h>
-#include <qlabel.h>
-#include <qfileinfo.h>
-#include <qdir.h>
-#include <qpushbutton.h>
+#include <ntqiconview.h>
+#include <ntqlabel.h>
+#include <ntqfileinfo.h>
+#include <ntqdir.h>
+#include <ntqpushbutton.h>
 #include <stdlib.h>
-#include <qcombobox.h>
-#include <qworkspace.h>
-#include <qmessagebox.h>
+#include <ntqcombobox.h>
+#include <ntqworkspace.h>
+#include <ntqmessagebox.h>
 
 static int forms = 0;
 
diff --git a/tools/designer/designer/newformimpl.h b/tools/designer/designer/newformimpl.h
index e46e2924..ba9a21c8 100644
--- a/tools/designer/designer/newformimpl.h
+++ b/tools/designer/designer/newformimpl.h
@@ -35,7 +35,7 @@
 #define NEWFORMIMPL_H
 
 #include "newform.h"
-#include <qiconview.h>
+#include <ntqiconview.h>
 
 class Project;
 
diff --git a/tools/designer/designer/orderindicator.cpp b/tools/designer/designer/orderindicator.cpp
index 6e509279..7a886991 100644
--- a/tools/designer/designer/orderindicator.cpp
+++ b/tools/designer/designer/orderindicator.cpp
@@ -31,14 +31,14 @@
 **
 **********************************************************************/
 
-#include <qvariant.h> // HP-UX compiler need this here
+#include <ntqvariant.h> // HP-UX compiler need this here
 
 #include "orderindicator.h"
 #include "formwindow.h"
 
-#include <qpainter.h>
-#include <qbitmap.h>
-#include <qapplication.h>
+#include <ntqpainter.h>
+#include <ntqbitmap.h>
+#include <ntqapplication.h>
 
 OrderIndicator::OrderIndicator( int i, TQWidget* w, FormWindow *fw )
     : TQWidget( fw, "order_indicator", WMouseNoMask ), formWindow( fw )
diff --git a/tools/designer/designer/orderindicator.h b/tools/designer/designer/orderindicator.h
index b2743d2d..49b144f6 100644
--- a/tools/designer/designer/orderindicator.h
+++ b/tools/designer/designer/orderindicator.h
@@ -34,7 +34,7 @@
 #ifndef ORDERINDICATOR_H
 #define ORDERINDICATOR_H
 
-#include <qwidget.h>
+#include <ntqwidget.h>
 
 class FormWindow;
 
diff --git a/tools/designer/designer/outputwindow.cpp b/tools/designer/designer/outputwindow.cpp
index 73160946..5a4479b9 100644
--- a/tools/designer/designer/outputwindow.cpp
+++ b/tools/designer/designer/outputwindow.cpp
@@ -36,13 +36,13 @@
 #include "metadatabase.h"
 #include "mainwindow.h"
 
-#include <qlistview.h>
-#include <qtextedit.h>
-#include <qapplication.h>
-#include <qheader.h>
+#include <ntqlistview.h>
+#include <ntqtextedit.h>
+#include <ntqapplication.h>
+#include <ntqheader.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <qpainter.h>
+#include <ntqpainter.h>
 
 static TQTextEdit *debugoutput = 0;
 bool debugToStderr = FALSE;
diff --git a/tools/designer/designer/outputwindow.h b/tools/designer/designer/outputwindow.h
index 2f1613ea..991e7572 100644
--- a/tools/designer/designer/outputwindow.h
+++ b/tools/designer/designer/outputwindow.h
@@ -34,10 +34,10 @@
 #ifndef OUTPUTWINDOW_H
 #define OUTPUTWINDOW_H
 
-#include <qtabwidget.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qlistview.h>
+#include <ntqtabwidget.h>
+#include <ntqstringlist.h>
+#include <ntqvaluelist.h>
+#include <ntqlistview.h>
 
 struct DesignerOutputDock;
 class TQTextEdit;
diff --git a/tools/designer/designer/paletteeditoradvancedimpl.cpp b/tools/designer/designer/paletteeditoradvancedimpl.cpp
index d0cdc908..f632f8b5 100644
--- a/tools/designer/designer/paletteeditoradvancedimpl.cpp
+++ b/tools/designer/designer/paletteeditoradvancedimpl.cpp
@@ -36,13 +36,13 @@
 #include "mainwindow.h"
 #include "formwindow.h"
 
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qapplication.h>
-#include <qpushbutton.h>
-#include <qlistbox.h>
-#include <qpainter.h>
-#include <qgroupbox.h>
+#include <ntqcheckbox.h>
+#include <ntqcombobox.h>
+#include <ntqapplication.h>
+#include <ntqpushbutton.h>
+#include <ntqlistbox.h>
+#include <ntqpainter.h>
+#include <ntqgroupbox.h>
 
 /*!
     Class used by PaletteEditor for bold combobox items
diff --git a/tools/designer/designer/paletteeditorimpl.cpp b/tools/designer/designer/paletteeditorimpl.cpp
index ec1c9aae..319f110e 100644
--- a/tools/designer/designer/paletteeditorimpl.cpp
+++ b/tools/designer/designer/paletteeditorimpl.cpp
@@ -38,10 +38,10 @@
 #include "mainwindow.h"
 #include "formwindow.h"
 
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qapplication.h>
-#include <qpushbutton.h>
+#include <ntqcheckbox.h>
+#include <ntqcombobox.h>
+#include <ntqapplication.h>
+#include <ntqpushbutton.h>
 
 PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f )
     : PaletteEditorBase( parent, name, modal, f ), formWindow( fw )
diff --git a/tools/designer/designer/pixmapchooser.cpp b/tools/designer/designer/pixmapchooser.cpp
index b0757b75..4693013b 100644
--- a/tools/designer/designer/pixmapchooser.cpp
+++ b/tools/designer/designer/pixmapchooser.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <qvariant.h> // HP-UX compiler needs this here
+#include <ntqvariant.h> // HP-UX compiler needs this here
 
 #include "pixmapchooser.h"
 #include "formwindow.h"
@@ -44,13 +44,13 @@
 #include "pixmapcollection.h"
 #include "project.h"
 
-#include <qapplication.h>
-#include <qimage.h>
-#include <qpainter.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qiconview.h>
+#include <ntqapplication.h>
+#include <ntqimage.h>
+#include <ntqpainter.h>
+#include <ntqlabel.h>
+#include <ntqlineedit.h>
+#include <ntqpushbutton.h>
+#include <ntqiconview.h>
 
 #if defined(DESIGNER)
 static ImageIconProvider *imageIconProvider = 0;
diff --git a/tools/designer/designer/pixmapchooser.h b/tools/designer/designer/pixmapchooser.h
index 212457e8..4ac0cba5 100644
--- a/tools/designer/designer/pixmapchooser.h
+++ b/tools/designer/designer/pixmapchooser.h
@@ -34,10 +34,10 @@
 #ifndef PIXMAPCHOOSER_H
 #define PIXMAPCHOOSER_H
 
-#include <qfiledialog.h>
-#include <qscrollview.h>
-#include <qpixmap.h>
-#include <qurl.h>
+#include <ntqfiledialog.h>
+#include <ntqscrollview.h>
+#include <ntqpixmap.h>
+#include <ntqurl.h>
 
 class FormWindow;
 
diff --git a/tools/designer/designer/pixmapcollection.cpp b/tools/designer/designer/pixmapcollection.cpp
index ec3e234d..83bb1450 100644
--- a/tools/designer/designer/pixmapcollection.cpp
+++ b/tools/designer/designer/pixmapcollection.cpp
@@ -34,11 +34,11 @@
 #include "pixmapcollection.h"
 #include "project.h"
 #include "mainwindow.h"
-#include <qmime.h>
-#include <qdir.h>
-#include <qfileinfo.h>
-#include <qtextstream.h>
-#include <qimage.h>
+#include <ntqmime.h>
+#include <ntqdir.h>
+#include <ntqfileinfo.h>
+#include <ntqtextstream.h>
+#include <ntqimage.h>
 
 PixmapCollection::PixmapCollection( Project *pro )
     : project( pro )
diff --git a/tools/designer/designer/pixmapcollection.h b/tools/designer/designer/pixmapcollection.h
index 2545c502..8b89824e 100644
--- a/tools/designer/designer/pixmapcollection.h
+++ b/tools/designer/designer/pixmapcollection.h
@@ -34,9 +34,9 @@
 #ifndef PIXMAPCOLLECTION_H
 #define PIXMAPCOLLECTION_H
 
-#include <qstring.h>
-#include <qpixmap.h>
-#include <qvaluelist.h>
+#include <ntqstring.h>
+#include <ntqpixmap.h>
+#include <ntqvaluelist.h>
 #include "designerappiface.h"
 
 class TQMimeSourceFactory;
diff --git a/tools/designer/designer/pixmapcollectioneditor.ui b/tools/designer/designer/pixmapcollectioneditor.ui
index 739aea61..f6104f64 100644
--- a/tools/designer/designer/pixmapcollectioneditor.ui
+++ b/tools/designer/designer/pixmapcollectioneditor.ui
@@ -197,9 +197,9 @@
     <include location="local" impldecl="in implementation">pixmapcollection.h</include>
     <include location="local" impldecl="in implementation">pixmapchooser.h</include>
     <include location="local" impldecl="in implementation">project.h</include>
-    <include location="global" impldecl="in implementation">qfileinfo.h</include>
-    <include location="global" impldecl="in implementation">qimage.h</include>
-    <include location="global" impldecl="in declaration">qpixmap.h</include>
+    <include location="global" impldecl="in implementation">ntqfileinfo.h</include>
+    <include location="global" impldecl="in implementation">ntqimage.h</include>
+    <include location="global" impldecl="in declaration">ntqpixmap.h</include>
     <include location="local" impldecl="in implementation">pixmapcollectioneditor.ui.h</include>
 </includes>
 <forwards>
diff --git a/tools/designer/designer/popupmenueditor.cpp b/tools/designer/designer/popupmenueditor.cpp
index 2bd4a231..af5a5959 100644
--- a/tools/designer/designer/popupmenueditor.cpp
+++ b/tools/designer/designer/popupmenueditor.cpp
@@ -31,18 +31,18 @@
 **
 **********************************************************************/
 
-#include <qapplication.h>
-#include <qcstring.h>
-#include <qdatastream.h>
-#include <qdragobject.h>
-#include <qlineedit.h>
-#include <qobjectlist.h>
-#include <qpainter.h>
-#include <qpopupmenu.h>
-#include <qrect.h>
-#include <qsize.h>
-#include <qstyle.h>
-#include <qtimer.h>
+#include <ntqapplication.h>
+#include <ntqcstring.h>
+#include <ntqdatastream.h>
+#include <ntqdragobject.h>
+#include <ntqlineedit.h>
+#include <ntqobjectlist.h>
+#include <ntqpainter.h>
+#include <ntqpopupmenu.h>
+#include <ntqrect.h>
+#include <ntqsize.h>
+#include <ntqstyle.h>
+#include <ntqtimer.h>
 #include "actiondnd.h"
 #include "actioneditorimpl.h"
 #include "command.h"
diff --git a/tools/designer/designer/popupmenueditor.h b/tools/designer/designer/popupmenueditor.h
index aafdb7d4..b4335905 100644
--- a/tools/designer/designer/popupmenueditor.h
+++ b/tools/designer/designer/popupmenueditor.h
@@ -34,9 +34,9 @@
 #ifndef POPUPMENUEDITOR_H
 #define POPUPMENUEDITOR_H
 
-#include <qwidget.h>
-#include <qptrlist.h>
-#include <qaction.h>
+#include <ntqwidget.h>
+#include <ntqptrlist.h>
+#include <ntqaction.h>
 
 class PopupMenuEditor;
 class TQMenuItem;
@@ -102,7 +102,7 @@ class FormWindow;
 class MainWindow;
 class TQLineEdit;
 
-#include <qpopupmenu.h>
+#include <ntqpopupmenu.h>
 
 class PopupMenuEditor : public TQWidget
 {
diff --git a/tools/designer/designer/previewframe.cpp b/tools/designer/designer/previewframe.cpp
index 6f23c5ae..9fe2b4bf 100644
--- a/tools/designer/designer/previewframe.cpp
+++ b/tools/designer/designer/previewframe.cpp
@@ -31,8 +31,8 @@
 **
 **********************************************************************/
 
-#include <qvbox.h>
-#include <qpainter.h>
+#include <ntqvbox.h>
+#include <ntqpainter.h>
 
 #include "previewframe.h"
 
diff --git a/tools/designer/designer/previewframe.h b/tools/designer/designer/previewframe.h
index 7e616244..679f2081 100644
--- a/tools/designer/designer/previewframe.h
+++ b/tools/designer/designer/previewframe.h
@@ -34,8 +34,8 @@
 #ifndef PREVIEWFRAME_H
 #define PREVIEWFRAME_H
 
-#include <qvbox.h>
-#include <qworkspace.h>
+#include <ntqvbox.h>
+#include <ntqworkspace.h>
 
 #include "previewwidgetimpl.h"
 
diff --git a/tools/designer/designer/previewwidgetimpl.cpp b/tools/designer/designer/previewwidgetimpl.cpp
index 8fe61e3e..aa75de70 100644
--- a/tools/designer/designer/previewwidgetimpl.cpp
+++ b/tools/designer/designer/previewwidgetimpl.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include "qobjectlist.h"
+#include "ntqobjectlist.h"
 #include "previewwidgetimpl.h"
 
 PreviewWidget::PreviewWidget( TQWidget *parent, const char *name )
diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp
index f6f4c7bb..862dd174 100644
--- a/tools/designer/designer/project.cpp
+++ b/tools/designer/designer/project.cpp
@@ -40,25 +40,25 @@
 #include "dbconnectionimpl.h"
 #endif
 #include "resource.h"
-#include <qwidgetfactory.h>
+#include <ntqwidgetfactory.h>
 #include "outputwindow.h"
 
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qurl.h>
-#include <qobjectlist.h>
-#include <qfeatures.h>
-#include <qtextcodec.h>
-#include <qdom.h>
-#include <qmessagebox.h>
-#include <qapplication.h>
+#include <ntqfile.h>
+#include <ntqtextstream.h>
+#include <ntqurl.h>
+#include <ntqobjectlist.h>
+#include <ntqfeatures.h>
+#include <ntqtextcodec.h>
+#include <ntqdom.h>
+#include <ntqmessagebox.h>
+#include <ntqapplication.h>
 #include "mainwindow.h"
-#include <qworkspace.h>
+#include <ntqworkspace.h>
 
 #ifndef QT_NO_SQL
-#include <qsqldatabase.h>
-#include <qsqlrecord.h>
-#include <qdatatable.h>
+#include <ntqsqldatabase.h>
+#include <ntqsqlrecord.h>
+#include <ntqdatatable.h>
 #endif
 
 #include <stdlib.h>
diff --git a/tools/designer/designer/project.h b/tools/designer/designer/project.h
index ecd6b108..066712c1 100644
--- a/tools/designer/designer/project.h
+++ b/tools/designer/designer/project.h
@@ -34,18 +34,18 @@
 #ifndef PROJECT_H
 #define PROJECT_H
 
-#include <qfeatures.h>
+#include <ntqfeatures.h>
 
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qptrlist.h>
-#include <qmap.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqptrlist.h>
+#include <ntqmap.h>
 #include <private/qpluginmanager_p.h>
 #include "../interfaces/projectsettingsiface.h"
 #include "sourcefile.h"
 #include "formfile.h"
-#include <qobjectlist.h>
-#include <qptrdict.h>
+#include <ntqobjectlist.h>
+#include <ntqptrdict.h>
 #include "formfile.h"
 
 class TQObjectList;
diff --git a/tools/designer/designer/projectsettingsimpl.cpp b/tools/designer/designer/projectsettingsimpl.cpp
index 5ec88bd1..87800fa0 100644
--- a/tools/designer/designer/projectsettingsimpl.cpp
+++ b/tools/designer/designer/projectsettingsimpl.cpp
@@ -41,15 +41,15 @@
 #include "sourcefile.h"
 #include "workspace.h"
 
-#include <qlineedit.h>
-#include <qtextedit.h>
-#include <qcheckbox.h>
-#include <qfiledialog.h>
-#include <qcombobox.h>
-#include <qobjectlist.h>
-#include <qheader.h>
-#include <qpushbutton.h>
-#include <qlabel.h>
+#include <ntqlineedit.h>
+#include <ntqtextedit.h>
+#include <ntqcheckbox.h>
+#include <ntqfiledialog.h>
+#include <ntqcombobox.h>
+#include <ntqobjectlist.h>
+#include <ntqheader.h>
+#include <ntqpushbutton.h>
+#include <ntqlabel.h>
 
 /*
  *  Constructs a ProjectSettings which is a child of 'parent', with the
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 4e953fa1..efbe42b9 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <qvariant.h> // HP-UX compiler needs this here
+#include <ntqvariant.h> // HP-UX compiler needs this here
 
 #include "propertyeditor.h"
 #include "formwindow.h"
@@ -51,44 +51,44 @@
 #include "database.h"
 #include "menubareditor.h"
 
-#include <qpainter.h>
-#include <qpalette.h>
-#include <qapplication.h>
-#include <qheader.h>
-#include <qlineedit.h>
-#include <qstrlist.h>
-#include <qmetaobject.h>
-#include <qcombobox.h>
-#include <qpushbutton.h>
-#include <qhbox.h>
-#include <qfontdialog.h>
-#include <qspinbox.h>
-#include <qevent.h>
-#include <qobjectlist.h>
-#include <qlistbox.h>
-#include <qfontdatabase.h>
-#include <qcolor.h>
-#include <qcolordialog.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qsizepolicy.h>
-#include <qbitmap.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qaccel.h>
-#include <qworkspace.h>
-#include <qtimer.h>
-#include <qdragobject.h>
-#include <qdom.h>
-#include <qprocess.h>
-#include <qstyle.h>
-#include <qdatetimeedit.h>
-#include <qassistantclient.h>
-#include <qdrawutil.h>
-#include <qmultilineedit.h> // FIXME: obsolete
-#include <qsplitter.h>
-#include <qdatatable.h>
-#include <qtextview.h>
+#include <ntqpainter.h>
+#include <ntqpalette.h>
+#include <ntqapplication.h>
+#include <ntqheader.h>
+#include <ntqlineedit.h>
+#include <ntqstrlist.h>
+#include <ntqmetaobject.h>
+#include <ntqcombobox.h>
+#include <ntqpushbutton.h>
+#include <ntqhbox.h>
+#include <ntqfontdialog.h>
+#include <ntqspinbox.h>
+#include <ntqevent.h>
+#include <ntqobjectlist.h>
+#include <ntqlistbox.h>
+#include <ntqfontdatabase.h>
+#include <ntqcolor.h>
+#include <ntqcolordialog.h>
+#include <ntqlabel.h>
+#include <ntqlayout.h>
+#include <ntqsizepolicy.h>
+#include <ntqbitmap.h>
+#include <ntqtooltip.h>
+#include <ntqwhatsthis.h>
+#include <ntqaccel.h>
+#include <ntqworkspace.h>
+#include <ntqtimer.h>
+#include <ntqdragobject.h>
+#include <ntqdom.h>
+#include <ntqprocess.h>
+#include <ntqstyle.h>
+#include <ntqdatetimeedit.h>
+#include <ntqassistantclient.h>
+#include <ntqdrawutil.h>
+#include <ntqmultilineedit.h> // FIXME: obsolete
+#include <ntqsplitter.h>
+#include <ntqdatatable.h>
+#include <ntqtextview.h>
 
 #include <limits.h>
 
@@ -96,7 +96,7 @@ static TQFontDatabase *fontDataBase = 0;
 TQString assistantPath();
 
 #ifdef Q_WS_MAC
-#include <qwindowsstyle.h>
+#include <ntqwindowsstyle.h>
 static void setupStyle(TQWidget *w)
 {
     static TQStyle *windowsStyle = 0;
diff --git a/tools/designer/designer/propertyeditor.h b/tools/designer/designer/propertyeditor.h
index 1375c6a6..ca7228ac 100644
--- a/tools/designer/designer/propertyeditor.h
+++ b/tools/designer/designer/propertyeditor.h
@@ -34,17 +34,17 @@
 #ifndef PROPERTYEDITOR_H
 #define PROPERTYEDITOR_H
 
-#include <qfeatures.h>
-#include <qvariant.h>
-#include <qlistview.h>
-#include <qptrlist.h>
-#include <qguardedptr.h>
-#include <qtabwidget.h>
-#include <qmodules.h>
-#include <qptrlist.h>
-#include <qlayout.h>
-#include <qcheckbox.h>
-#include <qcombobox.h>
+#include <ntqfeatures.h>
+#include <ntqvariant.h>
+#include <ntqlistview.h>
+#include <ntqptrlist.h>
+#include <ntqguardedptr.h>
+#include <ntqtabwidget.h>
+#include <ntqmodules.h>
+#include <ntqptrlist.h>
+#include <ntqlayout.h>
+#include <ntqcheckbox.h>
+#include <ntqcombobox.h>
 #include "hierarchyview.h"
 #include "metadatabase.h"
 
diff --git a/tools/designer/designer/propertyobject.cpp b/tools/designer/designer/propertyobject.cpp
index 01f410f8..3244ec52 100644
--- a/tools/designer/designer/propertyobject.cpp
+++ b/tools/designer/designer/propertyobject.cpp
@@ -33,10 +33,10 @@
 
 #include "propertyobject.h"
 #include "metadatabase.h"
-#include <qptrvector.h>
-#include <qptrlist.h>
-#include <qmetaobject.h>
-#include <qvariant.h>
+#include <ntqptrvector.h>
+#include <ntqptrlist.h>
+#include <ntqmetaobject.h>
+#include <ntqvariant.h>
 
 PropertyObject::PropertyObject( const TQWidgetList &objs )
     : TQObject(), objects( objs ), mobj( 0 )
diff --git a/tools/designer/designer/propertyobject.h b/tools/designer/designer/propertyobject.h
index c3d159b1..51c9db31 100644
--- a/tools/designer/designer/propertyobject.h
+++ b/tools/designer/designer/propertyobject.h
@@ -1,9 +1,9 @@
 #ifndef PROPERTYOBJECT_H
 #define PROPERTYOBJECT_H
 
-#include <qobject.h>
-#include <qwidgetlist.h>
-#include <qcursor.h>
+#include <ntqobject.h>
+#include <ntqwidgetlist.h>
+#include <ntqcursor.h>
 
 class PropertyObject : public TQObject
 {
diff --git a/tools/designer/designer/qcompletionedit.cpp b/tools/designer/designer/qcompletionedit.cpp
index e95fbbce..b403e571 100644
--- a/tools/designer/designer/qcompletionedit.cpp
+++ b/tools/designer/designer/qcompletionedit.cpp
@@ -32,10 +32,10 @@
 **********************************************************************/
 
 #include "qcompletionedit.h"
-#include <qlistbox.h>
-#include <qsizegrip.h>
-#include <qapplication.h>
-#include <qvbox.h>
+#include <ntqlistbox.h>
+#include <ntqsizegrip.h>
+#include <ntqapplication.h>
+#include <ntqvbox.h>
 
 TQCompletionEdit::TQCompletionEdit( TQWidget *parent, const char *name )
     : TQLineEdit( parent, name ), aAdd( FALSE ), caseSensitive( FALSE )
diff --git a/tools/designer/designer/qcompletionedit.h b/tools/designer/designer/qcompletionedit.h
index 21e08156..7bae93b8 100644
--- a/tools/designer/designer/qcompletionedit.h
+++ b/tools/designer/designer/qcompletionedit.h
@@ -34,8 +34,8 @@
 #ifndef TQCOMPLETIONEDIT_H
 #define TQCOMPLETIONEDIT_H
 
-#include <qlineedit.h>
-#include <qstringlist.h>
+#include <ntqlineedit.h>
+#include <ntqstringlist.h>
 
 class TQListBox;
 class TQVBox;
diff --git a/tools/designer/designer/replacedialog.ui b/tools/designer/designer/replacedialog.ui
index 0aff36d1..3cd6e247 100644
--- a/tools/designer/designer/replacedialog.ui
+++ b/tools/designer/designer/replacedialog.ui
@@ -304,7 +304,7 @@
 </tabstops>
 <includes>
     <include location="local" impldecl="in implementation">../interfaces/editorinterface.h</include>
-    <include location="global" impldecl="in implementation">qlineedit.h</include>
+    <include location="global" impldecl="in implementation">ntqlineedit.h</include>
     <include location="local" impldecl="in implementation">replacedialog.ui.h</include>
 </includes>
 <forwards>
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index e4e1bdcf..0e4a5206 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -50,42 +50,42 @@
 #include <domtool.h>
 #include <widgetdatabase.h>
 
-#include <qaccel.h>
-#include <qapplication.h>
-#include <qbuffer.h>
-#include <qcombobox.h>
-#include <qdatetime.h>
-#include <qdom.h>
-#include <qfeatures.h>
-#include <qfile.h>
-#include <qheader.h>
-#include <qiconview.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlistbox.h>
-#include <qlistview.h>
-#include <qmenudata.h>
-#include <qmessagebox.h>
-#include <qmetaobject.h>
-#include <qobject.h>
-#include <qobjectlist.h>
-#include <qtabbar.h>
+#include <ntqaccel.h>
+#include <ntqapplication.h>
+#include <ntqbuffer.h>
+#include <ntqcombobox.h>
+#include <ntqdatetime.h>
+#include <ntqdom.h>
+#include <ntqfeatures.h>
+#include <ntqfile.h>
+#include <ntqheader.h>
+#include <ntqiconview.h>
+#include <ntqlabel.h>
+#include <ntqlayout.h>
+#include <ntqlistbox.h>
+#include <ntqlistview.h>
+#include <ntqmenudata.h>
+#include <ntqmessagebox.h>
+#include <ntqmetaobject.h>
+#include <ntqobject.h>
+#include <ntqobjectlist.h>
+#include <ntqtabbar.h>
 #ifndef QT_NO_TABLE
-#include <qtable.h>
-#include <qdatatable.h>
+#include <ntqtable.h>
+#include <ntqdatatable.h>
 #endif
-#include <qtabwidget.h>
-#include <qtabwidget.h>
-#include <qtextcodec.h>
-#include <qtextstream.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qwidget.h>
-#include <qwidgetstack.h>
-#include <qwizard.h>
-#include <qworkspace.h>
-#include <qworkspace.h>
-#include <qsplitter.h>
+#include <ntqtabwidget.h>
+#include <ntqtabwidget.h>
+#include <ntqtextcodec.h>
+#include <ntqtextstream.h>
+#include <ntqtooltip.h>
+#include <ntqwhatsthis.h>
+#include <ntqwidget.h>
+#include <ntqwidgetstack.h>
+#include <ntqwizard.h>
+#include <ntqworkspace.h>
+#include <ntqworkspace.h>
+#include <ntqsplitter.h>
 #include <private/qucom_p.h>
 
 static TQString makeIndent( int indent )
diff --git a/tools/designer/designer/resource.h b/tools/designer/designer/resource.h
index 2cc60b69..3d196a45 100644
--- a/tools/designer/designer/resource.h
+++ b/tools/designer/designer/resource.h
@@ -34,11 +34,11 @@
 #ifndef RESOURCE_H
 #define RESOURCE_H
 
-#include <qstring.h>
-#include <qtextstream.h>
-#include <qvariant.h>
-#include <qvaluelist.h>
-#include <qimage.h>
+#include <ntqstring.h>
+#include <ntqtextstream.h>
+#include <ntqvariant.h>
+#include <ntqvaluelist.h>
+#include <ntqimage.h>
 #include "actiondnd.h"
 
 #include "metadatabase.h"
diff --git a/tools/designer/designer/richtextfontdialog.ui.h b/tools/designer/designer/richtextfontdialog.ui.h
index 0a5adce2..529c52aa 100644
--- a/tools/designer/designer/richtextfontdialog.ui.h
+++ b/tools/designer/designer/richtextfontdialog.ui.h
@@ -5,8 +5,8 @@
 ** update this file, preserving your code. Create an init() slot in place of
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
-#include <qcolordialog.h>
-#include <qfontdatabase.h>
+#include <ntqcolordialog.h>
+#include <ntqfontdatabase.h>
 
 void RichTextFontDialog::init()
 {
diff --git a/tools/designer/designer/sizehandle.cpp b/tools/designer/designer/sizehandle.cpp
index a4d2d3be..7d3b1eb1 100644
--- a/tools/designer/designer/sizehandle.cpp
+++ b/tools/designer/designer/sizehandle.cpp
@@ -31,15 +31,15 @@
 **
 **********************************************************************/
 
-#include <qvariant.h>  // HP-UX compiler needs this here
+#include <ntqvariant.h>  // HP-UX compiler needs this here
 
 #include "sizehandle.h"
 #include "formwindow.h"
 #include "widgetfactory.h"
 
-#include <qwidget.h>
-#include <qapplication.h>
-#include <qlabel.h>
+#include <ntqwidget.h>
+#include <ntqapplication.h>
+#include <ntqlabel.h>
 
 SizeHandle::SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s )
     : TQWidget( parent )
diff --git a/tools/designer/designer/sizehandle.h b/tools/designer/designer/sizehandle.h
index b1259a51..d391ec9a 100644
--- a/tools/designer/designer/sizehandle.h
+++ b/tools/designer/designer/sizehandle.h
@@ -34,9 +34,9 @@
 #ifndef SIZEHANDLE_H
 #define SIZEHANDLE_H
 
-#include <qwidget.h>
-#include <qintdict.h>
-#include <qptrdict.h>
+#include <ntqwidget.h>
+#include <ntqintdict.h>
+#include <ntqptrdict.h>
 
 class TQMouseEvent;
 class FormWindow;
diff --git a/tools/designer/designer/sourceeditor.cpp b/tools/designer/designer/sourceeditor.cpp
index a9094e2d..167bccc9 100644
--- a/tools/designer/designer/sourceeditor.cpp
+++ b/tools/designer/designer/sourceeditor.cpp
@@ -38,12 +38,12 @@
 #include "project.h"
 #include "mainwindow.h"
 #include "../interfaces/languageinterface.h"
-#include <qregexp.h>
+#include <ntqregexp.h>
 #include "project.h"
 #include "sourcefile.h"
 #include "hierarchyview.h"
-#include <qmessagebox.h>
-#include <qtextstream.h>
+#include <ntqmessagebox.h>
+#include <ntqtextstream.h>
 
 SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface )
     : TQVBox( parent, 0, WDestructiveClose ), iFace( iface ), lIface( liface ), obj( 0 ), pro( 0 )
diff --git a/tools/designer/designer/sourceeditor.h b/tools/designer/designer/sourceeditor.h
index 47a322c3..a41fd86c 100644
--- a/tools/designer/designer/sourceeditor.h
+++ b/tools/designer/designer/sourceeditor.h
@@ -35,8 +35,8 @@
 #define SOURCEEDITOR_H
 
 #include "../interfaces/editorinterface.h"
-#include <qvbox.h>
-#include <qguardedptr.h>
+#include <ntqvbox.h>
+#include <ntqguardedptr.h>
 
 class FormWindow;
 class TQCloseEvent;
diff --git a/tools/designer/designer/sourcefile.cpp b/tools/designer/designer/sourcefile.cpp
index a83a327f..bdb6299d 100644
--- a/tools/designer/designer/sourcefile.cpp
+++ b/tools/designer/designer/sourcefile.cpp
@@ -32,14 +32,14 @@
 **********************************************************************/
 
 #include "sourcefile.h"
-#include <qfile.h>
-#include <qtextstream.h>
+#include <ntqfile.h>
+#include <ntqtextstream.h>
 #include "designerappiface.h"
 #include "sourceeditor.h"
 #include "metadatabase.h"
 #include "../interfaces/languageinterface.h"
-#include <qfiledialog.h>
-#include <qmessagebox.h>
+#include <ntqfiledialog.h>
+#include <ntqmessagebox.h>
 #include "mainwindow.h"
 #include "workspace.h"
 #include <stdlib.h>
diff --git a/tools/designer/designer/sourcefile.h b/tools/designer/designer/sourcefile.h
index 32ab629a..47663c8e 100644
--- a/tools/designer/designer/sourcefile.h
+++ b/tools/designer/designer/sourcefile.h
@@ -34,7 +34,7 @@
 #ifndef SOURCEFILE_H
 #define SOURCEFILE_H
 
-#include <qobject.h>
+#include <ntqobject.h>
 #include "timestamp.h"
 
 struct DesignerSourceFile;
diff --git a/tools/designer/designer/startdialogimpl.cpp b/tools/designer/designer/startdialogimpl.cpp
index fdf72708..2328360f 100644
--- a/tools/designer/designer/startdialogimpl.cpp
+++ b/tools/designer/designer/startdialogimpl.cpp
@@ -1,21 +1,21 @@
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qptrlist.h>
-#include <qiconview.h>
-#include <qcombobox.h>
-#include <qlabel.h>
-#include <qfiledialog.h>
-#include <qtabwidget.h>
-#include <qpoint.h>
-#include <qobjectlist.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qfileinfo.h>
-#include <qmap.h>
-#include <qdatetime.h>
-#include <qapplication.h>
-#include <qcheckbox.h>
-#include <qurl.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqptrlist.h>
+#include <ntqiconview.h>
+#include <ntqcombobox.h>
+#include <ntqlabel.h>
+#include <ntqfiledialog.h>
+#include <ntqtabwidget.h>
+#include <ntqpoint.h>
+#include <ntqobjectlist.h>
+#include <ntqpushbutton.h>
+#include <ntqlayout.h>
+#include <ntqfileinfo.h>
+#include <ntqmap.h>
+#include <ntqdatetime.h>
+#include <ntqapplication.h>
+#include <ntqcheckbox.h>
+#include <ntqurl.h>
 
 #include "mainwindow.h"
 #include "startdialogimpl.h"
diff --git a/tools/designer/designer/startdialogimpl.h b/tools/designer/designer/startdialogimpl.h
index 45057df1..c9406dc1 100644
--- a/tools/designer/designer/startdialogimpl.h
+++ b/tools/designer/designer/startdialogimpl.h
@@ -34,12 +34,12 @@
 #ifndef STARTDIALOGIMPL_H
 #define STARTDIALOGIMPL_H
 
-#include <qiconview.h>
-#include <qlistview.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qfiledialog.h>
-#include <qmap.h>
+#include <ntqiconview.h>
+#include <ntqlistview.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqfiledialog.h>
+#include <ntqmap.h>
 
 #include "newformimpl.h"
 #include "startdialog.h"
diff --git a/tools/designer/designer/styledbutton.cpp b/tools/designer/designer/styledbutton.cpp
index 454f2c73..64c55b48 100644
--- a/tools/designer/designer/styledbutton.cpp
+++ b/tools/designer/designer/styledbutton.cpp
@@ -31,19 +31,19 @@
 **
 **********************************************************************/
 
-#include <qvariant.h>  // HP-UX compiler needs this here
+#include <ntqvariant.h>  // HP-UX compiler needs this here
 #include "styledbutton.h"
 #include "formwindow.h"
 #include "pixmapchooser.h"
-#include <qcolordialog.h>
-#include <qpalette.h>
-#include <qlabel.h>
-#include <qpainter.h>
-#include <qimage.h>
-#include <qpixmap.h>
-#include <qapplication.h>
-#include <qdragobject.h>
-#include <qstyle.h>
+#include <ntqcolordialog.h>
+#include <ntqpalette.h>
+#include <ntqlabel.h>
+#include <ntqpainter.h>
+#include <ntqimage.h>
+#include <ntqpixmap.h>
+#include <ntqapplication.h>
+#include <ntqdragobject.h>
+#include <ntqstyle.h>
 
 StyledButton::StyledButton(TQWidget* parent, const char* name)
     : TQButton( parent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( FALSE )
diff --git a/tools/designer/designer/styledbutton.h b/tools/designer/designer/styledbutton.h
index 8f6c3143..4574bf42 100644
--- a/tools/designer/designer/styledbutton.h
+++ b/tools/designer/designer/styledbutton.h
@@ -34,8 +34,8 @@
 #ifndef STYLEDBUTTON_H
 #define STYLEDBUTTON_H
 
-#include <qbutton.h>
-#include <qpixmap.h>
+#include <ntqbutton.h>
+#include <ntqpixmap.h>
 
 class TQColor;
 class TQBrush;
diff --git a/tools/designer/designer/syntaxhighlighter_html.cpp b/tools/designer/designer/syntaxhighlighter_html.cpp
index 8f8a059d..629941d7 100644
--- a/tools/designer/designer/syntaxhighlighter_html.cpp
+++ b/tools/designer/designer/syntaxhighlighter_html.cpp
@@ -33,9 +33,9 @@
 **********************************************************************/
 
 #include "syntaxhighlighter_html.h"
-#include "qstring.h"
-#include "qmap.h"
-#include "qapplication.h"
+#include "ntqstring.h"
+#include "ntqmap.h"
+#include "ntqapplication.h"
 
 
 SyntaxHighlighter_HTML::SyntaxHighlighter_HTML()
diff --git a/tools/designer/designer/tableeditor.ui b/tools/designer/designer/tableeditor.ui
index be603698..17e63f2a 100644
--- a/tools/designer/designer/tableeditor.ui
+++ b/tools/designer/designer/tableeditor.ui
@@ -801,7 +801,7 @@
     <tabstop>buttonHelp</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in implementation">qtable.h</include>
+    <include location="global" impldecl="in implementation">ntqtable.h</include>
 </includes>
 <slots>
     <slot access="protected">init()</slot>
diff --git a/tools/designer/designer/tableeditorimpl.cpp b/tools/designer/designer/tableeditorimpl.cpp
index 409f64a6..4c760e0b 100644
--- a/tools/designer/designer/tableeditorimpl.cpp
+++ b/tools/designer/designer/tableeditorimpl.cpp
@@ -33,20 +33,20 @@
 
 #include "tableeditorimpl.h"
 #ifndef QT_NO_TABLE
-#include <qtable.h>
+#include <ntqtable.h>
 #endif
 #include "formwindow.h"
-#include <qlabel.h>
-#include <qcombobox.h>
-#include <qheader.h>
-#include <qlistbox.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
+#include <ntqlabel.h>
+#include <ntqcombobox.h>
+#include <ntqheader.h>
+#include <ntqlistbox.h>
+#include <ntqlineedit.h>
+#include <ntqpushbutton.h>
 #include "pixmapchooser.h"
 #include "command.h"
-#include <qvaluelist.h>
-#include <qtabwidget.h>
-#include <qdatatable.h>
+#include <ntqvaluelist.h>
+#include <ntqtabwidget.h>
+#include <ntqdatatable.h>
 #include "project.h"
 #include "metadatabase.h"
 #include "mainwindow.h"
diff --git a/tools/designer/designer/tableeditorimpl.h b/tools/designer/designer/tableeditorimpl.h
index 17037da5..bb688433 100644
--- a/tools/designer/designer/tableeditorimpl.h
+++ b/tools/designer/designer/tableeditorimpl.h
@@ -35,7 +35,7 @@
 #define TABLEEDITORIMPL_H
 
 #include "tableeditor.h"
-#include <qmap.h>
+#include <ntqmap.h>
 
 class TQListBoxItem;
 class TQTable;
diff --git a/tools/designer/designer/timestamp.cpp b/tools/designer/designer/timestamp.cpp
index 0ba6ce63..3996108a 100644
--- a/tools/designer/designer/timestamp.cpp
+++ b/tools/designer/designer/timestamp.cpp
@@ -32,8 +32,8 @@
 **********************************************************************/
 
 #include "timestamp.h"
-#include <qfile.h>
-#include <qfileinfo.h>
+#include <ntqfile.h>
+#include <ntqfileinfo.h>
 
 class TQTimer;
 
diff --git a/tools/designer/designer/timestamp.h b/tools/designer/designer/timestamp.h
index b193ae1f..b37d57f1 100644
--- a/tools/designer/designer/timestamp.h
+++ b/tools/designer/designer/timestamp.h
@@ -34,9 +34,9 @@
 #ifndef TIMESTAMP_H
 #define TIMESTAMP_H
 
-#include <qobject.h>
-#include <qdatetime.h>
-#include <qtimer.h>
+#include <ntqobject.h>
+#include <ntqdatetime.h>
+#include <ntqtimer.h>
 
 class TimeStamp : public TQObject
 {
diff --git a/tools/designer/designer/variabledialogimpl.cpp b/tools/designer/designer/variabledialogimpl.cpp
index 13ebcf12..c02dcf69 100644
--- a/tools/designer/designer/variabledialogimpl.cpp
+++ b/tools/designer/designer/variabledialogimpl.cpp
@@ -31,11 +31,11 @@
 **
 **********************************************************************/
 
-#include <qlistview.h>
-#include <qgroupbox.h>
-#include <qlineedit.h>
-#include <qcombobox.h>
-#include <qmessagebox.h>
+#include <ntqlistview.h>
+#include <ntqgroupbox.h>
+#include <ntqlineedit.h>
+#include <ntqcombobox.h>
+#include <ntqmessagebox.h>
 
 #include "metadatabase.h"
 #include "formwindow.h"
diff --git a/tools/designer/designer/widgetaction.cpp b/tools/designer/designer/widgetaction.cpp
index 6eabf532..5869148e 100644
--- a/tools/designer/designer/widgetaction.cpp
+++ b/tools/designer/designer/widgetaction.cpp
@@ -32,11 +32,11 @@
 **********************************************************************/
 
 #include "widgetaction.h"
-#include <qwidget.h>
-#include <qtoolbutton.h>
+#include <ntqwidget.h>
+#include <ntqtoolbutton.h>
 #include "mainwindow.h"
-#include <qstylefactory.h>
-#include <qstyle.h>
+#include <ntqstylefactory.h>
+#include <ntqstyle.h>
 
 static TQStyle *windowsStyle = 0;
 
diff --git a/tools/designer/designer/widgetaction.h b/tools/designer/designer/widgetaction.h
index 77b9427e..da500176 100644
--- a/tools/designer/designer/widgetaction.h
+++ b/tools/designer/designer/widgetaction.h
@@ -34,7 +34,7 @@
 #ifndef WIDGETACTION_H
 #define WIDGETACTION_H
 
-#include <qaction.h>
+#include <ntqaction.h>
 
 class WidgetAction : public TQAction
 {
diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp
index 130c3f4a..a05c6378 100644
--- a/tools/designer/designer/widgetfactory.cpp
+++ b/tools/designer/designer/widgetfactory.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <qvariant.h> // HP-UX compiler need this here
+#include <ntqvariant.h> // HP-UX compiler need this here
 #include "widgetfactory.h"
 #include <widgetdatabase.h>
 #include "metadatabase.h"
@@ -52,56 +52,56 @@
 #include "menubareditor.h"
 #include "popupmenueditor.h"
 
-#include <qfeatures.h>
+#include <ntqfeatures.h>
 
-#include <qpixmap.h>
-#include <qgroupbox.h>
-#include <qiconview.h>
+#include <ntqpixmap.h>
+#include <ntqgroupbox.h>
+#include <ntqiconview.h>
 #ifndef QT_NO_TABLE
-#include <qtable.h>
+#include <ntqtable.h>
 #endif
 #ifndef QT_NO_SQL
-#include <qdatatable.h>
+#include <ntqdatatable.h>
 #endif
-#include <qdatetimeedit.h>
-#include <qlineedit.h>
-#include <qspinbox.h>
-#include <qmultilineedit.h>
-#include <qtextedit.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qwidgetstack.h>
-#include <qcombobox.h>
-#include <qtabbar.h>
-#include <qlistbox.h>
-#include <qlistview.h>
-#include <qobjectlist.h>
-#include <qlcdnumber.h>
-#include <qslider.h>
-#include <qdial.h>
-#include <qprogressbar.h>
-#include <qtextview.h>
-#include <qtextbrowser.h>
-#include <qframe.h>
-#include <qmetaobject.h>
-#include <qwidgetstack.h>
-#include <qwizard.h>
-#include <qvaluelist.h>
-#include <qtimer.h>
-#include <qscrollbar.h>
-#include <qmainwindow.h>
-#include <qmenubar.h>
-#include <qapplication.h>
-#include <qsplitter.h>
-#include <qtoolbox.h>
-#include <qsizegrip.h>
+#include <ntqdatetimeedit.h>
+#include <ntqlineedit.h>
+#include <ntqspinbox.h>
+#include <ntqmultilineedit.h>
+#include <ntqtextedit.h>
+#include <ntqlabel.h>
+#include <ntqlayout.h>
+#include <ntqwidgetstack.h>
+#include <ntqcombobox.h>
+#include <ntqtabbar.h>
+#include <ntqlistbox.h>
+#include <ntqlistview.h>
+#include <ntqobjectlist.h>
+#include <ntqlcdnumber.h>
+#include <ntqslider.h>
+#include <ntqdial.h>
+#include <ntqprogressbar.h>
+#include <ntqtextview.h>
+#include <ntqtextbrowser.h>
+#include <ntqframe.h>
+#include <ntqmetaobject.h>
+#include <ntqwidgetstack.h>
+#include <ntqwizard.h>
+#include <ntqvaluelist.h>
+#include <ntqtimer.h>
+#include <ntqscrollbar.h>
+#include <ntqmainwindow.h>
+#include <ntqmenubar.h>
+#include <ntqapplication.h>
+#include <ntqsplitter.h>
+#include <ntqtoolbox.h>
+#include <ntqsizegrip.h>
 #ifndef QT_NO_SQL
 #include "database.h"
 #endif
 
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <qobject.h>
+#include <ntqobject.h>
 
 FormWindow *find_formwindow( TQWidget *w )
 {
diff --git a/tools/designer/designer/widgetfactory.h b/tools/designer/designer/widgetfactory.h
index e8aa5703..59e05a99 100644
--- a/tools/designer/designer/widgetfactory.h
+++ b/tools/designer/designer/widgetfactory.h
@@ -34,30 +34,30 @@
 #ifndef WIDGETFACTORY_H
 #define WIDGETFACTORY_H
 
-#include <qvariant.h>
-#include <qiconset.h>
-#include <qstring.h>
-#include <qintdict.h>
-#include <qtabwidget.h>
-#include <qpixmap.h>
-#include <qsize.h>
-#include <qpainter.h>
-#include <qevent.h>
-#include <qobjectlist.h>
-#include <qlabel.h>
-#include <qwizard.h>
-#include <qptrdict.h>
-#include <qpushbutton.h>
-#include <qtoolbutton.h>
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qbuttongroup.h>
-#include <qwidgetstack.h>
-#include <qguardedptr.h>
-#include <qtoolbox.h>
+#include <ntqvariant.h>
+#include <ntqiconset.h>
+#include <ntqstring.h>
+#include <ntqintdict.h>
+#include <ntqtabwidget.h>
+#include <ntqpixmap.h>
+#include <ntqsize.h>
+#include <ntqpainter.h>
+#include <ntqevent.h>
+#include <ntqobjectlist.h>
+#include <ntqlabel.h>
+#include <ntqwizard.h>
+#include <ntqptrdict.h>
+#include <ntqpushbutton.h>
+#include <ntqtoolbutton.h>
+#include <ntqcheckbox.h>
+#include <ntqradiobutton.h>
+#include <ntqbuttongroup.h>
+#include <ntqwidgetstack.h>
+#include <ntqguardedptr.h>
+#include <ntqtoolbox.h>
 
 #include "metadatabase.h"
-#include "qwidgetfactory.h"
+#include "ntqwidgetfactory.h"
 
 class TQWidget;
 class TQLayout;
diff --git a/tools/designer/designer/wizardeditorimpl.cpp b/tools/designer/designer/wizardeditorimpl.cpp
index 438a94ee..99329a25 100644
--- a/tools/designer/designer/wizardeditorimpl.cpp
+++ b/tools/designer/designer/wizardeditorimpl.cpp
@@ -38,10 +38,10 @@
 #include "listboxdnd.h"
 #include "listboxrename.h"
 
-#include <qwizard.h>
-#include <qlistbox.h>
-#include <qpushbutton.h>
-#include <qinputdialog.h>
+#include <ntqwizard.h>
+#include <ntqlistbox.h>
+#include <ntqpushbutton.h>
+#include <ntqinputdialog.h>
 
 WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw )
     : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 )
diff --git a/tools/designer/designer/wizardeditorimpl.h b/tools/designer/designer/wizardeditorimpl.h
index 8cfe7ee6..983e26a8 100644
--- a/tools/designer/designer/wizardeditorimpl.h
+++ b/tools/designer/designer/wizardeditorimpl.h
@@ -37,7 +37,7 @@
 class TQWizard;
 class FormWindow;
 
-#include <qptrlist.h>
+#include <ntqptrlist.h>
 
 #include "wizardeditor.h"
 #include "command.h"
diff --git a/tools/designer/designer/workspace.cpp b/tools/designer/designer/workspace.cpp
index 5dbb69f5..ff0d6868 100644
--- a/tools/designer/designer/workspace.cpp
+++ b/tools/designer/designer/workspace.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <qvariant.h>  // HP-UX compiler needs this here
+#include <ntqvariant.h>  // HP-UX compiler needs this here
 #include "workspace.h"
 #include "formwindow.h"
 #include "mainwindow.h"
@@ -43,16 +43,16 @@
 #include "sourceeditor.h"
 #include "propertyeditor.h"
 
-#include <qheader.h>
-#include <qdragobject.h>
-#include <qfileinfo.h>
-#include <qapplication.h>
-#include <qpainter.h>
-#include <qpen.h>
-#include <qobjectlist.h>
-#include <qworkspace.h>
-#include <qpopupmenu.h>
-#include <qtextstream.h>
+#include <ntqheader.h>
+#include <ntqdragobject.h>
+#include <ntqfileinfo.h>
+#include <ntqapplication.h>
+#include <ntqpainter.h>
+#include <ntqpen.h>
+#include <ntqobjectlist.h>
+#include <ntqworkspace.h>
+#include <ntqpopupmenu.h>
+#include <ntqtextstream.h>
 #include "qcompletionedit.h"
 
 WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p )
diff --git a/tools/designer/designer/workspace.h b/tools/designer/designer/workspace.h
index d260b596..e99c6f40 100644
--- a/tools/designer/designer/workspace.h
+++ b/tools/designer/designer/workspace.h
@@ -34,7 +34,7 @@
 #ifndef WORKSPACE_H
 #define WORKSPACE_H
 
-#include <qlistview.h>
+#include <ntqlistview.h>
 
 class FormWindow;
 class TQResizeEvent;
diff --git a/tools/designer/editor/arghintwidget.cpp b/tools/designer/editor/arghintwidget.cpp
index ff5e288e..e16708d0 100644
--- a/tools/designer/editor/arghintwidget.cpp
+++ b/tools/designer/editor/arghintwidget.cpp
@@ -32,11 +32,11 @@
 **********************************************************************/
 
 #include "arghintwidget.h"
-#include <qbutton.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpainter.h>
-#include <qpixmap.h>
+#include <ntqbutton.h>
+#include <ntqlabel.h>
+#include <ntqlayout.h>
+#include <ntqpainter.h>
+#include <ntqpixmap.h>
 
 static const char * left_xpm[] = {
 "16 16 3 1",
diff --git a/tools/designer/editor/arghintwidget.h b/tools/designer/editor/arghintwidget.h
index d75c8738..09937e3d 100644
--- a/tools/designer/editor/arghintwidget.h
+++ b/tools/designer/editor/arghintwidget.h
@@ -34,7 +34,7 @@
 #ifndef ARGHINTWIDGET_H
 #define ARGHINTWIDGET_H
 
-#include <qframe.h>
+#include <ntqframe.h>
 
 class TQLabel;
 class ArrowButton;
diff --git a/tools/designer/editor/browser.h b/tools/designer/editor/browser.h
index 9e00af12..a19e2bcc 100644
--- a/tools/designer/editor/browser.h
+++ b/tools/designer/editor/browser.h
@@ -34,7 +34,7 @@
 #ifndef BROWSER_H
 #define BROWSER_H
 
-#include <qobject.h>
+#include <ntqobject.h>
 
 class Editor;
 class TQTextCursor;
diff --git a/tools/designer/editor/cindent.cpp b/tools/designer/editor/cindent.cpp
index 7e31f0f1..d30be460 100644
--- a/tools/designer/editor/cindent.cpp
+++ b/tools/designer/editor/cindent.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include "cindent.h"
-#include "qregexp.h"
+#include "ntqregexp.h"
 
 extern int indentForBottomLine( const TQStringList& program, TQChar typedIn );
 extern void setTabSize( int s );
diff --git a/tools/designer/editor/completion.cpp b/tools/designer/editor/completion.cpp
index 1a933782..f0923c55 100644
--- a/tools/designer/editor/completion.cpp
+++ b/tools/designer/editor/completion.cpp
@@ -34,15 +34,15 @@
 #include "completion.h"
 #include "paragdata.h"
 #include "editor.h"
-#include <qlistbox.h>
-#include <qvbox.h>
-#include <qmap.h>
+#include <ntqlistbox.h>
+#include <ntqvbox.h>
+#include <ntqmap.h>
 #include <private/qrichtext_p.h>
-#include <qapplication.h>
-#include <qregexp.h>
+#include <ntqapplication.h>
+#include <ntqregexp.h>
 #include "arghintwidget.h"
-#include <qsizegrip.h>
-#include <qtimer.h>
+#include <ntqsizegrip.h>
+#include <ntqtimer.h>
 
 static TQColor getColor( const TQString &type )
 {
diff --git a/tools/designer/editor/completion.h b/tools/designer/editor/completion.h
index 3b3e4362..6328315c 100644
--- a/tools/designer/editor/completion.h
+++ b/tools/designer/editor/completion.h
@@ -34,10 +34,10 @@
 #ifndef COMPLETION_H
 #define COMPLETION_H
 
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qobject.h>
-#include <qmap.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqobject.h>
+#include <ntqmap.h>
 
 class TQTextDocument;
 class Editor;
diff --git a/tools/designer/editor/conf.cpp b/tools/designer/editor/conf.cpp
index 281bf9f5..336f4471 100644
--- a/tools/designer/editor/conf.cpp
+++ b/tools/designer/editor/conf.cpp
@@ -32,10 +32,10 @@
 **********************************************************************/
 
 #include "conf.h"
-#include <qapplication.h>
-#include <qfont.h>
-#include <qcolor.h>
-#include <qsettings.h>
+#include <ntqapplication.h>
+#include <ntqfont.h>
+#include <ntqcolor.h>
+#include <ntqsettings.h>
 
 TQMap<TQString, ConfigStyle> Config::defaultStyles()
 {
diff --git a/tools/designer/editor/conf.h b/tools/designer/editor/conf.h
index 6538ca7f..aad97ddb 100644
--- a/tools/designer/editor/conf.h
+++ b/tools/designer/editor/conf.h
@@ -34,9 +34,9 @@
 #ifndef CONF_H
 #define CONF_H
 
-#include <qfont.h>
-#include <qcolor.h>
-#include <qmap.h>
+#include <ntqfont.h>
+#include <ntqcolor.h>
+#include <ntqmap.h>
 
 struct ConfigStyle
 {
diff --git a/tools/designer/editor/editor.cpp b/tools/designer/editor/editor.cpp
index 1b1bf15c..cba81236 100644
--- a/tools/designer/editor/editor.cpp
+++ b/tools/designer/editor/editor.cpp
@@ -33,12 +33,12 @@
 
 #include "editor.h"
 #include "parenmatcher.h"
-#include <qfile.h>
+#include <ntqfile.h>
 #include <private/qrichtext_p.h>
 #include "conf.h"
-#include <qapplication.h>
-#include <qpopupmenu.h>
-#include <qaccel.h>
+#include <ntqapplication.h>
+#include <ntqpopupmenu.h>
+#include <ntqaccel.h>
 
 Editor::Editor( const TQString &fn, TQWidget *parent, const char *name )
     : TQTextEdit( parent, name ), hasError( FALSE )
diff --git a/tools/designer/editor/editor.h b/tools/designer/editor/editor.h
index 64ea702b..768c5f53 100644
--- a/tools/designer/editor/editor.h
+++ b/tools/designer/editor/editor.h
@@ -34,7 +34,7 @@
 #ifndef EDITOR_H
 #define EDITOR_H
 
-#include <qtextedit.h>
+#include <ntqtextedit.h>
 
 struct Config;
 class ParenMatcher;
diff --git a/tools/designer/editor/markerwidget.cpp b/tools/designer/editor/markerwidget.cpp
index af36882f..69e68817 100644
--- a/tools/designer/editor/markerwidget.cpp
+++ b/tools/designer/editor/markerwidget.cpp
@@ -35,8 +35,8 @@
 #include "viewmanager.h"
 #include <private/qrichtext_p.h>
 #include "editor.h"
-#include <qpainter.h>
-#include <qpopupmenu.h>
+#include <ntqpainter.h>
+#include <ntqpopupmenu.h>
 #include "paragdata.h"
 
 static const char * error_xpm[] = {
diff --git a/tools/designer/editor/markerwidget.h b/tools/designer/editor/markerwidget.h
index 7fa5e674..2ab70a42 100644
--- a/tools/designer/editor/markerwidget.h
+++ b/tools/designer/editor/markerwidget.h
@@ -34,8 +34,8 @@
 #ifndef MARKERWIDGET_H
 #define MARKERWIDGET_H
 
-#include <qwidget.h>
-#include <qpixmap.h>
+#include <ntqwidget.h>
+#include <ntqpixmap.h>
 
 class ViewManager;
 class TQTextParagraph;
diff --git a/tools/designer/editor/parenmatcher.cpp b/tools/designer/editor/parenmatcher.cpp
index b3017be9..8cd6ffcb 100644
--- a/tools/designer/editor/parenmatcher.cpp
+++ b/tools/designer/editor/parenmatcher.cpp
@@ -34,9 +34,9 @@
 #include "parenmatcher.h"
 #include "paragdata.h"
 
-#include "qtextedit.h"
+#include "ntqtextedit.h"
 #include <private/qrichtext_p.h>
-#include <qapplication.h>
+#include <ntqapplication.h>
 
 ParenMatcher::ParenMatcher()
 {
diff --git a/tools/designer/editor/parenmatcher.h b/tools/designer/editor/parenmatcher.h
index 3b0710a6..805aca58 100644
--- a/tools/designer/editor/parenmatcher.h
+++ b/tools/designer/editor/parenmatcher.h
@@ -34,8 +34,8 @@
 #ifndef PARENMATCHER_H
 #define PARENMATCHER_H
 
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <ntqstring.h>
+#include <ntqvaluelist.h>
 
 class TQTextCursor;
 
diff --git a/tools/designer/editor/preferences.ui b/tools/designer/editor/preferences.ui
index e39bb816..00c56b64 100644
--- a/tools/designer/editor/preferences.ui
+++ b/tools/designer/editor/preferences.ui
@@ -470,18 +470,18 @@
     <tabstop>checkParenMatching</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">qmap.h</include>
+    <include location="global" impldecl="in declaration">ntqmap.h</include>
     <include location="local" impldecl="in declaration">conf.h</include>
-    <include location="global" impldecl="in implementation">qpalette.h</include>
-    <include location="global" impldecl="in implementation">qlineedit.h</include>
-    <include location="global" impldecl="in implementation">qpixmap.h</include>
-    <include location="global" impldecl="in implementation">qcombobox.h</include>
-    <include location="global" impldecl="in implementation">qfontdatabase.h</include>
+    <include location="global" impldecl="in implementation">ntqpalette.h</include>
+    <include location="global" impldecl="in implementation">ntqlineedit.h</include>
+    <include location="global" impldecl="in implementation">ntqpixmap.h</include>
+    <include location="global" impldecl="in implementation">ntqcombobox.h</include>
+    <include location="global" impldecl="in implementation">ntqfontdatabase.h</include>
     <include location="local" impldecl="in implementation">editor.h</include>
-    <include location="global" impldecl="in implementation">qpushbutton.h</include>
-    <include location="global" impldecl="in implementation">qcheckbox.h</include>
-    <include location="global" impldecl="in implementation">qcolordialog.h</include>
-    <include location="global" impldecl="in implementation">qsettings.h</include>
+    <include location="global" impldecl="in implementation">ntqpushbutton.h</include>
+    <include location="global" impldecl="in implementation">ntqcheckbox.h</include>
+    <include location="global" impldecl="in implementation">ntqcolordialog.h</include>
+    <include location="global" impldecl="in implementation">ntqsettings.h</include>
     <include location="local" impldecl="in implementation">preferences.ui.h</include>
 </includes>
 <variables>
diff --git a/tools/designer/editor/viewmanager.cpp b/tools/designer/editor/viewmanager.cpp
index aed224ed..def74705 100644
--- a/tools/designer/editor/viewmanager.cpp
+++ b/tools/designer/editor/viewmanager.cpp
@@ -34,12 +34,12 @@
 #include "viewmanager.h"
 #include "editor.h"
 #include "markerwidget.h"
-#include <qlayout.h>
+#include <ntqlayout.h>
 #include <private/qrichtext_p.h>
 #include "paragdata.h"
-#include <qobjectlist.h>
-#include <qlabel.h>
-#include <qtimer.h>
+#include <ntqobjectlist.h>
+#include <ntqlabel.h>
+#include <ntqtimer.h>
 
 ViewManager::ViewManager( TQWidget *parent, const char *name )
     : TQWidget( parent, name ), curView( 0 )
diff --git a/tools/designer/editor/viewmanager.h b/tools/designer/editor/viewmanager.h
index 8198d6c7..46e4839d 100644
--- a/tools/designer/editor/viewmanager.h
+++ b/tools/designer/editor/viewmanager.h
@@ -34,8 +34,8 @@
 #ifndef VIEWMANAGER_H
 #define VIEWMANAGER_H
 
-#include <qwidget.h>
-#include <qvaluelist.h>
+#include <ntqwidget.h>
+#include <ntqvaluelist.h>
 
 class TQChildEvent;
 class MarkerWidget;
diff --git a/tools/designer/editor/yyindent.cpp b/tools/designer/editor/yyindent.cpp
index 1cbaa4bd..f0014d37 100644
--- a/tools/designer/editor/yyindent.cpp
+++ b/tools/designer/editor/yyindent.cpp
@@ -70,7 +70,7 @@
   string literals are removed beforehand.
 */
 
-#include <qregexp.h>
+#include <ntqregexp.h>
 
 /* qmake ignore Q_OBJECT */
 
@@ -1106,8 +1106,8 @@ int indentForBottomLine( const TQStringList& program, TQChar typedIn )
   Test driver.
 */
 
-#include <qfile.h>
-#include <qtextstream.h>
+#include <ntqfile.h>
+#include <ntqtextstream.h>
 
 #include <errno.h>
 
diff --git a/tools/designer/examples/addressbook/addressbook.ui.h b/tools/designer/examples/addressbook/addressbook.ui.h
index ef5fc802..9b1d5460 100644
--- a/tools/designer/examples/addressbook/addressbook.ui.h
+++ b/tools/designer/examples/addressbook/addressbook.ui.h
@@ -8,10 +8,10 @@
 
 #include "addressdetails.h"
 #include "search.h"
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qfiledialog.h>
-#include <qapplication.h>
+#include <ntqfile.h>
+#include <ntqtextstream.h>
+#include <ntqfiledialog.h>
+#include <ntqapplication.h>
 
 void AddressBook::fileNew()
 {
diff --git a/tools/designer/examples/addressbook/main.cpp b/tools/designer/examples/addressbook/main.cpp
index f96b6a33..4b80e6d3 100644
--- a/tools/designer/examples/addressbook/main.cpp
+++ b/tools/designer/examples/addressbook/main.cpp
@@ -1,4 +1,4 @@
-#include <qapplication.h>
+#include <ntqapplication.h>
 #include "addressbook.h"
 
 int main( int argc, char ** argv )
diff --git a/tools/designer/examples/book/book1/main.cpp b/tools/designer/examples/book/book1/main.cpp
index cf3e80fd..b3ebdad0 100644
--- a/tools/designer/examples/book/book1/main.cpp
+++ b/tools/designer/examples/book/book1/main.cpp
@@ -7,8 +7,8 @@
 **
 *****************************************************************************/
 
-#include <qapplication.h>
-#include <qsqldatabase.h>
+#include <ntqapplication.h>
+#include <ntqsqldatabase.h>
 #include "book.h"
 #include "../connection.h"
 
diff --git a/tools/designer/examples/book/book2/main.cpp b/tools/designer/examples/book/book2/main.cpp
index cf3e80fd..b3ebdad0 100644
--- a/tools/designer/examples/book/book2/main.cpp
+++ b/tools/designer/examples/book/book2/main.cpp
@@ -7,8 +7,8 @@
 **
 *****************************************************************************/
 
-#include <qapplication.h>
-#include <qsqldatabase.h>
+#include <ntqapplication.h>
+#include <ntqsqldatabase.h>
 #include "book.h"
 #include "../connection.h"
 
diff --git a/tools/designer/examples/book/book3/main.cpp b/tools/designer/examples/book/book3/main.cpp
index 70b8cc89..ea512571 100644
--- a/tools/designer/examples/book/book3/main.cpp
+++ b/tools/designer/examples/book/book3/main.cpp
@@ -7,8 +7,8 @@
 **
 *****************************************************************************/
 
-#include <qapplication.h>
-#include <qsqldatabase.h>
+#include <ntqapplication.h>
+#include <ntqsqldatabase.h>
 #include "book.h"
 #include "../connection.h"
 
diff --git a/tools/designer/examples/book/book4/main.cpp b/tools/designer/examples/book/book4/main.cpp
index cdcdd509..1abe5a9a 100644
--- a/tools/designer/examples/book/book4/main.cpp
+++ b/tools/designer/examples/book/book4/main.cpp
@@ -7,8 +7,8 @@
 **
 *****************************************************************************/
 
-#include <qapplication.h>
-#include <qsqldatabase.h>
+#include <ntqapplication.h>
+#include <ntqsqldatabase.h>
 #include "book.h"
 #include "../connection.h"
 
diff --git a/tools/designer/examples/book/book5/book.ui b/tools/designer/examples/book/book5/book.ui
index 4c3e4de4..ce056dab 100644
--- a/tools/designer/examples/book/book5/book.ui
+++ b/tools/designer/examples/book/book5/book.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>BookForm</class>
-<include location="local" impldecl="in declaration">qdatabrowser.h</include>
+<include location="local" impldecl="in declaration">ntqdatabrowser.h</include>
 <include location="local" impldecl="in declaration">editbook.h</include>
 <include location="local" implDecl="in declaration">book.ui.h</include>
 <layoutdefaults spacing="6" margin="11"/>
diff --git a/tools/designer/examples/book/book5/main.cpp b/tools/designer/examples/book/book5/main.cpp
index cf3e80fd..b3ebdad0 100644
--- a/tools/designer/examples/book/book5/main.cpp
+++ b/tools/designer/examples/book/book5/main.cpp
@@ -7,8 +7,8 @@
 **
 *****************************************************************************/
 
-#include <qapplication.h>
-#include <qsqldatabase.h>
+#include <ntqapplication.h>
+#include <ntqsqldatabase.h>
 #include "book.h"
 #include "../connection.h"
 
diff --git a/tools/designer/examples/book/book6/book.ui b/tools/designer/examples/book/book6/book.ui
index 8fe77d4c..8adbb2bb 100644
--- a/tools/designer/examples/book/book6/book.ui
+++ b/tools/designer/examples/book/book6/book.ui
@@ -1,8 +1,8 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>BookForm</class>
-<include location="global" impldecl="in declaration">qsqlrecord.h</include>
+<include location="global" impldecl="in declaration">ntqsqlrecord.h</include>
 <include location="local" impldecl="in declaration">editbook.h</include>
-<include location="global" impldecl="in declaration">qdatabrowser.h</include>
+<include location="global" impldecl="in declaration">ntqdatabrowser.h</include>
 <include location="local" implDecl="in declaration">book.ui.h</include>
 <layoutdefaults spacing="6" margin="11"/>
 <widget class="TQDialog">
diff --git a/tools/designer/examples/book/book6/editbook.ui b/tools/designer/examples/book/book6/editbook.ui
index 5b3bc10c..b9162872 100644
--- a/tools/designer/examples/book/book6/editbook.ui
+++ b/tools/designer/examples/book/book6/editbook.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>EditBookForm</class>
-<include location="global" impldecl="in declaration">qsqlrecord.h</include>
+<include location="global" impldecl="in declaration">ntqsqlrecord.h</include>
 <include location="local" implDecl="in declaration">editbook.ui.h</include>
 <forward>class TQSqlRecord;</forward>
 <layoutdefaults spacing="6" margin="11"/>
diff --git a/tools/designer/examples/book/book6/main.cpp b/tools/designer/examples/book/book6/main.cpp
index cf3e80fd..b3ebdad0 100644
--- a/tools/designer/examples/book/book6/main.cpp
+++ b/tools/designer/examples/book/book6/main.cpp
@@ -7,8 +7,8 @@
 **
 *****************************************************************************/
 
-#include <qapplication.h>
-#include <qsqldatabase.h>
+#include <ntqapplication.h>
+#include <ntqsqldatabase.h>
 #include "book.h"
 #include "../connection.h"
 
diff --git a/tools/designer/examples/book/book7/book.ui b/tools/designer/examples/book/book7/book.ui
index faea9518..4a03ee6d 100644
--- a/tools/designer/examples/book/book7/book.ui
+++ b/tools/designer/examples/book/book7/book.ui
@@ -1,8 +1,8 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>BookForm</class>
-<include location="global" impldecl="in declaration">qsqlrecord.h</include>
+<include location="global" impldecl="in declaration">ntqsqlrecord.h</include>
 <include location="local" impldecl="in declaration">editbook.h</include>
-<include location="global" impldecl="in declaration">qdatabrowser.h</include>
+<include location="global" impldecl="in declaration">ntqdatabrowser.h</include>
 <include location="local" implDecl="in declaration">book.ui.h</include>
 <layoutdefaults spacing="6" margin="11"/>
 <widget class="TQDialog">
diff --git a/tools/designer/examples/book/book7/editbook.ui b/tools/designer/examples/book/book7/editbook.ui
index d0f876db..635d82fe 100644
--- a/tools/designer/examples/book/book7/editbook.ui
+++ b/tools/designer/examples/book/book7/editbook.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>EditBookForm</class>
-<include location="global" impldecl="in declaration">qsqlrecord.h</include>
+<include location="global" impldecl="in declaration">ntqsqlrecord.h</include>
 <include location="local" implDecl="in declaration">editbook.ui.h</include>
 <forward>class TQSqlRecord;</forward>
 <layoutdefaults spacing="6" margin="11"/>
diff --git a/tools/designer/examples/book/book7/main.cpp b/tools/designer/examples/book/book7/main.cpp
index cf3e80fd..b3ebdad0 100644
--- a/tools/designer/examples/book/book7/main.cpp
+++ b/tools/designer/examples/book/book7/main.cpp
@@ -7,8 +7,8 @@
 **
 *****************************************************************************/
 
-#include <qapplication.h>
-#include <qsqldatabase.h>
+#include <ntqapplication.h>
+#include <ntqsqldatabase.h>
 #include "book.h"
 #include "../connection.h"
 
diff --git a/tools/designer/examples/book/book8/book.ui b/tools/designer/examples/book/book8/book.ui
index faea9518..4a03ee6d 100644
--- a/tools/designer/examples/book/book8/book.ui
+++ b/tools/designer/examples/book/book8/book.ui
@@ -1,8 +1,8 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>BookForm</class>
-<include location="global" impldecl="in declaration">qsqlrecord.h</include>
+<include location="global" impldecl="in declaration">ntqsqlrecord.h</include>
 <include location="local" impldecl="in declaration">editbook.h</include>
-<include location="global" impldecl="in declaration">qdatabrowser.h</include>
+<include location="global" impldecl="in declaration">ntqdatabrowser.h</include>
 <include location="local" implDecl="in declaration">book.ui.h</include>
 <layoutdefaults spacing="6" margin="11"/>
 <widget class="TQDialog">
diff --git a/tools/designer/examples/book/book8/editbook.ui b/tools/designer/examples/book/book8/editbook.ui
index b16d789d..901f65de 100644
--- a/tools/designer/examples/book/book8/editbook.ui
+++ b/tools/designer/examples/book/book8/editbook.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>EditBookForm</class>
-<include location="global" impldecl="in declaration">qsqlrecord.h</include>
+<include location="global" impldecl="in declaration">ntqsqlrecord.h</include>
 <include location="local" implDecl="in declaration">editbook.ui.h</include>
 <forward>class TQSqlRecord;</forward>
 <variable>TQMap&lt;TQString,int&gt; authorMap;</variable>
diff --git a/tools/designer/examples/book/book8/main.cpp b/tools/designer/examples/book/book8/main.cpp
index cf3e80fd..b3ebdad0 100644
--- a/tools/designer/examples/book/book8/main.cpp
+++ b/tools/designer/examples/book/book8/main.cpp
@@ -7,8 +7,8 @@
 **
 *****************************************************************************/
 
-#include <qapplication.h>
-#include <qsqldatabase.h>
+#include <ntqapplication.h>
+#include <ntqsqldatabase.h>
 #include "book.h"
 #include "../connection.h"
 
diff --git a/tools/designer/examples/book/connection.cpp b/tools/designer/examples/book/connection.cpp
index efb1156c..3e42fd99 100644
--- a/tools/designer/examples/book/connection.cpp
+++ b/tools/designer/examples/book/connection.cpp
@@ -6,7 +6,7 @@
 ** program may be used, distributed and modified without limitation.
 **
 *****************************************************************************/
-#include <qsqldatabase.h>
+#include <ntqsqldatabase.h>
 #include "connection.h"
 
 bool createConnections()
diff --git a/tools/designer/examples/colortool/colornameform.ui.h b/tools/designer/examples/colortool/colornameform.ui.h
index 0c7ab715..5dcffa3c 100644
--- a/tools/designer/examples/colortool/colornameform.ui.h
+++ b/tools/designer/examples/colortool/colornameform.ui.h
@@ -5,9 +5,9 @@
 ** update this file, preserving your code. Create an init() function in place
 ** of a constructor, and a destroy() function in place of a destructor.
 *****************************************************************************/
-#include <qcolor.h>
-#include <qmap.h>
-#include <qstring.h>
+#include <ntqcolor.h>
+#include <ntqmap.h>
+#include <ntqstring.h>
 
 TQMap<TQString,TQColor> m_colors;
 
diff --git a/tools/designer/examples/colortool/main.cpp b/tools/designer/examples/colortool/main.cpp
index 48aa425d..7b3be5a5 100644
--- a/tools/designer/examples/colortool/main.cpp
+++ b/tools/designer/examples/colortool/main.cpp
@@ -1,4 +1,4 @@
-#include <qapplication.h>
+#include <ntqapplication.h>
 #include "mainform.h"
 
 int main( int argc, char ** argv )
diff --git a/tools/designer/examples/colortool/mainform.ui b/tools/designer/examples/colortool/mainform.ui
index f4081882..945fb1ab 100644
--- a/tools/designer/examples/colortool/mainform.ui
+++ b/tools/designer/examples/colortool/mainform.ui
@@ -527,23 +527,23 @@
 </connections>
 <includes>
     <include location="local" impldecl="in declaration">findform.h</include>
-    <include location="local" impldecl="in implementation">qsettings.h</include>
-    <include location="local" impldecl="in implementation">qradiobutton.h</include>
-    <include location="local" impldecl="in implementation">qcheckbox.h</include>
+    <include location="local" impldecl="in implementation">ntqsettings.h</include>
+    <include location="local" impldecl="in implementation">ntqradiobutton.h</include>
+    <include location="local" impldecl="in implementation">ntqcheckbox.h</include>
     <include location="local" impldecl="in implementation">colornameform.h</include>
-    <include location="local" impldecl="in implementation">qcolordialog.h</include>
-    <include location="local" impldecl="in implementation">qregexp.h</include>
-    <include location="local" impldecl="in implementation">qfile.h</include>
-    <include location="local" impldecl="in implementation">qfiledialog.h</include>
-    <include location="local" impldecl="in implementation">qapplication.h</include>
-    <include location="local" impldecl="in implementation">qcolor.h</include>
-    <include location="local" impldecl="in implementation">qstring.h</include>
-    <include location="local" impldecl="in implementation">qpainter.h</include>
-    <include location="local" impldecl="in implementation">qstatusbar.h</include>
-    <include location="local" impldecl="in implementation">qmessagebox.h</include>
-    <include location="local" impldecl="in implementation">qclipboard.h</include>
-    <include location="local" impldecl="in implementation">qlabel.h</include>
-    <include location="local" impldecl="in implementation">qlineedit.h</include>
+    <include location="local" impldecl="in implementation">ntqcolordialog.h</include>
+    <include location="local" impldecl="in implementation">ntqregexp.h</include>
+    <include location="local" impldecl="in implementation">ntqfile.h</include>
+    <include location="local" impldecl="in implementation">ntqfiledialog.h</include>
+    <include location="local" impldecl="in implementation">ntqapplication.h</include>
+    <include location="local" impldecl="in implementation">ntqcolor.h</include>
+    <include location="local" impldecl="in implementation">ntqstring.h</include>
+    <include location="local" impldecl="in implementation">ntqpainter.h</include>
+    <include location="local" impldecl="in implementation">ntqstatusbar.h</include>
+    <include location="local" impldecl="in implementation">ntqmessagebox.h</include>
+    <include location="local" impldecl="in implementation">ntqclipboard.h</include>
+    <include location="local" impldecl="in implementation">ntqlabel.h</include>
+    <include location="local" impldecl="in implementation">ntqlineedit.h</include>
     <include location="local" impldecl="in implementation">optionsform.h</include>
     <include location="local" impldecl="in implementation">mainform.ui.h</include>
 </includes>
diff --git a/tools/designer/examples/credit/creditform.cpp b/tools/designer/examples/credit/creditform.cpp
index a0328561..8bceaa4b 100644
--- a/tools/designer/examples/credit/creditform.cpp
+++ b/tools/designer/examples/credit/creditform.cpp
@@ -1,5 +1,5 @@
-#include <qradiobutton.h>
-#include <qspinbox.h>
+#include <ntqradiobutton.h>
+#include <ntqspinbox.h>
 #include "creditform.h"
 
 CreditForm::CreditForm( TQWidget* parent, const char* name, 
diff --git a/tools/designer/examples/credit/creditformbase.cpp b/tools/designer/examples/credit/creditformbase.cpp
index 2d81cab3..51c5e6a4 100644
--- a/tools/designer/examples/credit/creditformbase.cpp
+++ b/tools/designer/examples/credit/creditformbase.cpp
@@ -8,19 +8,19 @@
 ****************************************************************************/
 #include "creditformbase.h"
 
-#include <qvariant.h>   // first for gcc 2.7.2
-#include <qbuttongroup.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qspinbox.h>
-#include <qmime.h>
-#include <qdragobject.h>
-#include <qlayout.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
+#include <ntqvariant.h>   // first for gcc 2.7.2
+#include <ntqbuttongroup.h>
+#include <ntqpushbutton.h>
+#include <ntqradiobutton.h>
+#include <ntqspinbox.h>
+#include <ntqmime.h>
+#include <ntqdragobject.h>
+#include <ntqlayout.h>
+#include <ntqtooltip.h>
+#include <ntqwhatsthis.h>
 #include "creditformbase.ui.h"
-#include <qimage.h>
-#include <qpixmap.h>
+#include <ntqimage.h>
+#include <ntqpixmap.h>
 
 static TQPixmap uic_load_pixmap_CreditFormBase( const TQString &name )
 {
diff --git a/tools/designer/examples/credit/creditformbase.h b/tools/designer/examples/credit/creditformbase.h
index fd99df49..428b3d1b 100644
--- a/tools/designer/examples/credit/creditformbase.h
+++ b/tools/designer/examples/credit/creditformbase.h
@@ -9,8 +9,8 @@
 #ifndef CREDITFORMBASE_H
 #define CREDITFORMBASE_H
 
-#include <qvariant.h>
-#include <qdialog.h>
+#include <ntqvariant.h>
+#include <ntqdialog.h>
 class TQVBoxLayout; 
 class TQHBoxLayout; 
 class TQGridLayout; 
diff --git a/tools/designer/examples/credit/main.cpp b/tools/designer/examples/credit/main.cpp
index d54c9d40..a1e06b3c 100644
--- a/tools/designer/examples/credit/main.cpp
+++ b/tools/designer/examples/credit/main.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <qapplication.h>
+#include <ntqapplication.h>
 #include "creditform.h"
 
 
diff --git a/tools/designer/examples/filechooser/plugin/plugin.h b/tools/designer/examples/filechooser/plugin/plugin.h
index 11262f83..e8252fe7 100644
--- a/tools/designer/examples/filechooser/plugin/plugin.h
+++ b/tools/designer/examples/filechooser/plugin/plugin.h
@@ -1,4 +1,4 @@
-#include <qwidgetplugin.h>
+#include <ntqwidgetplugin.h>
 
 class CustomWidgetPlugin : public TQWidgetPlugin
 {
diff --git a/tools/designer/examples/filechooser/widget/filechooser.cpp b/tools/designer/examples/filechooser/widget/filechooser.cpp
index c082b943..3b510baf 100644
--- a/tools/designer/examples/filechooser/widget/filechooser.cpp
+++ b/tools/designer/examples/filechooser/widget/filechooser.cpp
@@ -1,8 +1,8 @@
 #include "filechooser.h"
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qfiledialog.h>
-#include <qlayout.h>
+#include <ntqlineedit.h>
+#include <ntqpushbutton.h>
+#include <ntqfiledialog.h>
+#include <ntqlayout.h>
 
 FileChooser::FileChooser( TQWidget *parent, const char *name )
     : TQWidget( parent, name ), md( File )
diff --git a/tools/designer/examples/filechooser/widget/filechooser.h b/tools/designer/examples/filechooser/widget/filechooser.h
index cff0af53..4d303a94 100644
--- a/tools/designer/examples/filechooser/widget/filechooser.h
+++ b/tools/designer/examples/filechooser/widget/filechooser.h
@@ -1,8 +1,8 @@
 #ifndef FILECHOOSER_H
 #define FILECHOOSER_H
 
-#include <qwidget.h>
-#include <qwidgetplugin.h>
+#include <ntqwidget.h>
+#include <ntqwidgetplugin.h>
 
 class TQLineEdit;
 class TQPushButton;
diff --git a/tools/designer/examples/filechooser/widget/main.cpp b/tools/designer/examples/filechooser/widget/main.cpp
index 2742db74..b50ddf7f 100644
--- a/tools/designer/examples/filechooser/widget/main.cpp
+++ b/tools/designer/examples/filechooser/widget/main.cpp
@@ -1,4 +1,4 @@
-#include <qapplication.h>
+#include <ntqapplication.h>
 #include "filechooser.h"
 
 int main( int argc, char ** argv )
diff --git a/tools/designer/examples/metric/main.cpp b/tools/designer/examples/metric/main.cpp
index fb7cfc76..8fe7bf6f 100644
--- a/tools/designer/examples/metric/main.cpp
+++ b/tools/designer/examples/metric/main.cpp
@@ -1,4 +1,4 @@
-#include <qapplication.h>
+#include <ntqapplication.h>
 #include "metric.h"
 
 int main( int argc, char ** argv )
diff --git a/tools/designer/examples/metric/metric.ui.h b/tools/designer/examples/metric/metric.ui.h
index 7d9db780..7277a1f6 100644
--- a/tools/designer/examples/metric/metric.ui.h
+++ b/tools/designer/examples/metric/metric.ui.h
@@ -7,7 +7,7 @@
 ** place of a destructor.
 *****************************************************************************/
 
-#include <qvalidator.h>
+#include <ntqvalidator.h>
 
 void ConversionForm::init()
 {
diff --git a/tools/designer/examples/multiclip/main.cpp b/tools/designer/examples/multiclip/main.cpp
index 4c6a9409..4b1e93aa 100644
--- a/tools/designer/examples/multiclip/main.cpp
+++ b/tools/designer/examples/multiclip/main.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <qapplication.h>
+#include <ntqapplication.h>
 #include "multiclip.h"
 
 
diff --git a/tools/designer/examples/multiclip/multiclip.ui b/tools/designer/examples/multiclip/multiclip.ui
index f1312fd9..7deb0b88 100644
--- a/tools/designer/examples/multiclip/multiclip.ui
+++ b/tools/designer/examples/multiclip/multiclip.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>MulticlipForm</class>
-<include location="global" impldecl="in declaration">qclipboard.h</include>
-<include location="global" impldecl="in implementation">qapplication.h</include>
+<include location="global" impldecl="in declaration">ntqclipboard.h</include>
+<include location="global" impldecl="in implementation">ntqapplication.h</include>
 <include location="local" implDecl="in declaration">multiclip.ui.h</include>
 <variable>TQClipboard *cb;</variable>
 <pixmapinproject/>
diff --git a/tools/designer/examples/opengl/glwidget.h b/tools/designer/examples/opengl/glwidget.h
index b63884ed..6cb998ee 100644
--- a/tools/designer/examples/opengl/glwidget.h
+++ b/tools/designer/examples/opengl/glwidget.h
@@ -35,7 +35,7 @@
 #ifndef GLWIDGET_H
 #define GLWIDGET_H
 
-#include <qgl.h>
+#include <ntqgl.h>
 
 class GLWidget : public TQGLWidget
 {
diff --git a/tools/designer/examples/opengl/main.cpp b/tools/designer/examples/opengl/main.cpp
index 14a1ba8c..5e9fd117 100644
--- a/tools/designer/examples/opengl/main.cpp
+++ b/tools/designer/examples/opengl/main.cpp
@@ -34,8 +34,8 @@
 
 #include <widgetinterface.h>
 
-#include <qobjectcleanuphandler.h>
-#include <qpixmap.h>
+#include <ntqobjectcleanuphandler.h>
+#include <ntqpixmap.h>
 
 #include "glwidget.h"
 
diff --git a/tools/designer/examples/receiver1/main.cpp b/tools/designer/examples/receiver1/main.cpp
index c5145d06..72efaafa 100644
--- a/tools/designer/examples/receiver1/main.cpp
+++ b/tools/designer/examples/receiver1/main.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <qapplication.h>
+#include <ntqapplication.h>
 #include "mainform.h"
 
 int main( int argc, char *argv[] ) 
diff --git a/tools/designer/examples/receiver1/mainform.ui b/tools/designer/examples/receiver1/mainform.ui
index 3f332675..1ae2c8ed 100644
--- a/tools/designer/examples/receiver1/mainform.ui
+++ b/tools/designer/examples/receiver1/mainform.ui
@@ -74,8 +74,8 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in implementation">qspinbox.h</include>
-    <include location="global" impldecl="in implementation">qwidgetfactory.h</include>
+    <include location="global" impldecl="in implementation">ntqspinbox.h</include>
+    <include location="global" impldecl="in implementation">ntqwidgetfactory.h</include>
     <include location="local" impldecl="in implementation">mainform.ui.h</include>
 </includes>
 <slots>
diff --git a/tools/designer/examples/receiver2/main.cpp b/tools/designer/examples/receiver2/main.cpp
index 6d263fdc..697f7a5f 100644
--- a/tools/designer/examples/receiver2/main.cpp
+++ b/tools/designer/examples/receiver2/main.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <qapplication.h>
+#include <ntqapplication.h>
 #include "mainform.h"
 
 
diff --git a/tools/designer/examples/receiver2/mainform.ui b/tools/designer/examples/receiver2/mainform.ui
index 4d52c281..306ca127 100644
--- a/tools/designer/examples/receiver2/mainform.ui
+++ b/tools/designer/examples/receiver2/mainform.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>MainForm</class>
-<include location="global" impldecl="in implementation">qwidgetfactory.h</include>
-<include location="global" impldecl="in implementation">qspinbox.h</include>
+<include location="global" impldecl="in implementation">ntqwidgetfactory.h</include>
+<include location="global" impldecl="in implementation">ntqspinbox.h</include>
 <include location="local" impldecl="in implementation">receiver.h</include>
 <include location="local" implDecl="in declaration">mainform.ui.h</include>
 <layoutdefaults spacing="6" margin="11"/>
diff --git a/tools/designer/examples/receiver2/receiver.cpp b/tools/designer/examples/receiver2/receiver.cpp
index 6ad18cc8..41ce98db 100644
--- a/tools/designer/examples/receiver2/receiver.cpp
+++ b/tools/designer/examples/receiver2/receiver.cpp
@@ -1,5 +1,5 @@
-#include <qradiobutton.h>
-#include <qspinbox.h>
+#include <ntqradiobutton.h>
+#include <ntqspinbox.h>
 #include "receiver.h"
 
 void Receiver::setParent( TQDialog *parent )
diff --git a/tools/designer/examples/receiver2/receiver.h b/tools/designer/examples/receiver2/receiver.h
index aa17de83..aadc6a9e 100644
--- a/tools/designer/examples/receiver2/receiver.h
+++ b/tools/designer/examples/receiver2/receiver.h
@@ -1,5 +1,5 @@
-#include <qobject.h>
-#include <qdialog.h>
+#include <ntqobject.h>
+#include <ntqdialog.h>
 
 class Receiver : public TQObject
 {
diff --git a/tools/designer/examples/richedit/main.cpp b/tools/designer/examples/richedit/main.cpp
index 1f5b8aff..1a5cb1f8 100644
--- a/tools/designer/examples/richedit/main.cpp
+++ b/tools/designer/examples/richedit/main.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <qapplication.h>
+#include <ntqapplication.h>
 #include "richedit.h"
 
 
diff --git a/tools/designer/examples/richedit/richedit.ui b/tools/designer/examples/richedit/richedit.ui
index 0d86a19b..9f3dde0a 100644
--- a/tools/designer/examples/richedit/richedit.ui
+++ b/tools/designer/examples/richedit/richedit.ui
@@ -1,11 +1,11 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>EditorForm</class>
-<include location="global" impldecl="in implementation">qfile.h</include>
-<include location="global" impldecl="in implementation">qfontdatabase.h</include>
-<include location="global" impldecl="in implementation">qmessagebox.h</include>
-<include location="global" impldecl="in implementation">qapplication.h</include>
-<include location="global" impldecl="in implementation">qfiledialog.h</include>
-<include location="global" impldecl="in implementation">qtextstream.h</include>
+<include location="global" impldecl="in implementation">ntqfile.h</include>
+<include location="global" impldecl="in implementation">ntqfontdatabase.h</include>
+<include location="global" impldecl="in implementation">ntqmessagebox.h</include>
+<include location="global" impldecl="in implementation">ntqapplication.h</include>
+<include location="global" impldecl="in implementation">ntqfiledialog.h</include>
+<include location="global" impldecl="in implementation">ntqtextstream.h</include>
 <include location="local" implDecl="in declaration">richedit.ui.h</include>
 <variable>TQString fileName;</variable>
 <pixmapinproject/>
diff --git a/tools/designer/examples/sizeaware/main.cpp b/tools/designer/examples/sizeaware/main.cpp
index 6ad151e6..2b0dcf44 100644
--- a/tools/designer/examples/sizeaware/main.cpp
+++ b/tools/designer/examples/sizeaware/main.cpp
@@ -1,4 +1,4 @@
-#include <qapplication.h>
+#include <ntqapplication.h>
 #include "sizeaware.h"
 
 int main( int argc, char ** argv )
diff --git a/tools/designer/examples/sizeaware/sizeaware.cpp b/tools/designer/examples/sizeaware/sizeaware.cpp
index 9731126c..621d36ea 100644
--- a/tools/designer/examples/sizeaware/sizeaware.cpp
+++ b/tools/designer/examples/sizeaware/sizeaware.cpp
@@ -1,5 +1,5 @@
 #include "sizeaware.h"
-#include <qsettings.h>
+#include <ntqsettings.h>
 
 
 SizeAware::SizeAware( TQDialog *parent, const char *name, bool modal )
diff --git a/tools/designer/examples/sizeaware/sizeaware.h b/tools/designer/examples/sizeaware/sizeaware.h
index 73c208fb..d118ed3f 100644
--- a/tools/designer/examples/sizeaware/sizeaware.h
+++ b/tools/designer/examples/sizeaware/sizeaware.h
@@ -1,6 +1,6 @@
 #ifndef SIZEAWARE_H
 #define SIZEAWARE_H
-#include <qdialog.h>
+#include <ntqdialog.h>
 
 class SizeAware : public TQDialog
 {
diff --git a/tools/designer/examples/vcr/main.cpp b/tools/designer/examples/vcr/main.cpp
index a83f6d6e..4beb0d1c 100644
--- a/tools/designer/examples/vcr/main.cpp
+++ b/tools/designer/examples/vcr/main.cpp
@@ -1,4 +1,4 @@
-#include <qapplication.h>
+#include <ntqapplication.h>
 #include "vcr.h"
 
 int main( int argc, char ** argv )
diff --git a/tools/designer/examples/vcr/vcr.cpp b/tools/designer/examples/vcr/vcr.cpp
index 8c341d55..fd39e1a9 100644
--- a/tools/designer/examples/vcr/vcr.cpp
+++ b/tools/designer/examples/vcr/vcr.cpp
@@ -1,6 +1,6 @@
 #include "vcr.h"
-#include <qpushbutton.h>
-#include <qlayout.h>
+#include <ntqpushbutton.h>
+#include <ntqlayout.h>
 
 static const char * rewind_xpm[] = {
 "16 16 3 1",
diff --git a/tools/designer/examples/vcr/vcr.h b/tools/designer/examples/vcr/vcr.h
index 39f3481f..daff3d1d 100644
--- a/tools/designer/examples/vcr/vcr.h
+++ b/tools/designer/examples/vcr/vcr.h
@@ -1,6 +1,6 @@
 #ifndef VCR_H
 #define VCR_H
-#include <qwidget.h>
+#include <ntqwidget.h>
 
 class Vcr : public TQWidget
 {
diff --git a/tools/designer/interfaces/classbrowserinterface.h b/tools/designer/interfaces/classbrowserinterface.h
index 38a71f49..2762a329 100644
--- a/tools/designer/interfaces/classbrowserinterface.h
+++ b/tools/designer/interfaces/classbrowserinterface.h
@@ -48,7 +48,7 @@
 //
 
 #include <private/qcom_p.h>
-#include <qobject.h>
+#include <ntqobject.h>
 class TQListView;
 
 // {4ede3c32-ae96-4b7a-9e38-9f1d93592391}
diff --git a/tools/designer/interfaces/designerinterface.h b/tools/designer/interfaces/designerinterface.h
index dea11170..e0f5952b 100644
--- a/tools/designer/interfaces/designerinterface.h
+++ b/tools/designer/interfaces/designerinterface.h
@@ -48,12 +48,12 @@
 //
 
 #include <private/qcom_p.h>
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qmap.h>
-#include <qstringlist.h>
-#include <qwidgetlist.h>
-#include <qobjectlist.h>
+#include <ntqptrlist.h>
+#include <ntqstring.h>
+#include <ntqmap.h>
+#include <ntqstringlist.h>
+#include <ntqwidgetlist.h>
+#include <ntqobjectlist.h>
 
 struct DesignerProject;
 struct DesignerDatabase;
diff --git a/tools/designer/interfaces/editorinterface.h b/tools/designer/interfaces/editorinterface.h
index a16fe35d..099f4dda 100644
--- a/tools/designer/interfaces/editorinterface.h
+++ b/tools/designer/interfaces/editorinterface.h
@@ -48,8 +48,8 @@
 //
 
 #include <private/qcom_p.h>
-#include <qmap.h>
-#include <qvaluelist.h>
+#include <ntqmap.h>
+#include <ntqvaluelist.h>
 
 class TQWidget;
 class TQObjectList;
diff --git a/tools/designer/interfaces/languageinterface.h b/tools/designer/interfaces/languageinterface.h
index 5ad85fc3..0ff51afc 100644
--- a/tools/designer/interfaces/languageinterface.h
+++ b/tools/designer/interfaces/languageinterface.h
@@ -48,10 +48,10 @@
 //
 
 #include <private/qcom_p.h>
-#include <qvaluelist.h>
-#include <qstringlist.h>
-#include <qmap.h>
-#include <qstrlist.h>
+#include <ntqvaluelist.h>
+#include <ntqstringlist.h>
+#include <ntqmap.h>
+#include <ntqstrlist.h>
 
 // {f208499a-6f69-4883-9219-6e936e55a330}
 #ifndef IID_Language
diff --git a/tools/designer/interfaces/preferenceinterface.h b/tools/designer/interfaces/preferenceinterface.h
index 1d89f591..882ee10c 100644
--- a/tools/designer/interfaces/preferenceinterface.h
+++ b/tools/designer/interfaces/preferenceinterface.h
@@ -48,8 +48,8 @@
 //
 
 #include <private/qcom_p.h>
-#include <qwidgetlist.h>
-#include <qcstring.h>
+#include <ntqwidgetlist.h>
+#include <ntqcstring.h>
 
 // {5c168ee7-4bee-469f-9995-6afdb04ce5a2}
 #ifndef IID_Preference
diff --git a/tools/designer/interfaces/projectsettingsiface.h b/tools/designer/interfaces/projectsettingsiface.h
index 13fa7182..5390c081 100644
--- a/tools/designer/interfaces/projectsettingsiface.h
+++ b/tools/designer/interfaces/projectsettingsiface.h
@@ -48,8 +48,8 @@
 //
 
 #include <private/qcom_p.h>
-#include <qwidgetlist.h>
-#include <qcstring.h>
+#include <ntqwidgetlist.h>
+#include <ntqcstring.h>
 
 // {d332785d-17fb-4894-84fe-50dbd0ad9512}
 #ifndef IID_ProjectSettings
diff --git a/tools/designer/interfaces/sourcetemplateiface.h b/tools/designer/interfaces/sourcetemplateiface.h
index aa111a7f..6ea60476 100644
--- a/tools/designer/interfaces/sourcetemplateiface.h
+++ b/tools/designer/interfaces/sourcetemplateiface.h
@@ -48,7 +48,7 @@
 //
 
 #include <private/qcom_p.h>
-#include <qstring.h>
+#include <ntqstring.h>
 
 // {1b3446a4-1c71-424b-8789-1f34eb5697d8}
 #ifndef IID_SourceTemplate
diff --git a/tools/designer/plugins/cppeditor/cppbrowser.cpp b/tools/designer/plugins/cppeditor/cppbrowser.cpp
index 9f9e0859..8d3e68bc 100644
--- a/tools/designer/plugins/cppeditor/cppbrowser.cpp
+++ b/tools/designer/plugins/cppeditor/cppbrowser.cpp
@@ -34,9 +34,9 @@
 
 #include "cppbrowser.h"
 #include <private/qrichtext_p.h>
-#include <qprocess.h>
-#include <qmainwindow.h>
-#include <qstatusbar.h>
+#include <ntqprocess.h>
+#include <ntqmainwindow.h>
+#include <ntqstatusbar.h>
 #include <editor.h>
 
 CppEditorBrowser::CppEditorBrowser( Editor *e )
diff --git a/tools/designer/plugins/cppeditor/cppcompletion.cpp b/tools/designer/plugins/cppeditor/cppcompletion.cpp
index 947931e8..a5643b91 100644
--- a/tools/designer/plugins/cppeditor/cppcompletion.cpp
+++ b/tools/designer/plugins/cppeditor/cppcompletion.cpp
@@ -33,10 +33,10 @@
 **********************************************************************/
 
 #include "cppcompletion.h"
-#include <qobject.h>
-#include <qmetaobject.h>
-#include <qobjectlist.h>
-#include <qregexp.h>
+#include <ntqobject.h>
+#include <ntqmetaobject.h>
+#include <ntqobjectlist.h>
+#include <ntqregexp.h>
 
 CppEditorCompletion::CppEditorCompletion( Editor *e )
     : EditorCompletion( e )
diff --git a/tools/designer/plugins/cppeditor/cppcompletion.h b/tools/designer/plugins/cppeditor/cppcompletion.h
index 73c0c77c..965fc8f3 100644
--- a/tools/designer/plugins/cppeditor/cppcompletion.h
+++ b/tools/designer/plugins/cppeditor/cppcompletion.h
@@ -36,7 +36,7 @@
 #define CPPCOMPLETION_H
 
 #include <completion.h>
-#include <qguardedptr.h>
+#include <ntqguardedptr.h>
 
 class CppEditorCompletion : public EditorCompletion
 {
diff --git a/tools/designer/plugins/cppeditor/cppeditor.cpp b/tools/designer/plugins/cppeditor/cppeditor.cpp
index cb480884..13069230 100644
--- a/tools/designer/plugins/cppeditor/cppeditor.cpp
+++ b/tools/designer/plugins/cppeditor/cppeditor.cpp
@@ -38,9 +38,9 @@
 #include "cppcompletion.h"
 #include "cppbrowser.h"
 #include <parenmatcher.h>
-#include <qsettings.h>
-#include <qpopupmenu.h>
-#include <qinputdialog.h>
+#include <ntqsettings.h>
+#include <ntqpopupmenu.h>
+#include <ntqinputdialog.h>
 #include <designerinterface.h>
 
 CppEditor::CppEditor( const TQString &fn, TQWidget *parent, const char *name, DesignerInterface *i )
diff --git a/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp
index 8e98f9f3..22e51cf4 100644
--- a/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp
+++ b/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp
@@ -36,10 +36,10 @@
 #include <viewmanager.h>
 #include "cppeditor.h"
 #include <private/qrichtext_p.h>
-#include <qapplication.h>
+#include <ntqapplication.h>
 #include "completion.h"
 #include <designerinterface.h>
-#include <qtimer.h>
+#include <ntqtimer.h>
 
 EditorInterfaceImpl::EditorInterfaceImpl()
     : EditorInterface(), viewManager( 0 ), dIface( 0 )
diff --git a/tools/designer/plugins/cppeditor/editorinterfaceimpl.h b/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
index 96062d54..238611c9 100644
--- a/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
+++ b/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
@@ -36,8 +36,8 @@
 #define EDITORINTERFACEIMPL_H
 
 #include <editorinterface.h>
-#include <qobject.h>
-#include <qguardedptr.h>
+#include <ntqobject.h>
+#include <ntqguardedptr.h>
 
 class TQTimer;
 class ViewManager;
diff --git a/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp
index 89bda177..1fbd63e0 100644
--- a/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp
+++ b/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp
@@ -33,11 +33,11 @@
 **********************************************************************/
 
 #include "languageinterfaceimpl.h"
-#include <qobject.h>
+#include <ntqobject.h>
 #include <designerinterface.h>
-#include <qfile.h>
+#include <ntqfile.h>
 #include "yyreg.h"
-#include <qmetaobject.h>
+#include <ntqmetaobject.h>
 
 LanguageInterfaceImpl::LanguageInterfaceImpl( TQUnknownInterface *outer )
     : parent( outer ), ref( 0 )
diff --git a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp
index 1ff8e948..a140903f 100644
--- a/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp
+++ b/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp
@@ -35,8 +35,8 @@
 #include "sourcetemplateinterfaceimpl.h"
 #include <designerinterface.h>
 #include "mainfilesettings.h"
-#include <qlineedit.h>
-#include <qlistbox.h>
+#include <ntqlineedit.h>
+#include <ntqlistbox.h>
 
 SourceTemplateInterfaceImpl::SourceTemplateInterfaceImpl()
 {
@@ -68,7 +68,7 @@ TQStringList SourceTemplateInterfaceImpl::featureList() const
 static TQString generateMainCppCode( const TQString &formname, const TQString &include )
 {
     TQString code;
-    code += "#include <qapplication.h>\n";
+    code += "#include <ntqapplication.h>\n";
     code += "#include \"" + include + "\"\n";
     code += "\n";
     code += "int main( int argc, char ** argv )\n";
diff --git a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp
index 5d4441fd..ce30936c 100644
--- a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp
+++ b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp
@@ -34,11 +34,11 @@
 
 #include "syntaxhighliter_cpp.h"
 #include "paragdata.h"
-#include "qstring.h"
-#include "qstringlist.h"
-#include "qmap.h"
-#include "qapplication.h"
-#include "qregexp.h"
+#include "ntqstring.h"
+#include "ntqstringlist.h"
+#include "ntqmap.h"
+#include "ntqapplication.h"
+#include "ntqregexp.h"
 
 const char * const SyntaxHighlighter_CPP::keywords[] = {
     // C++ keywords
diff --git a/tools/designer/plugins/cppeditor/yyreg.cpp b/tools/designer/plugins/cppeditor/yyreg.cpp
index 0d95e409..4073752b 100644
--- a/tools/designer/plugins/cppeditor/yyreg.cpp
+++ b/tools/designer/plugins/cppeditor/yyreg.cpp
@@ -32,7 +32,7 @@
 **
 **********************************************************************/
 
-#include <qregexp.h>
+#include <ntqregexp.h>
 
 #include <ctype.h>
 #include <stdio.h>
diff --git a/tools/designer/plugins/cppeditor/yyreg.h b/tools/designer/plugins/cppeditor/yyreg.h
index 5d849a0f..a39eac82 100644
--- a/tools/designer/plugins/cppeditor/yyreg.h
+++ b/tools/designer/plugins/cppeditor/yyreg.h
@@ -35,8 +35,8 @@
 #ifndef YYREG_H
 #define YYREG_H
 
-#include <qstringlist.h>
-#include <qvaluelist.h>
+#include <ntqstringlist.h>
+#include <ntqvaluelist.h>
 
 class CppFunction
 {
diff --git a/tools/designer/plugins/dlg/dlg2ui.cpp b/tools/designer/plugins/dlg/dlg2ui.cpp
index c3083341..da0cd500 100644
--- a/tools/designer/plugins/dlg/dlg2ui.cpp
+++ b/tools/designer/plugins/dlg/dlg2ui.cpp
@@ -35,11 +35,11 @@
 **********************************************************************/
 
 #include "dlg2ui.h"
-#include <qfile.h>
-#include <qframe.h>
-#include <qmessagebox.h>
-#include <qregexp.h>
-#include <qtextstream.h>
+#include <ntqfile.h>
+#include <ntqframe.h>
+#include <ntqmessagebox.h>
+#include <ntqregexp.h>
+#include <ntqtextstream.h>
 
 /*
   Possible improvements:
diff --git a/tools/designer/plugins/dlg/dlg2ui.h b/tools/designer/plugins/dlg/dlg2ui.h
index 9b4abc9c..2aaf5672 100644
--- a/tools/designer/plugins/dlg/dlg2ui.h
+++ b/tools/designer/plugins/dlg/dlg2ui.h
@@ -35,10 +35,10 @@
 #ifndef DLG2UI_H
 #define DLG2UI_H
 
-#include <qdom.h>
-#include <qmap.h>
-#include <qstring.h>
-#include <qvariant.h>
+#include <ntqdom.h>
+#include <ntqmap.h>
+#include <ntqstring.h>
+#include <ntqvariant.h>
 
 typedef TQMap<TQString, TQString> AttributeMap;
 
diff --git a/tools/designer/plugins/dlg/main.cpp b/tools/designer/plugins/dlg/main.cpp
index 9709d187..37d54c53 100644
--- a/tools/designer/plugins/dlg/main.cpp
+++ b/tools/designer/plugins/dlg/main.cpp
@@ -33,7 +33,7 @@
 **********************************************************************/
 
 #include <filterinterface.h>
-#include <qapplication.h>
+#include <ntqapplication.h>
 
 #include "dlg2ui.h"
 
diff --git a/tools/designer/plugins/glade/glade2ui.cpp b/tools/designer/plugins/glade/glade2ui.cpp
index 74613b02..626b3093 100644
--- a/tools/designer/plugins/glade/glade2ui.cpp
+++ b/tools/designer/plugins/glade/glade2ui.cpp
@@ -36,14 +36,14 @@
 
 #include "glade2ui.h"
 
-#include <qapplication.h>
-#include <qfile.h>
-#include <qimage.h>
-#include <qprogressdialog.h>
-#include <qmessagebox.h>
-#include <qrect.h>
-#include <qregexp.h>
-#include <qsizepolicy.h>
+#include <ntqapplication.h>
+#include <ntqfile.h>
+#include <ntqimage.h>
+#include <ntqprogressdialog.h>
+#include <ntqmessagebox.h>
+#include <ntqrect.h>
+#include <ntqregexp.h>
+#include <ntqsizepolicy.h>
 
 #include <ctype.h>
 
diff --git a/tools/designer/plugins/glade/glade2ui.h b/tools/designer/plugins/glade/glade2ui.h
index 87d4d322..c0caf428 100644
--- a/tools/designer/plugins/glade/glade2ui.h
+++ b/tools/designer/plugins/glade/glade2ui.h
@@ -35,10 +35,10 @@
 #ifndef GLADE2UI_H
 #define GLADE2UI_H
 
-#include <qdom.h>
-#include <qmap.h>
-#include <qstring.h>
-#include <qvariant.h>
+#include <ntqdom.h>
+#include <ntqmap.h>
+#include <ntqstring.h>
+#include <ntqvariant.h>
 
 typedef TQMap<TQString, TQString> AttributeMap;
 
diff --git a/tools/designer/plugins/glade/main.cpp b/tools/designer/plugins/glade/main.cpp
index 06f7942e..1913fd36 100644
--- a/tools/designer/plugins/glade/main.cpp
+++ b/tools/designer/plugins/glade/main.cpp
@@ -33,7 +33,7 @@
 **********************************************************************/
 
 #include <filterinterface.h>
-#include <qapplication.h>
+#include <ntqapplication.h>
 
 #include "glade2ui.h"
 
diff --git a/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp b/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp
index 5e84d89b..a5a46fe7 100644
--- a/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp
+++ b/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp
@@ -33,9 +33,9 @@
 **********************************************************************/
 
 #include "kdevdlg2ui.h"
-#include <qdir.h>
-#include <qstring.h>
-#include <qptrstack.h>
+#include <ntqdir.h>
+#include <ntqstring.h>
+#include <ntqptrstack.h>
 
 /// some little helpers ///
 
diff --git a/tools/designer/plugins/kdevdlg/kdevdlg2ui.h b/tools/designer/plugins/kdevdlg/kdevdlg2ui.h
index 1861479c..5f2b6d3b 100644
--- a/tools/designer/plugins/kdevdlg/kdevdlg2ui.h
+++ b/tools/designer/plugins/kdevdlg/kdevdlg2ui.h
@@ -35,9 +35,9 @@
 #ifndef KDEVDLG2UI_H
 #define KDEVDLG2UI_H
 
-#include <qtextstream.h>
-#include <qfile.h>
-#include <qstringlist.h>
+#include <ntqtextstream.h>
+#include <ntqfile.h>
+#include <ntqstringlist.h>
 
 class KDEVDLG2UI
 {
diff --git a/tools/designer/plugins/kdevdlg/main.cpp b/tools/designer/plugins/kdevdlg/main.cpp
index a80db423..1e7c3466 100644
--- a/tools/designer/plugins/kdevdlg/main.cpp
+++ b/tools/designer/plugins/kdevdlg/main.cpp
@@ -34,9 +34,9 @@
 
 #include <filterinterface.h>
 
-#include <qapplication.h>
-#include <qstring.h>
-#include <qdir.h>
+#include <ntqapplication.h>
+#include <ntqstring.h>
+#include <ntqdir.h>
 
 #include "kdevdlg2ui.h"
 
diff --git a/tools/designer/plugins/rc/main.cpp b/tools/designer/plugins/rc/main.cpp
index 30b3253c..7d899743 100644
--- a/tools/designer/plugins/rc/main.cpp
+++ b/tools/designer/plugins/rc/main.cpp
@@ -34,7 +34,7 @@
 
 #include <filterinterface.h>
 
-#include <qapplication.h>
+#include <ntqapplication.h>
 
 #include "rc2ui.h"
 
diff --git a/tools/designer/plugins/rc/rc2ui.cpp b/tools/designer/plugins/rc/rc2ui.cpp
index 28b2ffc8..f88f9d43 100644
--- a/tools/designer/plugins/rc/rc2ui.cpp
+++ b/tools/designer/plugins/rc/rc2ui.cpp
@@ -33,7 +33,7 @@
 **********************************************************************/
 
 #include "rc2ui.h"
-#include <qdir.h>
+#include <ntqdir.h>
 
 /// some little helpers ///
 
@@ -845,8 +845,8 @@ bool RC2UI::makeStringTable()
 	*out << "#ifndef STRINGTABLE_H" << endl;
 	*out << "#define STRINGTABLE_H" << endl;
 	*out << endl;
-	*out << "#include <qstring.h>" << endl;
-	*out << "#include <qobject.h>" << endl;
+	*out << "#include <ntqstring.h>" << endl;
+	*out << "#include <ntqobject.h>" << endl;
 	*out << endl;
 
 	TQString ID;
diff --git a/tools/designer/plugins/rc/rc2ui.h b/tools/designer/plugins/rc/rc2ui.h
index cbac8ef0..68829211 100644
--- a/tools/designer/plugins/rc/rc2ui.h
+++ b/tools/designer/plugins/rc/rc2ui.h
@@ -35,9 +35,9 @@
 #ifndef RC2UI_H
 #define RC2UI_H
 
-#include <qtextstream.h>
-#include <qfile.h>
-#include <qstringlist.h>
+#include <ntqtextstream.h>
+#include <ntqfile.h>
+#include <ntqstringlist.h>
 
 class RC2UI
 {
diff --git a/tools/designer/plugins/wizards/main.cpp b/tools/designer/plugins/wizards/main.cpp
index 55ba9c7a..b3400acc 100644
--- a/tools/designer/plugins/wizards/main.cpp
+++ b/tools/designer/plugins/wizards/main.cpp
@@ -32,14 +32,14 @@
 **********************************************************************/
 
 #include <designerinterface.h>
-#include <qfeatures.h>
-#include <qwidget.h>
+#include <ntqfeatures.h>
+#include <ntqwidget.h>
 #include <templatewizardiface.h>
 #ifndef QT_NO_SQL
 #include "sqlformwizardimpl.h"
 #endif
 #include "mainwindowwizard.h"
-#include <qapplication.h>
+#include <ntqapplication.h>
 
 class StandardTemplateWizardInterface : public TemplateWizardInterface, public TQLibraryInterface
 {
diff --git a/tools/designer/plugins/wizards/mainwindowwizard.ui b/tools/designer/plugins/wizards/mainwindowwizard.ui
index 9e45f36d..2382b5f1 100644
--- a/tools/designer/plugins/wizards/mainwindowwizard.ui
+++ b/tools/designer/plugins/wizards/mainwindowwizard.ui
@@ -33,10 +33,10 @@
 **
 *********************************************************************</comment>
 <include location="global" impldecl="in implementation">designerinterface.h</include>
-<include location="global" impldecl="in implementation">qiconset.h</include>
-<include location="global" impldecl="in implementation">qaction.h</include>
-<include location="global" impldecl="in implementation">qpixmap.h</include>
-<include location="global" impldecl="in implementation">qdict.h</include>
+<include location="global" impldecl="in implementation">ntqiconset.h</include>
+<include location="global" impldecl="in implementation">ntqaction.h</include>
+<include location="global" impldecl="in implementation">ntqpixmap.h</include>
+<include location="global" impldecl="in implementation">ntqdict.h</include>
 <include location="local" implDecl="in declaration">mainwindowwizard.ui.h</include>
 <forward>struct DesignerFormWindow;</forward>
 <forward>struct DesignerInterface;</forward>
diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
index 627abd5e..580780de 100644
--- a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
+++ b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
@@ -33,30 +33,30 @@
 
 #include "sqlformwizardimpl.h"
 
-#include <qlistbox.h>
-#include <qwidget.h>
-#include <qcheckbox.h>
-#include <qlineedit.h>
-
-#include <qlabel.h>
-#include <qgroupbox.h>
-#include <qlayout.h>
-#include <qregexp.h>
-#include <qpushbutton.h>
-#include <qmultilineedit.h>
-#include <qlistview.h>
-#include <qfeatures.h>
-#include <qradiobutton.h>
-#include <qspinbox.h>
+#include <ntqlistbox.h>
+#include <ntqwidget.h>
+#include <ntqcheckbox.h>
+#include <ntqlineedit.h>
+
+#include <ntqlabel.h>
+#include <ntqgroupbox.h>
+#include <ntqlayout.h>
+#include <ntqregexp.h>
+#include <ntqpushbutton.h>
+#include <ntqmultilineedit.h>
+#include <ntqlistview.h>
+#include <ntqfeatures.h>
+#include <ntqradiobutton.h>
+#include <ntqspinbox.h>
 #include <limits.h>
 
 #ifndef QT_NO_SQL
-#include <qdatatable.h>
-#include <qdatabrowser.h>
-#include <qdataview.h>
-#include <qsqleditorfactory.h>
-#include <qsqlindex.h>
-#include <qsqlcursor.h>
+#include <ntqdatatable.h>
+#include <ntqdatabrowser.h>
+#include <ntqdataview.h>
+#include <ntqsqleditorfactory.h>
+#include <ntqsqlindex.h>
+#include <ntqsqlcursor.h>
 #endif
 
 SqlFormWizard::SqlFormWizard( TQUnknownInterface *aIface, TQWidget *w,
diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.h b/tools/designer/plugins/wizards/sqlformwizardimpl.h
index 815d186f..be3602d7 100644
--- a/tools/designer/plugins/wizards/sqlformwizardimpl.h
+++ b/tools/designer/plugins/wizards/sqlformwizardimpl.h
@@ -37,7 +37,7 @@
 #include "sqlformwizard.h"
 #include <templatewizardiface.h>
 #include <designerinterface.h>
-#include <qvaluelist.h>
+#include <ntqvaluelist.h>
 
 class SqlFormWizard : public SqlFormWizardBase
 {
diff --git a/tools/designer/shared/domtool.cpp b/tools/designer/shared/domtool.cpp
index 78111803..4baf1941 100644
--- a/tools/designer/shared/domtool.cpp
+++ b/tools/designer/shared/domtool.cpp
@@ -33,14 +33,14 @@
 
 #include "domtool.h"
 
-#include <qsizepolicy.h>
-#include <qcolor.h>
-#include <qcursor.h>
-#include <qdatetime.h>
-#include <qrect.h>
-#include <qsize.h>
-#include <qfont.h>
-#include <qdom.h>
+#include <ntqsizepolicy.h>
+#include <ntqcolor.h>
+#include <ntqcursor.h>
+#include <ntqdatetime.h>
+#include <ntqrect.h>
+#include <ntqsize.h>
+#include <ntqfont.h>
+#include <ntqdom.h>
 
 /*!
   \class DomTool domtool.h
diff --git a/tools/designer/shared/domtool.h b/tools/designer/shared/domtool.h
index e8f38b3f..f53e205f 100644
--- a/tools/designer/shared/domtool.h
+++ b/tools/designer/shared/domtool.h
@@ -34,8 +34,8 @@
 #ifndef DOMTOOL_H
 #define DOMTOOL_H
 
-#include <qvariant.h>
-#include <qnamespace.h>
+#include <ntqvariant.h>
+#include <ntqnamespace.h>
 
 class TQDomElement;
 class TQDomDocument;
diff --git a/tools/designer/shared/globaldefs.h b/tools/designer/shared/globaldefs.h
index bcf7b118..4f4c2cb2 100644
--- a/tools/designer/shared/globaldefs.h
+++ b/tools/designer/shared/globaldefs.h
@@ -34,8 +34,8 @@
 #ifndef GLOBALDEFS_H
 #define GLOBALDEFS_H
 
-#include <qcolor.h>
-#include <qapplication.h>
+#include <ntqcolor.h>
+#include <ntqapplication.h>
 
 #define BOXLAYOUT_DEFAULT_MARGIN 11
 #define BOXLAYOUT_DEFAULT_SPACING 6
diff --git a/tools/designer/shared/parser.cpp b/tools/designer/shared/parser.cpp
index 21b93d6b..f0624d7d 100644
--- a/tools/designer/shared/parser.cpp
+++ b/tools/designer/shared/parser.cpp
@@ -32,8 +32,8 @@
 **********************************************************************/
 
 #include "parser.h"
-#include <qobject.h>
-#include <qstringlist.h>
+#include <ntqobject.h>
+#include <ntqstringlist.h>
 
 class NormalizeObject : public TQObject
 {
diff --git a/tools/designer/shared/parser.h b/tools/designer/shared/parser.h
index f6d11a8d..01a25356 100644
--- a/tools/designer/shared/parser.h
+++ b/tools/designer/shared/parser.h
@@ -34,7 +34,7 @@
 #ifndef PARSER_H
 #define PARSER_H
 
-#include <qstring.h>
+#include <ntqstring.h>
 
 class Parser
 {
diff --git a/tools/designer/shared/ui2uib.cpp b/tools/designer/shared/ui2uib.cpp
index dabb8d42..23969798 100644
--- a/tools/designer/shared/ui2uib.cpp
+++ b/tools/designer/shared/ui2uib.cpp
@@ -36,15 +36,15 @@
 
 #include <domtool.h>
 
-#include <qcolor.h>
-#include <qcursor.h>
-#include <qdatetime.h>
-#include <qdom.h>
-#include <qfile.h>
-#include <qfont.h>
-#include <qobject.h>
-#include <qrect.h>
-#include <qsizepolicy.h>
+#include <ntqcolor.h>
+#include <ntqcursor.h>
+#include <ntqdatetime.h>
+#include <ntqdom.h>
+#include <ntqfile.h>
+#include <ntqfont.h>
+#include <ntqobject.h>
+#include <ntqrect.h>
+#include <ntqsizepolicy.h>
 
 /*
     The .uib file format is the binary counterpart of the .ui file
diff --git a/tools/designer/shared/uib.h b/tools/designer/shared/uib.h
index d8a73dbd..d4b09add 100644
--- a/tools/designer/shared/uib.h
+++ b/tools/designer/shared/uib.h
@@ -34,7 +34,7 @@
 #ifndef UIB_H
 #define UIB_H
 
-#include <qdatastream.h>
+#include <ntqdatastream.h>
 
 const Q_UINT32 UibMagic = 0xb77c61d8;
 
diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp
index 98529b88..45e898ad 100644
--- a/tools/designer/shared/widgetdatabase.cpp
+++ b/tools/designer/shared/widgetdatabase.cpp
@@ -34,15 +34,15 @@
 #include "widgetdatabase.h"
 #include "../interfaces/widgetinterface.h"
 
-#include <qapplication.h>
+#include <ntqapplication.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <qstrlist.h>
-#include <qdict.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qcleanuphandler.h>
-#include <qfeatures.h>
+#include <ntqstrlist.h>
+#include <ntqdict.h>
+#include <ntqfile.h>
+#include <ntqtextstream.h>
+#include <ntqcleanuphandler.h>
+#include <ntqfeatures.h>
 
 #include <stdlib.h>
 
@@ -263,7 +263,7 @@ void WidgetDatabase::setupDataBase( int id )
 #if !defined(QT_NO_SQL)
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_datatable.png";
-    r->includeFile = "qdatatable.h";
+    r->includeFile = "ntqdatatable.h";
     r->name = "TQDataTable";
     r->group = widgetGroup( "Database" );
     r->toolTip = "Data Table";
@@ -294,7 +294,7 @@ void WidgetDatabase::setupDataBase( int id )
     r->name = "TQDateEdit";
     r->group = widgetGroup( "Input" );
     r->toolTip = "Date Edit";
-    r->includeFile = "qdatetimeedit.h";
+    r->includeFile = "ntqdatetimeedit.h";
 
     append( r );
 
@@ -303,7 +303,7 @@ void WidgetDatabase::setupDataBase( int id )
     r->name = "TQTimeEdit";
     r->group = widgetGroup( "Input" );
     r->toolTip = "Time Edit";
-    r->includeFile = "qdatetimeedit.h";
+    r->includeFile = "ntqdatetimeedit.h";
 
     append( r );
 
@@ -312,7 +312,7 @@ void WidgetDatabase::setupDataBase( int id )
     r->name = "TQDateTimeEdit";
     r->group = widgetGroup( "Input" );
     r->toolTip = "Date-Time Edit";
-    r->includeFile = "qdatetimeedit.h";
+    r->includeFile = "ntqdatetimeedit.h";
 
     append( r );
 
@@ -406,7 +406,7 @@ void WidgetDatabase::setupDataBase( int id )
     r->name = "Line";
     r->group = widgetGroup( "Display" );
     r->toolTip = "Line";
-    r->includeFile = "qframe.h";
+    r->includeFile = "ntqframe.h";
     r->whatsThis = "The Line widget provides horizontal and vertical lines.";
 
     append( r );
@@ -483,7 +483,7 @@ void WidgetDatabase::setupDataBase( int id )
     r = new WidgetDatabaseRecord;
     r->name = "TQSplitter";
     r->group = widgetGroup( "Temp" );
-    r->includeFile = "qsplitter.h";
+    r->includeFile = "ntqsplitter.h";
     r->isContainer = TRUE;
 
     append( r );
@@ -515,7 +515,7 @@ void WidgetDatabase::setupDataBase( int id )
     r = new WidgetDatabaseRecord;
     r->iconSet = "";
     r->name = "TQMainWindow";
-    r->includeFile = "qmainwindow.h";
+    r->includeFile = "ntqmainwindow.h";
     r->group = widgetGroup( "Temp" );
     r->isContainer = TRUE;
 
@@ -524,7 +524,7 @@ void WidgetDatabase::setupDataBase( int id )
     r = new WidgetDatabaseRecord;
     r->iconSet = "";
     r->name = "TQDesignerAction";
-    r->includeFile = "qaction.h";
+    r->includeFile = "ntqaction.h";
     r->group = widgetGroup( "Temp" );
     r->isContainer = FALSE;
 
@@ -533,7 +533,7 @@ void WidgetDatabase::setupDataBase( int id )
     r = new WidgetDatabaseRecord;
     r->iconSet = "";
     r->name = "TQDesignerActionGroup";
-    r->includeFile = "qaction.h";
+    r->includeFile = "ntqaction.h";
     r->group = widgetGroup( "Temp" );
     r->isContainer = FALSE;
 
@@ -542,7 +542,7 @@ void WidgetDatabase::setupDataBase( int id )
     r = new WidgetDatabaseRecord;
     r->iconSet = "";
     r->name = "TQScrollView";
-    r->includeFile = "qscrollview.h";
+    r->includeFile = "ntqscrollview.h";
     r->group = widgetGroup( "Temp" );
     r->isContainer = TRUE;
 
@@ -552,7 +552,7 @@ void WidgetDatabase::setupDataBase( int id )
     r = new WidgetDatabaseRecord;
     r->iconSet = "";
     r->name = "TQDataBrowser";
-    r->includeFile = "qdatabrowser.h";
+    r->includeFile = "ntqdatabrowser.h";
     r->group = widgetGroup( "Database" );
     r->toolTip = "Data Browser";
     r->iconSet = "designer_databrowser.png";
@@ -563,7 +563,7 @@ void WidgetDatabase::setupDataBase( int id )
     r = new WidgetDatabaseRecord;
     r->iconSet = "";
     r->name = "TQDataView";
-    r->includeFile = "qdataview.h";
+    r->includeFile = "ntqdataview.h";
     r->group = widgetGroup( "Database" );
     r->toolTip = "Data View";
     r->iconSet = "designer_dataview.png";
diff --git a/tools/designer/shared/widgetdatabase.h b/tools/designer/shared/widgetdatabase.h
index c77288c7..973c699c 100644
--- a/tools/designer/shared/widgetdatabase.h
+++ b/tools/designer/shared/widgetdatabase.h
@@ -34,8 +34,8 @@
 #ifndef WIDGETDATABASE_H
 #define WIDGETDATABASE_H
 
-#include <qiconset.h>
-#include <qstring.h>
+#include <ntqiconset.h>
+#include <ntqstring.h>
 #include "../interfaces/widgetinterface.h" // up here for GCC 2.7.* compatibility
 #include <private/qpluginmanager_p.h>
 
diff --git a/tools/designer/tools/conv2ui/main.cpp b/tools/designer/tools/conv2ui/main.cpp
index e9265201..df26872f 100644
--- a/tools/designer/tools/conv2ui/main.cpp
+++ b/tools/designer/tools/conv2ui/main.cpp
@@ -31,13 +31,13 @@
 **
 **********************************************************************/
 
-#include <qapplication.h>
+#include <ntqapplication.h>
 #include <private/qpluginmanager_p.h>
-#include <qstringlist.h>
-#include <qdir.h>
+#include <ntqstringlist.h>
+#include <ntqdir.h>
 #include <stdio.h>
 #include "filterinterface.h"
-#include <qfileinfo.h>
+#include <ntqfileinfo.h>
 
 class Conv2ui {
 public:
diff --git a/tools/designer/tools/createcw/main.cpp b/tools/designer/tools/createcw/main.cpp
index 1ab4f53e..50f8574d 100644
--- a/tools/designer/tools/createcw/main.cpp
+++ b/tools/designer/tools/createcw/main.cpp
@@ -31,12 +31,12 @@
 **
 **********************************************************************/
 
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qvaluelist.h>
-#include <qstrlist.h>
-#include <qmetaobject.h>
-#include <qapplication.h>
+#include <ntqfile.h>
+#include <ntqtextstream.h>
+#include <ntqvaluelist.h>
+#include <ntqstrlist.h>
+#include <ntqmetaobject.h>
+#include <ntqapplication.h>
 
 // STEP1: Include header files of the widgets for which a description
 // should be created here. If you have a widget which is defined in
diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp
index 555b20a8..aa00988e 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 be21ee9e..e185af6c 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 19a4854d..452aad97 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 87dbd3b3..82aabee3 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 d5da48f9..f89b2ffb 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 8faea579..59a9a1d1 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 35d9ed0a..fd616ecd 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
 {
diff --git a/tools/designer/uilib/qwidgetfactory.h b/tools/designer/uilib/ntqwidgetfactory.h
index bd39623e..4213199c 100644
--- a/tools/designer/uilib/qwidgetfactory.h
+++ b/tools/designer/uilib/ntqwidgetfactory.h
@@ -35,13 +35,13 @@
 #define TQWIDGETFACTORY_H
 
 #ifndef QT_H
-#include <qstring.h>
-#include <qptrlist.h>
-#include <qimage.h>
-#include <qpixmap.h>
-#include <qvaluelist.h>
-#include <qmap.h>
-#include <qaction.h>
+#include <ntqstring.h>
+#include <ntqptrlist.h>
+#include <ntqimage.h>
+#include <ntqpixmap.h>
+#include <ntqvaluelist.h>
+#include <ntqmap.h>
+#include <ntqaction.h>
 #endif // QT_H
 
 class TQDomDocument;
diff --git a/tools/designer/uilib/qwidgetfactory.cpp b/tools/designer/uilib/qwidgetfactory.cpp
index ef143d46..269f6c35 100644
--- a/tools/designer/uilib/qwidgetfactory.cpp
+++ b/tools/designer/uilib/qwidgetfactory.cpp
@@ -31,77 +31,77 @@
 **
 **********************************************************************/
 
-#include "qwidgetfactory.h"
+#include "ntqwidgetfactory.h"
 
 #include "../interfaces/languageinterface.h"
 #include "../interfaces/widgetinterface.h"
 
-#include <qfeatures.h>
+#include <ntqfeatures.h>
 #include "../designer/database2.h"
-#include <qdom.h>
-#include <qdir.h>
-#include <qlayout.h>
-#include <qmetaobject.h>
+#include <ntqdom.h>
+#include <ntqdir.h>
+#include <ntqlayout.h>
+#include <ntqmetaobject.h>
 #include <domtool.h>
 #include <uib.h>
-#include <qapplication.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qobjectlist.h>
+#include <ntqapplication.h>
+#include <ntqtooltip.h>
+#include <ntqwhatsthis.h>
+#include <ntqobjectlist.h>
 #include <private/qpluginmanager_p.h>
-#include <qmime.h>
-#include <qdragobject.h>
+#include <ntqmime.h>
+#include <ntqdragobject.h>
 
 #ifndef QT_NO_SQL
-#include <qsqlrecord.h>
-#include <qsqldatabase.h>
-#include <qdatatable.h>
+#include <ntqsqlrecord.h>
+#include <ntqsqldatabase.h>
+#include <ntqdatatable.h>
 #endif
 
 // include all TQt widgets we support
-#include <qpushbutton.h>
-#include <qtoolbutton.h>
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qgroupbox.h>
-#include <qbuttongroup.h>
-#include <qiconview.h>
-#include <qheader.h>
+#include <ntqpushbutton.h>
+#include <ntqtoolbutton.h>
+#include <ntqcheckbox.h>
+#include <ntqradiobutton.h>
+#include <ntqgroupbox.h>
+#include <ntqbuttongroup.h>
+#include <ntqiconview.h>
+#include <ntqheader.h>
 #ifndef QT_NO_TABLE
-#include <qtable.h>
+#include <ntqtable.h>
 #endif
-#include <qlistbox.h>
-#include <qlistview.h>
-#include <qlineedit.h>
-#include <qspinbox.h>
-#include <qmultilineedit.h>
-#include <qlabel.h>
-#include <qwidget.h>
-#include <qtabwidget.h>
-#include <qcombobox.h>
-#include <qdialog.h>
-#include <qwizard.h>
-#include <qlcdnumber.h>
-#include <qprogressbar.h>
-#include <qtextview.h>
-#include <qtextbrowser.h>
-#include <qdial.h>
-#include <qslider.h>
-#include <qframe.h>
-#include <qwidgetstack.h>
-#include <qtoolbox.h>
-#include <qtextedit.h>
-#include <qscrollbar.h>
-#include <qmainwindow.h>
-#include <qsplitter.h>
-#include <qaction.h>
-#include <qpopupmenu.h>
-#include <qmenubar.h>
-#include <qpopupmenu.h>
-#include <qdatetimeedit.h>
-#include <qvbox.h>
-#include <qhbox.h>
-#include <qgrid.h>
+#include <ntqlistbox.h>
+#include <ntqlistview.h>
+#include <ntqlineedit.h>
+#include <ntqspinbox.h>
+#include <ntqmultilineedit.h>
+#include <ntqlabel.h>
+#include <ntqwidget.h>
+#include <ntqtabwidget.h>
+#include <ntqcombobox.h>
+#include <ntqdialog.h>
+#include <ntqwizard.h>
+#include <ntqlcdnumber.h>
+#include <ntqprogressbar.h>
+#include <ntqtextview.h>
+#include <ntqtextbrowser.h>
+#include <ntqdial.h>
+#include <ntqslider.h>
+#include <ntqframe.h>
+#include <ntqwidgetstack.h>
+#include <ntqtoolbox.h>
+#include <ntqtextedit.h>
+#include <ntqscrollbar.h>
+#include <ntqmainwindow.h>
+#include <ntqsplitter.h>
+#include <ntqaction.h>
+#include <ntqpopupmenu.h>
+#include <ntqmenubar.h>
+#include <ntqpopupmenu.h>
+#include <ntqdatetimeedit.h>
+#include <ntqvbox.h>
+#include <ntqhbox.h>
+#include <ntqgrid.h>
 
 #include <stdlib.h>
 
diff --git a/tools/designer/uilib/test/main.cpp b/tools/designer/uilib/test/main.cpp
index 42981ff0..1a8c14a0 100644
--- a/tools/designer/uilib/test/main.cpp
+++ b/tools/designer/uilib/test/main.cpp
@@ -31,8 +31,8 @@
 **
 **********************************************************************/
 
-#include <qapplication.h>
-#include "../qwidgetfactory.h"
+#include <ntqapplication.h>
+#include "../ntqwidgetfactory.h"
 
 int main( int argc, char ** argv )
 {
diff --git a/tools/linguist/linguist/finddialog.cpp b/tools/linguist/linguist/finddialog.cpp
index c4d70ec8..c3eee1f6 100644
--- a/tools/linguist/linguist/finddialog.cpp
+++ b/tools/linguist/linguist/finddialog.cpp
@@ -39,12 +39,12 @@
 
 #include "finddialog.h"
 
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qwhatsthis.h>
+#include <ntqcheckbox.h>
+#include <ntqlabel.h>
+#include <ntqlayout.h>
+#include <ntqlineedit.h>
+#include <ntqpushbutton.h>
+#include <ntqwhatsthis.h>
 
 FindDialog::FindDialog( bool replace, TQWidget *parent, const char *name,
 			bool modal )
diff --git a/tools/linguist/linguist/finddialog.h b/tools/linguist/linguist/finddialog.h
index 31e79fff..43c7b589 100644
--- a/tools/linguist/linguist/finddialog.h
+++ b/tools/linguist/linguist/finddialog.h
@@ -34,7 +34,7 @@
 #ifndef FINDDIALOG_H
 #define FINDDIALOG_H
 
-#include <qdialog.h>
+#include <ntqdialog.h>
 
 class TQCheckBox;
 class TQLineEdit;
diff --git a/tools/linguist/linguist/listviews.cpp b/tools/linguist/linguist/listviews.cpp
index 30fc8f0f..4acfb505 100644
--- a/tools/linguist/linguist/listviews.cpp
+++ b/tools/linguist/linguist/listviews.cpp
@@ -33,7 +33,7 @@
 
 #include "listviews.h"
 
-#include <qpainter.h>
+#include <ntqpainter.h>
 
 static const int Text0MaxLen = 150;
 static const int Text1MaxLen = 150;
diff --git a/tools/linguist/linguist/listviews.h b/tools/linguist/linguist/listviews.h
index a90b87f5..62bc4294 100644
--- a/tools/linguist/linguist/listviews.h
+++ b/tools/linguist/linguist/listviews.h
@@ -36,10 +36,10 @@
 
 #include "msgedit.h"
 
-#include <qstring.h>
-#include <qptrlist.h>
-#include <qregexp.h>
-#include <qlistview.h>
+#include <ntqstring.h>
+#include <ntqptrlist.h>
+#include <ntqregexp.h>
+#include <ntqlistview.h>
 
 class LVI : public TQListViewItem
 {
diff --git a/tools/linguist/linguist/main.cpp b/tools/linguist/linguist/main.cpp
index 240b3192..92704776 100644
--- a/tools/linguist/linguist/main.cpp
+++ b/tools/linguist/linguist/main.cpp
@@ -33,14 +33,14 @@
 
 #include "trwindow.h"
 
-#include <qapplication.h>
-#include <qlabel.h>
-#include <qpixmap.h>
-#include <qtimer.h>
-#include <qtextcodec.h>
-#include <qtranslator.h>
-#include <qsettings.h>
-#include <qsplashscreen.h>
+#include <ntqapplication.h>
+#include <ntqlabel.h>
+#include <ntqpixmap.h>
+#include <ntqtimer.h>
+#include <ntqtextcodec.h>
+#include <ntqtranslator.h>
+#include <ntqsettings.h>
+#include <ntqsplashscreen.h>
 
 int main( int argc, char **argv )
 {
diff --git a/tools/linguist/linguist/msgedit.cpp b/tools/linguist/linguist/msgedit.cpp
index c13ccb60..21d54af8 100644
--- a/tools/linguist/linguist/msgedit.cpp
+++ b/tools/linguist/linguist/msgedit.cpp
@@ -42,26 +42,26 @@
 #include "phraselv.h"
 #include "simtexth.h"
 
-#include <qapplication.h>
-#include <qcheckbox.h>
-#include <qclipboard.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qtextedit.h>
-#include <qpalette.h>
-#include <qpushbutton.h>
-#include <qstring.h>
-#include <qtextview.h>
-#include <qwhatsthis.h>
-#include <qvbox.h>
-#include <qmainwindow.h>
-#include <qheader.h>
-#include <qregexp.h>
-#include <qdockarea.h>
-#include <qdockwindow.h>
-#include <qscrollview.h>
-#include <qfont.h>
-#include <qaccel.h>
+#include <ntqapplication.h>
+#include <ntqcheckbox.h>
+#include <ntqclipboard.h>
+#include <ntqlabel.h>
+#include <ntqlayout.h>
+#include <ntqtextedit.h>
+#include <ntqpalette.h>
+#include <ntqpushbutton.h>
+#include <ntqstring.h>
+#include <ntqtextview.h>
+#include <ntqwhatsthis.h>
+#include <ntqvbox.h>
+#include <ntqmainwindow.h>
+#include <ntqheader.h>
+#include <ntqregexp.h>
+#include <ntqdockarea.h>
+#include <ntqdockwindow.h>
+#include <ntqscrollview.h>
+#include <ntqfont.h>
+#include <ntqaccel.h>
 #include <private/qrichtext_p.h>
 
 static const int MaxCandidates = 5;
diff --git a/tools/linguist/linguist/msgedit.h b/tools/linguist/linguist/msgedit.h
index 1eb66b11..a85bc1dd 100644
--- a/tools/linguist/linguist/msgedit.h
+++ b/tools/linguist/linguist/msgedit.h
@@ -39,14 +39,14 @@
 
 #include <metatranslator.h>
 
-#include <qsplitter.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qscrollview.h>
-#include <qpixmap.h>
-#include <qbitmap.h>
-#include <qtooltip.h>
+#include <ntqsplitter.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqvaluelist.h>
+#include <ntqscrollview.h>
+#include <ntqpixmap.h>
+#include <ntqbitmap.h>
+#include <ntqtooltip.h>
 
 class TQAccel;
 class TQDockArea;
diff --git a/tools/linguist/linguist/phrase.cpp b/tools/linguist/linguist/phrase.cpp
index fd296128..945d4150 100644
--- a/tools/linguist/linguist/phrase.cpp
+++ b/tools/linguist/linguist/phrase.cpp
@@ -33,13 +33,13 @@
 
 #include "phrase.h"
 
-#include <qapplication.h>
-#include <qcstring.h>
-#include <qfile.h>
-#include <qmessagebox.h>
-#include <qregexp.h>
-#include <qtextstream.h>
-#include <qxml.h>
+#include <ntqapplication.h>
+#include <ntqcstring.h>
+#include <ntqfile.h>
+#include <ntqmessagebox.h>
+#include <ntqregexp.h>
+#include <ntqtextstream.h>
+#include <ntqxml.h>
 
 static TQString protect( const TQString& str )
 {
diff --git a/tools/linguist/linguist/phrase.h b/tools/linguist/linguist/phrase.h
index 26d9663a..c1dfc499 100644
--- a/tools/linguist/linguist/phrase.h
+++ b/tools/linguist/linguist/phrase.h
@@ -34,8 +34,8 @@
 #ifndef PHRASE_H
 #define PHRASE_H
 
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <ntqstring.h>
+#include <ntqvaluelist.h>
 
 class Phrase
 {
diff --git a/tools/linguist/linguist/phrasebookbox.cpp b/tools/linguist/linguist/phrasebookbox.cpp
index 169be47b..382842dc 100644
--- a/tools/linguist/linguist/phrasebookbox.cpp
+++ b/tools/linguist/linguist/phrasebookbox.cpp
@@ -40,13 +40,13 @@
 #include "phrasebookbox.h"
 #include "phraselv.h"
 
-#include <qapplication.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qmessagebox.h>
-#include <qpushbutton.h>
-#include <qwhatsthis.h>
+#include <ntqapplication.h>
+#include <ntqlabel.h>
+#include <ntqlayout.h>
+#include <ntqlineedit.h>
+#include <ntqmessagebox.h>
+#include <ntqpushbutton.h>
+#include <ntqwhatsthis.h>
 
 PhraseBookBox::PhraseBookBox( const TQString& filename,
 			      const PhraseBook& phraseBook, TQWidget *parent,
diff --git a/tools/linguist/linguist/phrasebookbox.h b/tools/linguist/linguist/phrasebookbox.h
index 873453aa..a48d40c0 100644
--- a/tools/linguist/linguist/phrasebookbox.h
+++ b/tools/linguist/linguist/phrasebookbox.h
@@ -36,8 +36,8 @@
 
 #include "phrase.h"
 
-#include <qdialog.h>
-#include <qvaluelist.h>
+#include <ntqdialog.h>
+#include <ntqvaluelist.h>
 
 class TQLineEdit;
 class TQPushButton;
diff --git a/tools/linguist/linguist/phraselv.cpp b/tools/linguist/linguist/phraselv.cpp
index ff395ad1..92757cd8 100644
--- a/tools/linguist/linguist/phraselv.cpp
+++ b/tools/linguist/linguist/phraselv.cpp
@@ -39,9 +39,9 @@
 
 #include "phraselv.h"
 
-#include <qregexp.h>
-#include <qwhatsthis.h>
-#include <qheader.h>
+#include <ntqregexp.h>
+#include <ntqwhatsthis.h>
+#include <ntqheader.h>
 
 class WhatPhrase : public TQWhatsThis
 {
diff --git a/tools/linguist/linguist/phraselv.h b/tools/linguist/linguist/phraselv.h
index 945216ba..8135b43e 100644
--- a/tools/linguist/linguist/phraselv.h
+++ b/tools/linguist/linguist/phraselv.h
@@ -36,7 +36,7 @@
 
 #include "phrase.h"
 
-#include <qlistview.h>
+#include <ntqlistview.h>
 
 class TQWhatsThis;
 
diff --git a/tools/linguist/linguist/printout.cpp b/tools/linguist/linguist/printout.cpp
index d9af3379..321e8de2 100644
--- a/tools/linguist/linguist/printout.cpp
+++ b/tools/linguist/linguist/printout.cpp
@@ -33,8 +33,8 @@
 
 #include "printout.h"
 
-#include <qprinter.h>
-#include <qfontmetrics.h>
+#include <ntqprinter.h>
+#include <ntqfontmetrics.h>
 
 PrintOut::PrintOut( TQPrinter *printer )
     : pr( printer ), pdmetrics( printer ), nextRule( NoRule ), page( 0 )
diff --git a/tools/linguist/linguist/printout.h b/tools/linguist/linguist/printout.h
index 87e25d06..bba3da6a 100644
--- a/tools/linguist/linguist/printout.h
+++ b/tools/linguist/linguist/printout.h
@@ -34,12 +34,12 @@
 #ifndef PRINTOUT_H
 #define PRINTOUT_H
 
-#include <qfont.h>
-#include <qpaintdevicemetrics.h>
-#include <qpainter.h>
-#include <qrect.h>
-#include <qvaluelist.h>
-#include <qdatetime.h>
+#include <ntqfont.h>
+#include <ntqpaintdevicemetrics.h>
+#include <ntqpainter.h>
+#include <ntqrect.h>
+#include <ntqvaluelist.h>
+#include <ntqdatetime.h>
 
 class TQPrinter;
 class TQFontMetrics;
diff --git a/tools/linguist/linguist/simtexth.cpp b/tools/linguist/linguist/simtexth.cpp
index 70b88a39..931ba137 100644
--- a/tools/linguist/linguist/simtexth.cpp
+++ b/tools/linguist/linguist/simtexth.cpp
@@ -35,12 +35,12 @@
 
 #include <metatranslator.h>
 
-#include <qcstring.h>
-#include <qdict.h>
-#include <qmap.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
+#include <ntqcstring.h>
+#include <ntqdict.h>
+#include <ntqmap.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqvaluelist.h>
 
 #include <string.h>
 
diff --git a/tools/linguist/linguist/simtexth.h b/tools/linguist/linguist/simtexth.h
index 87e0d988..01ae6f48 100644
--- a/tools/linguist/linguist/simtexth.h
+++ b/tools/linguist/linguist/simtexth.h
@@ -34,8 +34,8 @@
 #ifndef SIMTEXTH_H
 #define SIMTEXTH_H
 
-#include <qstring.h>
-#include <qvaluelist.h>
+#include <ntqstring.h>
+#include <ntqvaluelist.h>
 
 class MetaTranslator;
 
diff --git a/tools/linguist/linguist/trwindow.cpp b/tools/linguist/linguist/trwindow.cpp
index ee61453b..e174edc5 100644
--- a/tools/linguist/linguist/trwindow.cpp
+++ b/tools/linguist/linguist/trwindow.cpp
@@ -46,29 +46,29 @@
 #include "phraselv.h"
 #include "statistics.h"
 
-#include <qaccel.h>
-#include <qaction.h>
-#include <qapplication.h>
-#include <qbitmap.h>
-#include <qdict.h>
-#include <qdockarea.h>
-#include <qdockwindow.h>
-#include <qfile.h>
-#include <qfiledialog.h>
-#include <qfileinfo.h>
-#include <qheader.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qmenubar.h>
-#include <qmessagebox.h>
-#include <qpopupmenu.h>
-#include <qregexp.h>
-#include <qsettings.h>
-#include <qstatusbar.h>
-#include <qtoolbar.h>
-#include <qwhatsthis.h>
-#include <qprocess.h>
-#include <qassistantclient.h>
+#include <ntqaccel.h>
+#include <ntqaction.h>
+#include <ntqapplication.h>
+#include <ntqbitmap.h>
+#include <ntqdict.h>
+#include <ntqdockarea.h>
+#include <ntqdockwindow.h>
+#include <ntqfile.h>
+#include <ntqfiledialog.h>
+#include <ntqfileinfo.h>
+#include <ntqheader.h>
+#include <ntqlabel.h>
+#include <ntqlayout.h>
+#include <ntqmenubar.h>
+#include <ntqmessagebox.h>
+#include <ntqpopupmenu.h>
+#include <ntqregexp.h>
+#include <ntqsettings.h>
+#include <ntqstatusbar.h>
+#include <ntqtoolbar.h>
+#include <ntqwhatsthis.h>
+#include <ntqprocess.h>
+#include <ntqassistantclient.h>
 
 #include <stdlib.h>
 
diff --git a/tools/linguist/linguist/trwindow.h b/tools/linguist/linguist/trwindow.h
index ec208855..af20b487 100644
--- a/tools/linguist/linguist/trwindow.h
+++ b/tools/linguist/linguist/trwindow.h
@@ -38,13 +38,13 @@
 
 #include <metatranslator.h>
 
-#include <qmainwindow.h>
-#include <qptrlist.h>
-#include <qdict.h>
-#include <qprinter.h>
-#include <qstringlist.h>
-#include <qpixmap.h>
-#include <qlistview.h>
+#include <ntqmainwindow.h>
+#include <ntqptrlist.h>
+#include <ntqdict.h>
+#include <ntqprinter.h>
+#include <ntqstringlist.h>
+#include <ntqpixmap.h>
+#include <ntqlistview.h>
 
 class TQAction;
 class TQDialog;
diff --git a/tools/linguist/lrelease/main.cpp b/tools/linguist/lrelease/main.cpp
index 91d4dc73..9dc6b07e 100644
--- a/tools/linguist/lrelease/main.cpp
+++ b/tools/linguist/lrelease/main.cpp
@@ -34,13 +34,13 @@
 #include <metatranslator.h>
 #include <proparser.h>
 
-#include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qregexp.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qtextstream.h>
+#include <ntqdir.h>
+#include <ntqfile.h>
+#include <ntqfileinfo.h>
+#include <ntqregexp.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqtextstream.h>
 
 #include <errno.h>
 
diff --git a/tools/linguist/lupdate/fetchtr.cpp b/tools/linguist/lupdate/fetchtr.cpp
index 22967ed3..a557fd51 100644
--- a/tools/linguist/lupdate/fetchtr.cpp
+++ b/tools/linguist/lupdate/fetchtr.cpp
@@ -33,12 +33,12 @@
 
 #include <metatranslator.h>
 
-#include <qfile.h>
-#include <qregexp.h>
-#include <qstring.h>
-#include <qtextstream.h>
-#include <qvaluestack.h>
-#include <qxml.h>
+#include <ntqfile.h>
+#include <ntqregexp.h>
+#include <ntqstring.h>
+#include <ntqtextstream.h>
+#include <ntqvaluestack.h>
+#include <ntqxml.h>
 
 #include <ctype.h>
 #include <errno.h>
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp
index 0e45ebff..7c933afe 100644
--- a/tools/linguist/lupdate/main.cpp
+++ b/tools/linguist/lupdate/main.cpp
@@ -34,12 +34,12 @@
 #include <metatranslator.h>
 #include <proparser.h>
 
-#include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qtextstream.h>
+#include <ntqdir.h>
+#include <ntqfile.h>
+#include <ntqfileinfo.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqtextstream.h>
 
 #include <errno.h>
 #include <string.h>
diff --git a/tools/linguist/lupdate/numberh.cpp b/tools/linguist/lupdate/numberh.cpp
index a0636710..52593b59 100644
--- a/tools/linguist/lupdate/numberh.cpp
+++ b/tools/linguist/lupdate/numberh.cpp
@@ -33,10 +33,10 @@
 
 #include <metatranslator.h>
 
-#include <qmemarray.h>
-#include <qcstring.h>
-#include <qmap.h>
-#include <qstringlist.h>
+#include <ntqmemarray.h>
+#include <ntqcstring.h>
+#include <ntqmap.h>
+#include <ntqstringlist.h>
 
 #include <ctype.h>
 
diff --git a/tools/linguist/lupdate/sametexth.cpp b/tools/linguist/lupdate/sametexth.cpp
index 59542811..d3d9619e 100644
--- a/tools/linguist/lupdate/sametexth.cpp
+++ b/tools/linguist/lupdate/sametexth.cpp
@@ -33,8 +33,8 @@
 
 #include <metatranslator.h>
 
-#include <qcstring.h>
-#include <qmap.h>
+#include <ntqcstring.h>
+#include <ntqmap.h>
 
 typedef TQMap<TQCString, MetaTranslatorMessage> TMM;
 typedef TQValueList<MetaTranslatorMessage> TML;
diff --git a/tools/linguist/qm2ts/main.cpp b/tools/linguist/qm2ts/main.cpp
index 80f90a81..c32c5248 100644
--- a/tools/linguist/qm2ts/main.cpp
+++ b/tools/linguist/qm2ts/main.cpp
@@ -33,9 +33,9 @@
 
 #include <metatranslator.h>
 
-#include <qregexp.h>
-#include <qstring.h>
-#include <qtranslator.h>
+#include <ntqregexp.h>
+#include <ntqstring.h>
+#include <ntqtranslator.h>
 
 typedef TQValueList<TQTranslatorMessage> TML;
 
diff --git a/tools/linguist/shared/metatranslator.cpp b/tools/linguist/shared/metatranslator.cpp
index 643e9518..5da969d8 100644
--- a/tools/linguist/shared/metatranslator.cpp
+++ b/tools/linguist/shared/metatranslator.cpp
@@ -33,13 +33,13 @@
 
 #include "metatranslator.h"
 
-#include <qapplication.h>
-#include <qcstring.h>
-#include <qfile.h>
-#include <qmessagebox.h>
-#include <qtextcodec.h>
-#include <qtextstream.h>
-#include <qxml.h>
+#include <ntqapplication.h>
+#include <ntqcstring.h>
+#include <ntqfile.h>
+#include <ntqmessagebox.h>
+#include <ntqtextcodec.h>
+#include <ntqtextstream.h>
+#include <ntqxml.h>
 
 static bool encodingIsUtf8( const TQXmlAttributes& atts )
 {
diff --git a/tools/linguist/shared/metatranslator.h b/tools/linguist/shared/metatranslator.h
index 0957ecb8..7e0419d2 100644
--- a/tools/linguist/shared/metatranslator.h
+++ b/tools/linguist/shared/metatranslator.h
@@ -34,10 +34,10 @@
 #ifndef METATRANSLATOR_H
 #define METATRANSLATOR_H
 
-#include <qmap.h>
-#include <qstring.h>
-#include <qtranslator.h>
-#include <qvaluelist.h>
+#include <ntqmap.h>
+#include <ntqstring.h>
+#include <ntqtranslator.h>
+#include <ntqvaluelist.h>
 
 class TQTextCodec;
 
diff --git a/tools/linguist/shared/proparser.cpp b/tools/linguist/shared/proparser.cpp
index 6095d48d..be88eb86 100644
--- a/tools/linguist/shared/proparser.cpp
+++ b/tools/linguist/shared/proparser.cpp
@@ -33,12 +33,12 @@
 
 #include "proparser.h"
 
-#include <qdir.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qregexp.h>
-#include <qstringlist.h>
-#include <qtextstream.h>
+#include <ntqdir.h>
+#include <ntqfile.h>
+#include <ntqfileinfo.h>
+#include <ntqregexp.h>
+#include <ntqstringlist.h>
+#include <ntqtextstream.h>
 
 #ifdef Q_OS_UNIX
 #include <unistd.h>
diff --git a/tools/linguist/shared/proparser.h b/tools/linguist/shared/proparser.h
index 3c1ca7c9..a18ccac8 100644
--- a/tools/linguist/shared/proparser.h
+++ b/tools/linguist/shared/proparser.h
@@ -34,8 +34,8 @@
 #ifndef PROPARSER_H
 #define PROPARSER_H
 
-#include <qmap.h>
-#include <qstring.h>
+#include <ntqmap.h>
+#include <ntqstring.h>
 
 TQMap<TQString, TQString> proFileTagMap( const TQString& text );
 
diff --git a/tools/linguist/tutorial/tt1/main.cpp b/tools/linguist/tutorial/tt1/main.cpp
index 2cee6e11..2f38cc15 100644
--- a/tools/linguist/tutorial/tt1/main.cpp
+++ b/tools/linguist/tutorial/tt1/main.cpp
@@ -4,9 +4,9 @@
 **
 ****************************************************************/
 
-#include <qapplication.h>
-#include <qpushbutton.h>
-#include <qtranslator.h>
+#include <ntqapplication.h>
+#include <ntqpushbutton.h>
+#include <ntqtranslator.h>
 
 
 int main( int argc, char **argv )
diff --git a/tools/linguist/tutorial/tt2/arrowpad.cpp b/tools/linguist/tutorial/tt2/arrowpad.cpp
index 8e23d931..d96f8f59 100644
--- a/tools/linguist/tutorial/tt2/arrowpad.cpp
+++ b/tools/linguist/tutorial/tt2/arrowpad.cpp
@@ -6,7 +6,7 @@
 
 #include "arrowpad.h"
 
-#include <qpushbutton.h>
+#include <ntqpushbutton.h>
 
 ArrowPad::ArrowPad( TQWidget *parent, const char *name )
     : TQGrid( 3, Horizontal, parent, name )
diff --git a/tools/linguist/tutorial/tt2/arrowpad.h b/tools/linguist/tutorial/tt2/arrowpad.h
index 06e11fa4..c973523b 100644
--- a/tools/linguist/tutorial/tt2/arrowpad.h
+++ b/tools/linguist/tutorial/tt2/arrowpad.h
@@ -7,7 +7,7 @@
 #ifndef ARROWPAD_H
 #define ARROWPAD_H
 
-#include <qgrid.h>
+#include <ntqgrid.h>
 
 class ArrowPad : public TQGrid
 {
diff --git a/tools/linguist/tutorial/tt2/main.cpp b/tools/linguist/tutorial/tt2/main.cpp
index 132d4c49..283afe5a 100644
--- a/tools/linguist/tutorial/tt2/main.cpp
+++ b/tools/linguist/tutorial/tt2/main.cpp
@@ -6,10 +6,10 @@
 
 #include "mainwindow.h"
 
-#include <qapplication.h>
-#include <qstring.h>
-#include <qtextcodec.h>
-#include <qtranslator.h>
+#include <ntqapplication.h>
+#include <ntqstring.h>
+#include <ntqtextcodec.h>
+#include <ntqtranslator.h>
 
 int main( int argc, char **argv )
 {
diff --git a/tools/linguist/tutorial/tt2/mainwindow.cpp b/tools/linguist/tutorial/tt2/mainwindow.cpp
index fd381c28..6a9808de 100644
--- a/tools/linguist/tutorial/tt2/mainwindow.cpp
+++ b/tools/linguist/tutorial/tt2/mainwindow.cpp
@@ -7,10 +7,10 @@
 #include "arrowpad.h"
 #include "mainwindow.h"
 
-#include <qaccel.h>
-#include <qapplication.h>
-#include <qmenubar.h>
-#include <qpopupmenu.h>
+#include <ntqaccel.h>
+#include <ntqapplication.h>
+#include <ntqmenubar.h>
+#include <ntqpopupmenu.h>
 
 MainWindow::MainWindow( TQWidget *parent, const char *name )
     : TQMainWindow( parent, name )
diff --git a/tools/linguist/tutorial/tt2/mainwindow.h b/tools/linguist/tutorial/tt2/mainwindow.h
index 0d023bb6..0a190af0 100644
--- a/tools/linguist/tutorial/tt2/mainwindow.h
+++ b/tools/linguist/tutorial/tt2/mainwindow.h
@@ -7,7 +7,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <qmainwindow.h>
+#include <ntqmainwindow.h>
 
 class MainWindow : public TQMainWindow
 {
diff --git a/tools/linguist/tutorial/tt3/main.cpp b/tools/linguist/tutorial/tt3/main.cpp
index 0c2f083c..c6989494 100644
--- a/tools/linguist/tutorial/tt3/main.cpp
+++ b/tools/linguist/tutorial/tt3/main.cpp
@@ -6,10 +6,10 @@
 
 #include "mainwindow.h"
 
-#include <qapplication.h>
-#include <qstring.h>
-#include <qtextcodec.h>
-#include <qtranslator.h>
+#include <ntqapplication.h>
+#include <ntqstring.h>
+#include <ntqtextcodec.h>
+#include <ntqtranslator.h>
 
 int main( int argc, char **argv )
 {
diff --git a/tools/linguist/tutorial/tt3/mainwindow.cpp b/tools/linguist/tutorial/tt3/mainwindow.cpp
index 20edb3fb..86d2e007 100644
--- a/tools/linguist/tutorial/tt3/mainwindow.cpp
+++ b/tools/linguist/tutorial/tt3/mainwindow.cpp
@@ -7,11 +7,11 @@
 #include "mainwindow.h"
 #include "printpanel.h"
 
-#include <qaccel.h>
-#include <qapplication.h>
-#include <qmenubar.h>
-#include <qmessagebox.h>
-#include <qpopupmenu.h>
+#include <ntqaccel.h>
+#include <ntqapplication.h>
+#include <ntqmenubar.h>
+#include <ntqmessagebox.h>
+#include <ntqpopupmenu.h>
 
 MainWindow::MainWindow( TQWidget *parent, const char *name )
     : TQMainWindow( parent, name )
diff --git a/tools/linguist/tutorial/tt3/mainwindow.h b/tools/linguist/tutorial/tt3/mainwindow.h
index dc9ad11e..c0b5812f 100644
--- a/tools/linguist/tutorial/tt3/mainwindow.h
+++ b/tools/linguist/tutorial/tt3/mainwindow.h
@@ -7,7 +7,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <qmainwindow.h>
+#include <ntqmainwindow.h>
 
 class MainWindow : public TQMainWindow
 {
diff --git a/tools/linguist/tutorial/tt3/printpanel.cpp b/tools/linguist/tutorial/tt3/printpanel.cpp
index c377efc2..183a6f5b 100644
--- a/tools/linguist/tutorial/tt3/printpanel.cpp
+++ b/tools/linguist/tutorial/tt3/printpanel.cpp
@@ -6,9 +6,9 @@
 
 #include "printpanel.h"
 
-#include <qlabel.h>
-#include <qradiobutton.h>
-#include <qhbuttongroup.h>
+#include <ntqlabel.h>
+#include <ntqradiobutton.h>
+#include <ntqhbuttongroup.h>
 
 PrintPanel::PrintPanel( TQWidget *parent, const char *name )
     : TQVBox( parent, name )
diff --git a/tools/linguist/tutorial/tt3/printpanel.h b/tools/linguist/tutorial/tt3/printpanel.h
index 8b1f9bc6..565b7b62 100644
--- a/tools/linguist/tutorial/tt3/printpanel.h
+++ b/tools/linguist/tutorial/tt3/printpanel.h
@@ -7,7 +7,7 @@
 #ifndef PRINTPANEL_H
 #define PRINTPANEL_H
 
-#include <qvbox.h>
+#include <ntqvbox.h>
 
 class PrintPanel : public TQVBox
 {
diff --git a/tools/makeqpf/main.cpp b/tools/makeqpf/main.cpp
index b4618319..c3f233d1 100644
--- a/tools/makeqpf/main.cpp
+++ b/tools/makeqpf/main.cpp
@@ -31,18 +31,18 @@
 **
 **********************************************************************/
 
-#include <qapplication.h>
-#include <qtextstream.h>
-#include <qscrollview.h>
-#include <qfile.h>
-#include <qfont.h>
-#include <qvbox.h>
-#include <qlabel.h>
-#include <qstringlist.h>
-#include <qlistview.h>
-#include <qmainwindow.h>
-#include <qmessagebox.h>
-#include <qpainter.h>
+#include <ntqapplication.h>
+#include <ntqtextstream.h>
+#include <ntqscrollview.h>
+#include <ntqfile.h>
+#include <ntqfont.h>
+#include <ntqvbox.h>
+#include <ntqlabel.h>
+#include <ntqstringlist.h>
+#include <ntqlistview.h>
+#include <ntqmainwindow.h>
+#include <ntqmessagebox.h>
+#include <ntqpainter.h>
 #ifdef Q_WS_QWS
 #include <qmemorymanager_qws.h>
 #endif
diff --git a/tools/mergetr/mergetr.cpp b/tools/mergetr/mergetr.cpp
index 4c38d0d6..fa9265b4 100644
--- a/tools/mergetr/mergetr.cpp
+++ b/tools/mergetr/mergetr.cpp
@@ -31,9 +31,9 @@
 **
 **********************************************************************/
 
-#include <qfile.h>
-#include <qbuffer.h>
-#include <qtextstream.h>
+#include <ntqfile.h>
+#include <ntqbuffer.h>
+#include <ntqtextstream.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tools/msg2qm/msg2qm.cpp b/tools/msg2qm/msg2qm.cpp
index d4c7dc6b..49d6302d 100644
--- a/tools/msg2qm/msg2qm.cpp
+++ b/tools/msg2qm/msg2qm.cpp
@@ -32,10 +32,10 @@
 **
 **********************************************************************/
 
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qtextcodec.h>
-#include <qtranslator.h>
+#include <ntqfile.h>
+#include <ntqtextstream.h>
+#include <ntqtextcodec.h>
+#include <ntqtranslator.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -210,7 +210,7 @@ void translate( const TQString& filename, const TQString& qmfile )
 }
 
 
-// workaround for BCC problem, qtranslator.h includes qwindowdefs.h via qobject.h, see NEEDS_QMAIN
+// workaround for BCC problem, ntqtranslator.h includes ntqwindowdefs.h via ntqobject.h, see NEEDS_QMAIN
 #if defined(main)
 #undef main
 #endif
diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp
index a5600113..f0b6772f 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 6e4f1fb0..6d68b97d 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;
diff --git a/tools/qembed/qembed.cpp b/tools/qembed/qembed.cpp
index 80e7956d..80fe1113 100644
--- a/tools/qembed/qembed.cpp
+++ b/tools/qembed/qembed.cpp
@@ -16,15 +16,15 @@
 **
 *****************************************************************************/
 
-#include <qstring.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qptrlist.h>
-#include <qtextstream.h>
-#include <qdatetime.h>
-#include <qimage.h>
-#include <qdict.h>
-#include <qdir.h>
+#include <ntqstring.h>
+#include <ntqfile.h>
+#include <ntqfileinfo.h>
+#include <ntqptrlist.h>
+#include <ntqtextstream.h>
+#include <ntqdatetime.h>
+#include <ntqimage.h>
+#include <ntqdict.h>
+#include <ntqdir.h>
 #include <ctype.h>
 #include <stdlib.h>
 
@@ -96,8 +96,8 @@ int main( int argc, char **argv )
 	TQString arg = (*it);
 	if ( arg == "--images" ) {
 	    if ( !images ) {
-		out << "#include <qimage.h>\n";
-		out << "#include <qdict.h>\n";
+		out << "#include <ntqimage.h>\n";
+		out << "#include <ntqdict.h>\n";
 		images = TRUE;
 	    }
 	} else {
@@ -171,9 +171,9 @@ int main( int argc, char **argv )
     }
 
     if ( list.count() > 0 ) {
-	out << "#include <qcstring.h>\n";
+	out << "#include <ntqcstring.h>\n";
 	if ( !images )
-	    out << "#include <qdict.h>\n";
+	    out << "#include <ntqdict.h>\n";
 
 	out << "static struct Embed {\n"
 	       "    unsigned int size;\n"
diff --git a/tools/qtconfig/colorbutton.cpp b/tools/qtconfig/colorbutton.cpp
index 0a6f1bce..2ed4e238 100644
--- a/tools/qtconfig/colorbutton.cpp
+++ b/tools/qtconfig/colorbutton.cpp
@@ -33,11 +33,11 @@
 
 #include "colorbutton.h"
 
-#include <qapplication.h>
-#include <qcolordialog.h>
-#include <qpainter.h>
-#include <qdragobject.h>
-#include <qstyle.h>
+#include <ntqapplication.h>
+#include <ntqcolordialog.h>
+#include <ntqpainter.h>
+#include <ntqdragobject.h>
+#include <ntqstyle.h>
 
 
 ColorButton::ColorButton(TQWidget *parent, const char *name)
diff --git a/tools/qtconfig/colorbutton.h b/tools/qtconfig/colorbutton.h
index ee922120..504579df 100644
--- a/tools/qtconfig/colorbutton.h
+++ b/tools/qtconfig/colorbutton.h
@@ -34,7 +34,7 @@
 #ifndef COLORBUTTON_H
 #define COLORBUTTON_H
 
-#include <qbutton.h>
+#include <ntqbutton.h>
 
 
 class ColorButton : public TQButton
diff --git a/tools/qtconfig/main.cpp b/tools/qtconfig/main.cpp
index 0f463926..0e82f994 100644
--- a/tools/qtconfig/main.cpp
+++ b/tools/qtconfig/main.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include "mainwindow.h"
-#include <qapplication.h>
+#include <ntqapplication.h>
 
 
 int main(int argc, char **argv)
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index f798d6ed..e3f11366 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -36,24 +36,24 @@
 #include "previewframe.h"
 #include "paletteeditoradvanced.h"
 
-#include <qlabel.h>
-#include <qapplication.h>
-#include <qcombobox.h>
-#include <qstylefactory.h>
-#include <qinputcontextfactory.h>
-#include <qobjectlist.h>
-#include <qfontdatabase.h>
-#include <qlineedit.h>
-#include <qlistbox.h>
-#include <qspinbox.h>
-#include <qcheckbox.h>
-#include <qfiledialog.h>
-#include <qaction.h>
-#include <qstatusbar.h>
-#include <qsettings.h>
-#include <qmessagebox.h>
-#include <qtextview.h>
-#include <qstyle.h>
+#include <ntqlabel.h>
+#include <ntqapplication.h>
+#include <ntqcombobox.h>
+#include <ntqstylefactory.h>
+#include <ntqinputcontextfactory.h>
+#include <ntqobjectlist.h>
+#include <ntqfontdatabase.h>
+#include <ntqlineedit.h>
+#include <ntqlistbox.h>
+#include <ntqspinbox.h>
+#include <ntqcheckbox.h>
+#include <ntqfiledialog.h>
+#include <ntqaction.h>
+#include <ntqstatusbar.h>
+#include <ntqsettings.h>
+#include <ntqmessagebox.h>
+#include <ntqtextview.h>
+#include <ntqstyle.h>
 
 #include <stdlib.h>
 
diff --git a/tools/qtconfig/paletteeditoradvanced.cpp b/tools/qtconfig/paletteeditoradvanced.cpp
index 9bf8e65a..02078bc4 100644
--- a/tools/qtconfig/paletteeditoradvanced.cpp
+++ b/tools/qtconfig/paletteeditoradvanced.cpp
@@ -34,13 +34,13 @@
 #include "paletteeditoradvanced.h"
 #include "colorbutton.h"
 
-#include <qcheckbox.h>
-#include <qcombobox.h>
-#include <qapplication.h>
-#include <qpushbutton.h>
-#include <qlistbox.h>
-#include <qpainter.h>
-#include <qgroupbox.h>
+#include <ntqcheckbox.h>
+#include <ntqcombobox.h>
+#include <ntqapplication.h>
+#include <ntqpushbutton.h>
+#include <ntqlistbox.h>
+#include <ntqpainter.h>
+#include <ntqgroupbox.h>
 
 /*!
     Class used by PaletteEditor for bold combobox items
diff --git a/tools/qtconfig/previewframe.cpp b/tools/qtconfig/previewframe.cpp
index e05f96f0..d608a1b6 100644
--- a/tools/qtconfig/previewframe.cpp
+++ b/tools/qtconfig/previewframe.cpp
@@ -33,8 +33,8 @@
 
 #include "previewframe.h"
 
-#include <qvbox.h>
-#include <qpainter.h>
+#include <ntqvbox.h>
+#include <ntqpainter.h>
 
 PreviewFrame::PreviewFrame( TQWidget *parent, const char *name )
     : TQVBox( parent, name )
diff --git a/tools/qtconfig/previewframe.h b/tools/qtconfig/previewframe.h
index b0c60201..d0ec6eb3 100644
--- a/tools/qtconfig/previewframe.h
+++ b/tools/qtconfig/previewframe.h
@@ -36,8 +36,8 @@
 
 #include "previewwidget.h"
 
-#include <qvbox.h>
-#include <qworkspace.h>
+#include <ntqvbox.h>
+#include <ntqworkspace.h>
 
 class Workspace : public TQWorkspace
 {
diff --git a/tools/qtconfig/previewwidget.cpp b/tools/qtconfig/previewwidget.cpp
index 62552072..1bb32b1d 100644
--- a/tools/qtconfig/previewwidget.cpp
+++ b/tools/qtconfig/previewwidget.cpp
@@ -33,7 +33,7 @@
 
 #include "previewwidget.h"
 
-#include <qobjectlist.h>
+#include <ntqobjectlist.h>
 
 PreviewWidget::PreviewWidget( TQWidget *parent, const char *name )
     : PreviewWidgetBase( parent, name )
diff --git a/tools/qvfb/README b/tools/qvfb/README
index c6270412..3261b475 100644
--- a/tools/qvfb/README
+++ b/tools/qvfb/README
@@ -15,7 +15,7 @@ framebuffer.
 
 To use the virtual framebuffer:
 
-1. Ensure QT_NO_QWS_VFB is not set in qconfig.h (when you configure Qt,
+1. Ensure QT_NO_QWS_VFB is not set in ntqconfig.h (when you configure Qt,
    add the -qvfb option).
 2. Start qvfb (qvfb should be compiled as a normal Qt/X11 application,
    NOT as a Qt/Embedded application!).
diff --git a/tools/qvfb/gammaview.h b/tools/qvfb/gammaview.h
index f2ebefba..67d4695a 100644
--- a/tools/qvfb/gammaview.h
+++ b/tools/qvfb/gammaview.h
@@ -34,7 +34,7 @@
 #ifndef GAMMAVIEW_H
 #define GAMMAVIEW_H
 
-#include <qwidget.h>
+#include <ntqwidget.h>
 
 class GammaView: public TQWidget
 {
diff --git a/tools/qvfb/main.cpp b/tools/qvfb/main.cpp
index a7001895..aa408fa6 100644
--- a/tools/qvfb/main.cpp
+++ b/tools/qvfb/main.cpp
@@ -33,9 +33,9 @@
 
 #include "qvfb.h"
 
-#include <qapplication.h>
-#include <qpainter.h>
-#include <qregexp.h>
+#include <ntqapplication.h>
+#include <ntqpainter.h>
+#include <ntqregexp.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/tools/qvfb/qanimationwriter.cpp b/tools/qvfb/qanimationwriter.cpp
index 9bb27329..76dc9464 100644
--- a/tools/qvfb/qanimationwriter.cpp
+++ b/tools/qvfb/qanimationwriter.cpp
@@ -34,7 +34,7 @@
 #include "qanimationwriter.h"
 
 #define QT_CLEAN_NAMESPACE
-#include <qfile.h>
+#include <ntqfile.h>
 
 #include <png.h>
 #include <netinet/in.h> // for htonl
diff --git a/tools/qvfb/qanimationwriter.h b/tools/qvfb/qanimationwriter.h
index 2f9e265f..13e8ea13 100644
--- a/tools/qvfb/qanimationwriter.h
+++ b/tools/qvfb/qanimationwriter.h
@@ -34,7 +34,7 @@
 #ifndef TQANIMATIONWRITER_H
 #define TQANIMATIONWRITER_H
 
-#include <qimage.h>
+#include <ntqimage.h>
 
 class TQAnimationWriterData;
 
diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp
index d5557fd6..5ba0ea87 100644
--- a/tools/qvfb/qvfb.cpp
+++ b/tools/qvfb/qvfb.cpp
@@ -37,21 +37,21 @@
 #include "config.h"
 #include "skin.h"
 
-#include <qmenubar.h>
-#include <qpopupmenu.h>
-#include <qapplication.h>
-#include <qmessagebox.h>
-#include <qcombobox.h>
-#include <qlabel.h>
-#include <qfiledialog.h>
-#include <qslider.h>
-#include <qspinbox.h>
-#include <qradiobutton.h>
-#include <qimage.h>
-#include <qpixmap.h>
-#include <qcursor.h>
-#include <qdragobject.h>
-#include <qcheckbox.h>
+#include <ntqmenubar.h>
+#include <ntqpopupmenu.h>
+#include <ntqapplication.h>
+#include <ntqmessagebox.h>
+#include <ntqcombobox.h>
+#include <ntqlabel.h>
+#include <ntqfiledialog.h>
+#include <ntqslider.h>
+#include <ntqspinbox.h>
+#include <ntqradiobutton.h>
+#include <ntqimage.h>
+#include <ntqpixmap.h>
+#include <ntqcursor.h>
+#include <ntqdragobject.h>
+#include <ntqcheckbox.h>
 
 TQVFb::TQVFb( int display_id, int w, int h, int d, const TQString &skin, TQWidget *parent,
 	    const char *name, uint flags )
diff --git a/tools/qvfb/qvfb.h b/tools/qvfb/qvfb.h
index a283161d..59a051d5 100644
--- a/tools/qvfb/qvfb.h
+++ b/tools/qvfb/qvfb.h
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <qmainwindow.h>
+#include <ntqmainwindow.h>
 
 class TQVFbView;
 class TQVFbRateDialog;
diff --git a/tools/qvfb/qvfbratedlg.cpp b/tools/qvfb/qvfbratedlg.cpp
index 44de476d..c10de3ef 100644
--- a/tools/qvfb/qvfbratedlg.cpp
+++ b/tools/qvfb/qvfbratedlg.cpp
@@ -33,10 +33,10 @@
 
 #include "qvfbratedlg.h"
 
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qslider.h>
-#include <qpushbutton.h>
+#include <ntqlayout.h>
+#include <ntqlabel.h>
+#include <ntqslider.h>
+#include <ntqpushbutton.h>
 
 TQVFbRateDialog::TQVFbRateDialog( int rate, TQWidget *parent, const char *name,
     bool modal )
diff --git a/tools/qvfb/qvfbratedlg.h b/tools/qvfb/qvfbratedlg.h
index 0781fe59..28c9c17d 100644
--- a/tools/qvfb/qvfbratedlg.h
+++ b/tools/qvfb/qvfbratedlg.h
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <qdialog.h>
+#include <ntqdialog.h>
 
 class TQLabel;
 class TQSlider;
diff --git a/tools/qvfb/qvfbview.cpp b/tools/qvfb/qvfbview.cpp
index dcb56bf4..08566fd9 100644
--- a/tools/qvfb/qvfbview.cpp
+++ b/tools/qvfb/qvfbview.cpp
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include "qglobal.h"
+#include "ntqglobal.h"
 #if !defined( Q_WS_QWS ) || defined( QT_NO_QWS_MULTIPROCESS )
 #define TQLock TQWSSemaphore
 #undef QT_NO_QWS_MULTIPROCESS
@@ -41,16 +41,16 @@
 #endif
 
 #include "qvfbview.h"
-#include "qvfbhdr.h"
+#include "ntqvfbhdr.h"
 
 #define TQTE_PIPE "TQtEmbedded-%1"
 
-#include <qapplication.h>
-#include <qimage.h>
-#include <qbitmap.h>
-#include <qtimer.h>
-#include <qwmatrix.h>
-#include <qpainter.h>
+#include <ntqapplication.h>
+#include <ntqimage.h>
+#include <ntqbitmap.h>
+#include <ntqtimer.h>
+#include <ntqwmatrix.h>
+#include <ntqpainter.h>
 #include "qanimationwriter.h"
 
 #include <unistd.h>
diff --git a/tools/qvfb/qvfbview.h b/tools/qvfb/qvfbview.h
index 48892879..5220cb2a 100644
--- a/tools/qvfb/qvfbview.h
+++ b/tools/qvfb/qvfbview.h
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <qscrollview.h>
+#include <ntqscrollview.h>
 
 class TQImage;
 class TQTimer;
diff --git a/tools/qvfb/skin.cpp b/tools/qvfb/skin.cpp
index bb406fbe..9961d0a9 100644
--- a/tools/qvfb/skin.cpp
+++ b/tools/qvfb/skin.cpp
@@ -35,11 +35,11 @@
 #include "qvfb.h"
 #include "qvfbview.h"
 
-#include <qbitmap.h>
-#include <qpixmap.h>
-#include <qtextstream.h>
-#include <qfile.h>
-#include <qpainter.h>
+#include <ntqbitmap.h>
+#include <ntqpixmap.h>
+#include <ntqtextstream.h>
+#include <ntqfile.h>
+#include <ntqpainter.h>
 #ifdef Q_WS_MAC
 # include <qt_mac.h>
 #endif
diff --git a/tools/qvfb/skin.h b/tools/qvfb/skin.h
index 83cb363f..c2ee4c10 100644
--- a/tools/qvfb/skin.h
+++ b/tools/qvfb/skin.h
@@ -31,7 +31,7 @@
 **
 **********************************************************************/
 
-#include <qwidget.h>
+#include <ntqwidget.h>
 
 
 class TQVFb;
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2012-01-26 23:32:43 -0600
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2012-01-26 23:32:43 -0600
commit	ea318d1431c89e647598c510c4245c6571aa5f46 (patch)
tree	996d29b80c30d453dda86d1a23162d441628f169 /tools
parent	aaf89d4b48f69c9293feb187db26362e550b5561 (diff)
download	tqt3-ea318d1431c89e647598c510c4245c6571aa5f46.tar.gz tqt3-ea318d1431c89e647598c510c4245c6571aa5f46.zip