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

---
 tools/designer/app/main.cpp                        |  10 +-
 tools/designer/designer/actiondnd.cpp              |  26 +--
 tools/designer/designer/actiondnd.h                |  18 +-
 tools/designer/designer/actioneditorimpl.cpp       |  18 +-
 tools/designer/designer/actionlistview.cpp         |   2 +-
 tools/designer/designer/actionlistview.h           |   2 +-
 tools/designer/designer/asciivalidator.cpp         |   2 +-
 tools/designer/designer/asciivalidator.h           |   2 +-
 tools/designer/designer/command.cpp                |  28 +--
 tools/designer/designer/command.h                  |  18 +-
 tools/designer/designer/configtoolboxdialog.ui.h   |   2 +-
 tools/designer/designer/connectiondialog.ui        |   2 +-
 tools/designer/designer/connectionitems.cpp        |  14 +-
 tools/designer/designer/connectionitems.h          |   2 +-
 tools/designer/designer/connectiontable.h          |   2 +-
 tools/designer/designer/customwidgeteditorimpl.cpp |  34 ++--
 tools/designer/designer/customwidgeteditorimpl.h   |   4 +-
 tools/designer/designer/database.cpp               |   8 +-
 tools/designer/designer/database.h                 |  10 +-
 tools/designer/designer/database2.h                |  10 +-
 tools/designer/designer/dbconnectionimpl.cpp       |  12 +-
 tools/designer/designer/dbconnectionsimpl.cpp      |  22 +--
 tools/designer/designer/defs.h                     |   4 +-
 tools/designer/designer/designer_pch.h             |  48 +++---
 tools/designer/designer/designerapp.cpp            |   8 +-
 tools/designer/designer/designerapp.h              |   2 +-
 tools/designer/designer/designerappiface.cpp       |  14 +-
 tools/designer/designer/editfunctionsimpl.cpp      |  22 +--
 tools/designer/designer/editfunctionsimpl.h        |   2 +-
 tools/designer/designer/finddialog.ui              |   2 +-
 tools/designer/designer/formfile.cpp               |  10 +-
 tools/designer/designer/formfile.h                 |   2 +-
 tools/designer/designer/formsettingsimpl.cpp       |  14 +-
 tools/designer/designer/formwindow.cpp             |  48 +++---
 tools/designer/designer/formwindow.h               |  10 +-
 tools/designer/designer/hierarchyview.cpp          |  28 +--
 tools/designer/designer/hierarchyview.h            |   8 +-
 tools/designer/designer/iconvieweditorimpl.cpp     |  10 +-
 tools/designer/designer/layout.cpp                 |  16 +-
 tools/designer/designer/layout.h                   |  14 +-
 tools/designer/designer/listboxdnd.cpp             |  10 +-
 tools/designer/designer/listboxdnd.h               |   4 +-
 tools/designer/designer/listboxeditorimpl.cpp      |  10 +-
 tools/designer/designer/listboxrename.cpp          |   6 +-
 tools/designer/designer/listboxrename.h            |   4 +-
 tools/designer/designer/listdnd.cpp                |   4 +-
 tools/designer/designer/listdnd.h                  |   4 +-
 tools/designer/designer/listeditor.ui.h            |   4 +-
 tools/designer/designer/listviewdnd.cpp            |  10 +-
 tools/designer/designer/listviewdnd.h              |   4 +-
 tools/designer/designer/listvieweditorimpl.cpp     |  20 +--
 tools/designer/designer/listvieweditorimpl.h       |   6 +-
 tools/designer/designer/mainwindow.cpp             |  72 ++++----
 tools/designer/designer/mainwindow.h               |  12 +-
 tools/designer/designer/mainwindowactions.cpp      |  40 ++---
 tools/designer/designer/menubareditor.cpp          |  16 +-
 tools/designer/designer/menubareditor.h            |   4 +-
 tools/designer/designer/metadatabase.cpp           |  28 +--
 tools/designer/designer/metadatabase.h             |  18 +-
 tools/designer/designer/multilineeditorimpl.cpp    |  14 +-
 tools/designer/designer/multilineeditorimpl.h      |   4 +-
 tools/designer/designer/newformimpl.cpp            |  16 +-
 tools/designer/designer/newformimpl.h              |   2 +-
 tools/designer/designer/orderindicator.cpp         |   8 +-
 tools/designer/designer/orderindicator.h           |   2 +-
 tools/designer/designer/outputwindow.cpp           |  10 +-
 tools/designer/designer/outputwindow.h             |   8 +-
 .../designer/paletteeditoradvancedimpl.cpp         |  14 +-
 tools/designer/designer/paletteeditorimpl.cpp      |   8 +-
 tools/designer/designer/pixmapchooser.cpp          |  16 +-
 tools/designer/designer/pixmapchooser.h            |   8 +-
 tools/designer/designer/pixmapcollection.cpp       |  10 +-
 tools/designer/designer/pixmapcollection.h         |   6 +-
 tools/designer/designer/pixmapcollectioneditor.ui  |   6 +-
 tools/designer/designer/popupmenueditor.cpp        |  24 +--
 tools/designer/designer/popupmenueditor.h          |   8 +-
 tools/designer/designer/previewframe.cpp           |   4 +-
 tools/designer/designer/previewframe.h             |   4 +-
 tools/designer/designer/previewwidgetimpl.cpp      |   2 +-
 tools/designer/designer/project.cpp                |  28 +--
 tools/designer/designer/project.h                  |  14 +-
 tools/designer/designer/projectsettingsimpl.cpp    |  18 +-
 tools/designer/designer/propertyeditor.cpp         |  80 ++++-----
 tools/designer/designer/propertyeditor.h           |  22 +--
 tools/designer/designer/propertyobject.cpp         |   8 +-
 tools/designer/designer/propertyobject.h           |   6 +-
 tools/designer/designer/qcompletionedit.cpp        |   8 +-
 tools/designer/designer/qcompletionedit.h          |   4 +-
 tools/designer/designer/replacedialog.ui           |   2 +-
 tools/designer/designer/resource.cpp               |  68 ++++----
 tools/designer/designer/resource.h                 |  10 +-
 tools/designer/designer/richtextfontdialog.ui.h    |   4 +-
 tools/designer/designer/sizehandle.cpp             |   8 +-
 tools/designer/designer/sizehandle.h               |   6 +-
 tools/designer/designer/sourceeditor.cpp           |   6 +-
 tools/designer/designer/sourceeditor.h             |   4 +-
 tools/designer/designer/sourcefile.cpp             |   8 +-
 tools/designer/designer/sourcefile.h               |   2 +-
 tools/designer/designer/startdialogimpl.cpp        |  36 ++--
 tools/designer/designer/startdialogimpl.h          |  12 +-
 tools/designer/designer/styledbutton.cpp           |  20 +--
 tools/designer/designer/styledbutton.h             |   4 +-
 tools/designer/designer/syntaxhighlighter_html.cpp |   6 +-
 tools/designer/designer/tableeditor.ui             |   2 +-
 tools/designer/designer/tableeditorimpl.cpp        |  20 +--
 tools/designer/designer/tableeditorimpl.h          |   2 +-
 tools/designer/designer/timestamp.cpp              |   4 +-
 tools/designer/designer/timestamp.h                |   6 +-
 tools/designer/designer/variabledialogimpl.cpp     |  10 +-
 tools/designer/designer/widgetaction.cpp           |   8 +-
 tools/designer/designer/widgetaction.h             |   2 +-
 tools/designer/designer/widgetfactory.cpp          |  80 ++++-----
 tools/designer/designer/widgetfactory.h            |  44 ++---
 tools/designer/designer/wizardeditorimpl.cpp       |   8 +-
 tools/designer/designer/wizardeditorimpl.h         |   2 +-
 tools/designer/designer/workspace.cpp              |  22 +--
 tools/designer/designer/workspace.h                |   2 +-
 tools/designer/editor/arghintwidget.cpp            |  10 +-
 tools/designer/editor/arghintwidget.h              |   2 +-
 tools/designer/editor/browser.h                    |   2 +-
 tools/designer/editor/cindent.cpp                  |   2 +-
 tools/designer/editor/completion.cpp               |  14 +-
 tools/designer/editor/completion.h                 |   8 +-
 tools/designer/editor/conf.cpp                     |   8 +-
 tools/designer/editor/conf.h                       |   6 +-
 tools/designer/editor/editor.cpp                   |   8 +-
 tools/designer/editor/editor.h                     |   2 +-
 tools/designer/editor/markerwidget.cpp             |   4 +-
 tools/designer/editor/markerwidget.h               |   4 +-
 tools/designer/editor/parenmatcher.cpp             |   4 +-
 tools/designer/editor/parenmatcher.h               |   4 +-
 tools/designer/editor/preferences.ui               |  20 +--
 tools/designer/editor/viewmanager.cpp              |   8 +-
 tools/designer/editor/viewmanager.h                |   4 +-
 tools/designer/editor/yyindent.cpp                 |   6 +-
 .../designer/examples/addressbook/addressbook.ui.h |   8 +-
 tools/designer/examples/addressbook/main.cpp       |   2 +-
 tools/designer/examples/book/book1/main.cpp        |   4 +-
 tools/designer/examples/book/book2/main.cpp        |   4 +-
 tools/designer/examples/book/book3/main.cpp        |   4 +-
 tools/designer/examples/book/book4/main.cpp        |   4 +-
 tools/designer/examples/book/book5/book.ui         |   2 +-
 tools/designer/examples/book/book5/main.cpp        |   4 +-
 tools/designer/examples/book/book6/book.ui         |   4 +-
 tools/designer/examples/book/book6/editbook.ui     |   2 +-
 tools/designer/examples/book/book6/main.cpp        |   4 +-
 tools/designer/examples/book/book7/book.ui         |   4 +-
 tools/designer/examples/book/book7/editbook.ui     |   2 +-
 tools/designer/examples/book/book7/main.cpp        |   4 +-
 tools/designer/examples/book/book8/book.ui         |   4 +-
 tools/designer/examples/book/book8/editbook.ui     |   2 +-
 tools/designer/examples/book/book8/main.cpp        |   4 +-
 tools/designer/examples/book/connection.cpp        |   2 +-
 .../designer/examples/colortool/colornameform.ui.h |   6 +-
 tools/designer/examples/colortool/main.cpp         |   2 +-
 tools/designer/examples/colortool/mainform.ui      |  32 ++--
 tools/designer/examples/credit/creditform.cpp      |   4 +-
 tools/designer/examples/credit/creditformbase.cpp  |  24 +--
 tools/designer/examples/credit/creditformbase.h    |   4 +-
 tools/designer/examples/credit/main.cpp            |   2 +-
 .../designer/examples/filechooser/plugin/plugin.h  |   2 +-
 .../examples/filechooser/widget/filechooser.cpp    |   8 +-
 .../examples/filechooser/widget/filechooser.h      |   4 +-
 .../designer/examples/filechooser/widget/main.cpp  |   2 +-
 tools/designer/examples/metric/main.cpp            |   2 +-
 tools/designer/examples/metric/metric.ui.h         |   2 +-
 tools/designer/examples/multiclip/main.cpp         |   2 +-
 tools/designer/examples/multiclip/multiclip.ui     |   4 +-
 tools/designer/examples/opengl/glwidget.h          |   2 +-
 tools/designer/examples/opengl/main.cpp            |   4 +-
 tools/designer/examples/receiver1/main.cpp         |   2 +-
 tools/designer/examples/receiver1/mainform.ui      |   4 +-
 tools/designer/examples/receiver2/main.cpp         |   2 +-
 tools/designer/examples/receiver2/mainform.ui      |   4 +-
 tools/designer/examples/receiver2/receiver.cpp     |   4 +-
 tools/designer/examples/receiver2/receiver.h       |   4 +-
 tools/designer/examples/richedit/main.cpp          |   2 +-
 tools/designer/examples/richedit/richedit.ui       |  12 +-
 tools/designer/examples/sizeaware/main.cpp         |   2 +-
 tools/designer/examples/sizeaware/sizeaware.cpp    |   2 +-
 tools/designer/examples/sizeaware/sizeaware.h      |   2 +-
 tools/designer/examples/vcr/main.cpp               |   2 +-
 tools/designer/examples/vcr/vcr.cpp                |   4 +-
 tools/designer/examples/vcr/vcr.h                  |   2 +-
 tools/designer/interfaces/classbrowserinterface.h  |   2 +-
 tools/designer/interfaces/designerinterface.h      |  12 +-
 tools/designer/interfaces/editorinterface.h        |   4 +-
 tools/designer/interfaces/languageinterface.h      |   8 +-
 tools/designer/interfaces/preferenceinterface.h    |   4 +-
 tools/designer/interfaces/projectsettingsiface.h   |   4 +-
 tools/designer/interfaces/sourcetemplateiface.h    |   2 +-
 tools/designer/plugins/cppeditor/cppbrowser.cpp    |   6 +-
 tools/designer/plugins/cppeditor/cppcompletion.cpp |   8 +-
 tools/designer/plugins/cppeditor/cppcompletion.h   |   2 +-
 tools/designer/plugins/cppeditor/cppeditor.cpp     |   6 +-
 .../plugins/cppeditor/editorinterfaceimpl.cpp      |   4 +-
 .../plugins/cppeditor/editorinterfaceimpl.h        |   4 +-
 .../plugins/cppeditor/languageinterfaceimpl.cpp    |   6 +-
 .../cppeditor/sourcetemplateinterfaceimpl.cpp      |   6 +-
 .../plugins/cppeditor/syntaxhighliter_cpp.cpp      |  10 +-
 tools/designer/plugins/cppeditor/yyreg.cpp         |   2 +-
 tools/designer/plugins/cppeditor/yyreg.h           |   4 +-
 tools/designer/plugins/dlg/dlg2ui.cpp              |  10 +-
 tools/designer/plugins/dlg/dlg2ui.h                |   8 +-
 tools/designer/plugins/dlg/main.cpp                |   2 +-
 tools/designer/plugins/glade/glade2ui.cpp          |  16 +-
 tools/designer/plugins/glade/glade2ui.h            |   8 +-
 tools/designer/plugins/glade/main.cpp              |   2 +-
 tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp      |   6 +-
 tools/designer/plugins/kdevdlg/kdevdlg2ui.h        |   6 +-
 tools/designer/plugins/kdevdlg/main.cpp            |   6 +-
 tools/designer/plugins/rc/main.cpp                 |   2 +-
 tools/designer/plugins/rc/rc2ui.cpp                |   6 +-
 tools/designer/plugins/rc/rc2ui.h                  |   6 +-
 tools/designer/plugins/wizards/main.cpp            |   6 +-
 tools/designer/plugins/wizards/mainwindowwizard.ui |   8 +-
 .../designer/plugins/wizards/sqlformwizardimpl.cpp |  42 ++---
 tools/designer/plugins/wizards/sqlformwizardimpl.h |   2 +-
 tools/designer/shared/domtool.cpp                  |  16 +-
 tools/designer/shared/domtool.h                    |   4 +-
 tools/designer/shared/globaldefs.h                 |   4 +-
 tools/designer/shared/parser.cpp                   |   4 +-
 tools/designer/shared/parser.h                     |   2 +-
 tools/designer/shared/ui2uib.cpp                   |  18 +-
 tools/designer/shared/uib.h                        |   2 +-
 tools/designer/shared/widgetdatabase.cpp           |  38 ++---
 tools/designer/shared/widgetdatabase.h             |   4 +-
 tools/designer/tools/conv2ui/main.cpp              |   8 +-
 tools/designer/tools/createcw/main.cpp             |  12 +-
 tools/designer/uic/embed.cpp                       |  18 +-
 tools/designer/uic/form.cpp                        |  50 +++---
 tools/designer/uic/main.cpp                        |  10 +-
 tools/designer/uic/object.cpp                      |   6 +-
 tools/designer/uic/subclassing.cpp                 |   8 +-
 tools/designer/uic/uic.cpp                         |   8 +-
 tools/designer/uic/uic.h                           |  14 +-
 tools/designer/uilib/ntqwidgetfactory.h            | 187 +++++++++++++++++++++
 tools/designer/uilib/qwidgetfactory.cpp            | 112 ++++++------
 tools/designer/uilib/qwidgetfactory.h              | 187 ---------------------
 tools/designer/uilib/test/main.cpp                 |   4 +-
 240 files changed, 1418 insertions(+), 1418 deletions(-)
 create mode 100644 tools/designer/uilib/ntqwidgetfactory.h
 delete mode 100644 tools/designer/uilib/qwidgetfactory.h

(limited to 'tools/designer')

diff --git a/tools/designer/app/main.cpp b/tools/designer/app/main.cpp
index 30933ba71..b88eddbfb 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 812317090..1f9e8328a 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 e3a93658a..ba21ff5ae 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 e6af9502f..88587cdcb 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 489bbebb7..fe3bc92b0 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 bedc17ef0..d96633688 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 58e7cc2a3..640cd1eb8 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 065ed934b..d3afdfd26 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 3ce5d2fc3..bb25fa86e 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 e1e1d8978..d6eef4fe5 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 2fe074bb2..7aa13de73 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 9292bfe19..b938be930 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 e9a5fdbfe..db73c966c 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 56ca528f8..60407ae55 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 ca7bd835a..6a11ce9f4 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 d87be0913..ac517f1df 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 d6f42dec1..fd645976b 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 b0399fc33..ca917c1d9 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 aae034e03..3008f7835 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 3fd1c96ad..fade3b8e9 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 4e5378106..ae6cbac9e 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 e6b88d742..0507cb713 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 29f244cd7..1a6bf5cb9 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 858cd3891..5cc5fd483 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 ea1365284..06e8edab9 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 bffe7fdca..703443f93 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 97a531b4e..d1d215a71 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 20e8df4f8..49f173285 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 02a43aaa1..d852afcfb 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 9adaecacb..73b00ef6f 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 aaa17eba7..2afe8423d 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 41e2199d6..8cc493c3b 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 73c4f25b6..684649182 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 14e440d74..b352b11d1 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 2155c4133..b294d6794 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 cbb1a4fa3..77c84d0b9 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 d18134635..29c200556 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 f8fe7e442..73723e8f1 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 ce6f77801..2f0393b1c 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 53e0d48a5..97bd997bf 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 aa50c0b52..11f388686 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 fbea6a9f2..50e8db899 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 7e3684d04..08d4560ab 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 17ca13009..c78f64618 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 27c4d1d0d..e857fcfe1 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 46374632f..137237ad7 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 97794bcd9..08820f707 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 35df155e1..5468f796a 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 b0fb1bf3f..49c7980f6 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 3b0255bbf..dee4ce43f 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 59c31732a..c65ac833d 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 c0351e661..f3258fb60 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 868d349ff..822f35eba 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 4acc2051c..602f8a563 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 d89ed1657..86da0e524 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 56ad84f4b..6687eddb2 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 ff5699879..495d4112a 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 b773732ca..302ee5328 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 eba00e455..92e989000 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 9417454c7..d257d1636 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 c841a3c34..603578dbf 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 dc47df051..4636bc9d5 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 e46e2924d..ba9a21c83 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 6e509279b..7a886991e 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 b2743d2d6..49b144f64 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 731609467..5a4479b9d 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 2f1613ea0..991e75723 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 d0cdc9081..f632f8b56 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 ec1c9aaea..319f110e6 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 b0757b756..4693013bb 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 212457e82..4ac0cba50 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 ec3e234db..83bb14502 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 2545c502d..8b89824ec 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 739aea615..f6104f640 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 2bd4a231a..af5a59594 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 aafdb7d4e..b4335905f 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 6f23c5aed..9fe2b4bfb 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 7e6162446..679f20813 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 8fe61e3ea..aa75de704 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 f6f4c7bb8..862dd1742 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 ecd6b1086..066712c12 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 5ec88bd13..87800fa00 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 4e953fa14..efbe42b9d 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 1375c6a6d..ca7228ac2 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 01f410f8b..3244ec52e 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 c3d159b10..51c9db314 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 e95fbbcec..b403e5715 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 21e08156c..7bae93b8e 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 0aff36d1b..3cd6e2476 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 e4e1bdcfb..0e4a5206a 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 2cc60b69f..3d196a45e 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 0a5adce23..529c52aa7 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 a4d2d3be1..7d3b1eb14 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 b1259a51e..d391ec9a2 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 a9094e2d0..167bccc97 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 47a322c35..a41fd86c2 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 a83a327fe..bdb6299d8 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 32ab629af..47663c8e4 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 fdf727083..2328360f6 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 45057df1f..c9406dc18 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 454f2c73a..64c55b481 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 8f6c31434..4574bf424 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 8f8a059d1..629941d7a 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 be6036987..17e63f2ae 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 409f64a64..4c760e0b1 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 17037da56..bb688433e 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 0ba6ce63c..3996108a8 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 b193ae1f5..b37d57f12 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 13ebcf129..c02dcf691 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 6eabf532e..5869148e9 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 77b9427e7..da500176e 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 130c3f4ac..a05c63782 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 e8aa57039..59e05a992 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 438a94eef..99329a25c 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 8cfe7ee65..983e26a86 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 5dbb69f51..ff0d68688 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 d260b5969..e99c6f401 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 ff5e288e2..e16708d0d 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 d75c8738b..09937e3d2 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 9e00af126..a19e2bcca 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 7e31f0f19..d30be4600 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 1a9337821..f0923c554 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 3b3e4362f..6328315c7 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 281bf9f5e..336f44712 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 6538ca7f1..aad97ddbb 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 1b1bf15c1..cba812362 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 64ea702bb..768c5f530 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 af36882f1..69e68817f 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 7fa5e6748..2ab70a420 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 b3017be9a..8cd6ffcb9 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 3b0710a69..805aca58e 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 e39bb816e..00c56b64e 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 aed224ed0..def747050 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 8198d6c76..46e4839de 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 1cbaa4bd1..f0014d37b 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 ef5fc8022..9b1d5460d 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 f96b6a33f..4b80e6d3e 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 cf3e80fd1..b3ebdad0c 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 cf3e80fd1..b3ebdad0c 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 70b8cc892..ea5125718 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 cdcdd5091..1abe5a9ad 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 4c3e4de4e..ce056dab0 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 cf3e80fd1..b3ebdad0c 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 8fe77d4cd..8adbb2bb6 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 5b3bc10c4..b91628725 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 cf3e80fd1..b3ebdad0c 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 faea95188..4a03ee6da 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 d0f876db5..635d82fea 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 cf3e80fd1..b3ebdad0c 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 faea95188..4a03ee6da 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 b16d789d2..901f65dec 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 cf3e80fd1..b3ebdad0c 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 efb1156ca..3e42fd99e 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 0c7ab7157..5dcffa3cf 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 48aa425d8..7b3be5a5c 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 f4081882a..945fb1ab5 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 a03285618..8bceaa4b2 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 2d81cab33..51c5e6a40 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 fd99df49e..428b3d1b8 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 d54c9d40a..a1e06b3ca 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 11262f830..e8252fe76 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 c082b9430..3b510baf1 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 cff0af536..4d303a94c 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 2742db74c..b50ddf7f0 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 fb7cfc763..8fe7bf6fc 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 7d9db780a..7277a1f68 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 4c6a94092..4b1e93aae 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 f1312fd9c..7deb0b887 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 b63884ed6..6cb998ee7 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 14a1ba8c5..5e9fd117c 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 c5145d062..72efaafa0 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 3f3326759..1ae2c8ed7 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 6d263fdcb..697f7a5f3 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 4d52c2812..306ca127a 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 6ad18cc83..41ce98db5 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 aa17de83b..aadc6a9e9 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 1f5b8afff..1a5cb1f83 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 0d86a19bd..9f3dde0aa 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 6ad151e63..2b0dcf446 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 9731126ca..621d36ead 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 73c208fbd..d118ed3f7 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 a83f6d6e3..4beb0d1cb 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 8c341d55b..fd39e1a98 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 39f3481fc..daff3d1d0 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 38a71f492..2762a3299 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 dea111703..e0f5952b1 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 a16fe35d5..099f4dda8 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 5ad85fc37..0ff51afce 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 1d89f5912..882ee10cb 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 13fa71822..5390c0814 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 aa111a7f2..6ea60476c 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 9f9e08591..8d3e68bc1 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 947931e86..a5643b918 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 73c0c77cd..965fc8f38 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 cb4808842..13069230c 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 8e98f9f3c..22e51cf49 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 96062d54b..238611c99 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 89bda1778..1fbd63e0d 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 1ff8e9484..a140903f9 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 5d4441fda..ce30936c0 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 0d95e409e..4073752bf 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 5d849a0f4..a39eac828 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 c30833412..da0cd5002 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 9b4abc9c2..2aaf5672a 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 9709d187e..37d54c539 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 74613b02b..626b30934 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 87d4d3221..c0caf428d 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 06f7942eb..1913fd36a 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 5e84d89b8..a5a46fe79 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 1861479c4..5f2b6d3bc 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 a80db4230..1e7c34663 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 30b3253ce..7d899743e 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 28b2ffc8a..f88f9d431 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 cbac8ef0e..68829211b 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 55ba9c7a7..b3400acc4 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 9e45f36df..2382b5f1c 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 627abd5ef..580780de4 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 815d186f1..be3602d79 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 781118038..4baf19412 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 e8f38b3f8..f53e205f5 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 bcf7b118d..4f4c2cb21 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 21b93d6bc..f0624d7d2 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 f6d11a8de..01a253566 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 dabb8d429..239697982 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 d8a73dbd3..d4b09addf 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 98529b889..45e898ad5 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 c77288c7f..973c699c0 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 e92652015..df26872f2 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 1ab4f53eb..50f8574de 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 555b20a81..aa00988ea 100644
--- a/tools/designer/uic/embed.cpp
+++ b/tools/designer/uic/embed.cpp
@@ -32,11 +32,11 @@
 **********************************************************************/
 
 #include "uic.h"
-#include <qfile.h>
-#include <qimage.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
-#include <qfileinfo.h>
+#include <ntqfile.h>
+#include <ntqimage.h>
+#include <ntqstringlist.h>
+#include <ntqdatetime.h>
+#include <ntqfileinfo.h>
 #include <stdio.h>
 #include <ctype.h>
 
@@ -143,10 +143,10 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
     out << "****************************************************************************/\n";
     out << "\n";
 
-    out << "#include <qimage.h>\n";
-    out << "#include <qdict.h>\n";
-    out << "#include <qmime.h>\n";
-    out << "#include <qdragobject.h>\n";
+    out << "#include <ntqimage.h>\n";
+    out << "#include <ntqdict.h>\n";
+    out << "#include <ntqmime.h>\n";
+    out << "#include <ntqdragobject.h>\n";
     out << "\n";
 
     TQPtrList<EmbedImage> list_image;
diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp
index be21ee9e0..e185af6c3 100644
--- a/tools/designer/uic/form.cpp
+++ b/tools/designer/uic/form.cpp
@@ -35,12 +35,12 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qfile.h>
-#include <qfileinfo.h>
-#include <qdir.h>
-#include <qregexp.h>
+#include <ntqstringlist.h>
+#include <ntqvaluelist.h>
+#include <ntqfile.h>
+#include <ntqfileinfo.h>
+#include <ntqdir.h>
+#include <ntqregexp.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 
@@ -196,10 +196,10 @@ void Uic::createFormDecl( const TQDomElement &e )
     out << "#ifndef " << protector << endl;
     out << "#define " << protector << endl;
     out << endl;
-    out << "#include <qvariant.h>" << endl; // for broken HP-UX compilers
+    out << "#include <ntqvariant.h>" << endl; // for broken HP-UX compilers
 
     if ( !imageMembers.isEmpty() )
-	out << "#include <qpixmap.h>" << endl;
+	out << "#include <ntqpixmap.h>" << endl;
 
     TQStringList globalIncludes, localIncludes;
     int wid = WidgetDatabase::idFromClassName( objClass );
@@ -753,9 +753,9 @@ void Uic::createFormImpl( const TQDomElement &e )
     registerDatabases( e );
     dbConnections = unique( dbConnections );
     if ( dbConnections.count() )
-	globalIncludes += "qsqldatabase.h";
+	globalIncludes += "ntqsqldatabase.h";
     if ( dbCursors.count() )
-	globalIncludes += "qsqlcursor.h";
+	globalIncludes += "ntqsqlcursor.h";
     bool dbForm = FALSE;
     if ( dbForms[ "(default)" ].count() )
 	dbForm = TRUE;
@@ -769,8 +769,8 @@ void Uic::createFormImpl( const TQDomElement &e )
 	}
     }
     if ( dbForm || subDbForms ) {
-	globalIncludes += "qsqlform.h";
-	globalIncludes += "qsqlrecord.h";
+	globalIncludes += "ntqsqlform.h";
+	globalIncludes += "ntqsqlrecord.h";
     }
 
     // do the local includes afterwards, since global includes have priority on clashes
@@ -803,12 +803,12 @@ void Uic::createFormImpl( const TQDomElement &e )
 	for ( i = 1; i < (int) nl.length(); i++ ) { // start at 1, 0 is the toplevel widget
 	    TQString name = getClassName( nl.item(i).toElement() );
 	    if ( name == "Spacer" ) {
-		globalIncludes += "qlayout.h";
-		globalIncludes += "qapplication.h";
+		globalIncludes += "ntqlayout.h";
+		globalIncludes += "ntqapplication.h";
 		continue;
 	    }
 	    if (( name.mid( 1 ) == "ListView" ) || ( name.mid( 2 ) == "ListView" ))
-		globalIncludes += "qheader.h";
+		globalIncludes += "ntqheader.h";
 	    if ( name != objClass ) {
 		int wid = WidgetDatabase::idFromClassName( name );
 		TQMap<TQString, CustomInclude>::Iterator it = customWidgetIncludes.find( name );
@@ -818,7 +818,7 @@ void Uic::createFormImpl( const TQDomElement &e )
 	}
     }
 
-    out << "#include <qvariant.h>" << endl; // first for gcc 2.7.2
+    out << "#include <ntqvariant.h>" << endl; // first for gcc 2.7.2
 
     globalIncludes = unique( globalIncludes );
     for ( it = globalIncludes.begin(); it != globalIncludes.end(); ++it ) {
@@ -826,14 +826,14 @@ void Uic::createFormImpl( const TQDomElement &e )
 	    out << "#include <" << *it << ">" << endl;
     }
 
-    out << "#include <qlayout.h>" << endl;
-    out << "#include <qtooltip.h>" << endl;
-    out << "#include <qwhatsthis.h>" << endl;
+    out << "#include <ntqlayout.h>" << endl;
+    out << "#include <ntqtooltip.h>" << endl;
+    out << "#include <ntqwhatsthis.h>" << endl;
     if ( objClass == "TQMainWindow" ) {
-	out << "#include <qaction.h>" << endl;
-	out << "#include <qmenubar.h>" << endl;
-	out << "#include <qpopupmenu.h>" << endl;
-	out << "#include <qtoolbar.h>" << endl;
+	out << "#include <ntqaction.h>" << endl;
+	out << "#include <ntqmenubar.h>" << endl;
+	out << "#include <ntqpopupmenu.h>" << endl;
+	out << "#include <ntqtoolbar.h>" << endl;
     }
 
     // find out what images are required
@@ -851,8 +851,8 @@ void Uic::createFormImpl( const TQDomElement &e )
     }
 
     if ( !requiredImages.isEmpty() || externPixmaps ) {
-	out << "#include <qimage.h>" << endl;
-	out << "#include <qpixmap.h>" << endl << endl;
+	out << "#include <ntqimage.h>" << endl;
+	out << "#include <ntqpixmap.h>" << endl << endl;
     }
 
     /*
diff --git a/tools/designer/uic/main.cpp b/tools/designer/uic/main.cpp
index 19a4854d8..452aad978 100644
--- a/tools/designer/uic/main.cpp
+++ b/tools/designer/uic/main.cpp
@@ -36,11 +36,11 @@
 #if defined(UIB)
 #include "ui2uib.h"
 #endif
-#include <qapplication.h>
-#include <qfile.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
-#include <qsettings.h>
+#include <ntqapplication.h>
+#include <ntqfile.h>
+#include <ntqstringlist.h>
+#include <ntqdatetime.h>
+#include <ntqsettings.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 #include <stdio.h>
diff --git a/tools/designer/uic/object.cpp b/tools/designer/uic/object.cpp
index 87dbd3b31..82aabee32 100644
--- a/tools/designer/uic/object.cpp
+++ b/tools/designer/uic/object.cpp
@@ -34,9 +34,9 @@
 #include "uic.h"
 #include "parser.h"
 #include "domtool.h"
-#include <qregexp.h>
-#include <qsizepolicy.h>
-#include <qstringlist.h>
+#include <ntqregexp.h>
+#include <ntqsizepolicy.h>
+#include <ntqstringlist.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 #include "../interfaces/widgetinterface.h"
diff --git a/tools/designer/uic/subclassing.cpp b/tools/designer/uic/subclassing.cpp
index d5da48f91..f89b2ffb4 100644
--- a/tools/designer/uic/subclassing.cpp
+++ b/tools/designer/uic/subclassing.cpp
@@ -35,12 +35,12 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <qfile.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
+#include <ntqfile.h>
+#include <ntqstringlist.h>
+#include <ntqdatetime.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <qregexp.h>
+#include <ntqregexp.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tools/designer/uic/uic.cpp b/tools/designer/uic/uic.cpp
index 8faea579d..59a9a1d1d 100644
--- a/tools/designer/uic/uic.cpp
+++ b/tools/designer/uic/uic.cpp
@@ -35,12 +35,12 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <qfile.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
+#include <ntqfile.h>
+#include <ntqstringlist.h>
+#include <ntqdatetime.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
-#include <qregexp.h>
+#include <ntqregexp.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/tools/designer/uic/uic.h b/tools/designer/uic/uic.h
index 35d9ed0ab..fd616ecd1 100644
--- a/tools/designer/uic/uic.h
+++ b/tools/designer/uic/uic.h
@@ -33,13 +33,13 @@
 
 #ifndef UIC_H
 #define UIC_H
-#include <qdom.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qmap.h>
-#include <qtextstream.h>
-#include <qpalette.h>
-#include <qvariant.h>
+#include <ntqdom.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqmap.h>
+#include <ntqtextstream.h>
+#include <ntqpalette.h>
+#include <ntqvariant.h>
 
 class Uic : public TQt
 {
diff --git a/tools/designer/uilib/ntqwidgetfactory.h b/tools/designer/uilib/ntqwidgetfactory.h
new file mode 100644
index 000000000..4213199cd
--- /dev/null
+++ b/tools/designer/uilib/ntqwidgetfactory.h
@@ -0,0 +1,187 @@
+/**********************************************************************
+** Copyright (C) 2005-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of TQt Designer.
+**
+** This file may be used under the terms of the GNU General
+** Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the files LICENSE.GPL2
+** and LICENSE.GPL3 included in the packaging of this file.
+** Alternatively you may (at your option) use any later version
+** of the GNU General Public License if such license has been
+** publicly approved by Trolltech ASA (or its successors, if any)
+** and the KDE Free TQt Foundation.
+**
+** Please review the following information to ensure GNU General
+** Public Licensing requirements will be met:
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
+** If you are unsure which license is appropriate for your use, please
+** review the following information:
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
+** or contact the sales department at sales@trolltech.com.
+**
+** Licensees holding valid TQt Commercial licenses may use this file in
+** accordance with the TQt Commercial License Agreement provided with
+** the Software.
+**
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
+** herein.
+**
+**********************************************************************/
+
+#ifndef TQWIDGETFACTORY_H
+#define TQWIDGETFACTORY_H
+
+#ifndef QT_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;
+class TQDomElement;
+class TQLayout;
+class TQListView;
+class TQListViewItem;
+class TQMenuBar;
+class TQTable;
+class TQWidget;
+class TQWidgetFactoryPrivate;
+class UibStrTable;
+
+class Q_EXPORT TQWidgetFactory
+{
+public:
+    TQWidgetFactory();
+    virtual ~TQWidgetFactory();
+
+    static TQWidget *create( const TQString &uiFile, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 );
+    static TQWidget *create( TQIODevice *dev, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 );
+    static void addWidgetFactory( TQWidgetFactory *factory );
+    static void loadImages( const TQString &dir );
+
+    virtual TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name ) const;
+    static TQStringList widgets();
+    static bool supportsWidget( const TQString &widget );
+
+private:
+    enum LayoutType { HBox, VBox, Grid, NoLayout };
+    void loadImageCollection( const TQDomElement &e );
+    void loadConnections( const TQDomElement &e, TQObject *connector );
+    void loadTabOrder( const TQDomElement &e );
+    TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* layout, const TQString &classNameArg );
+    TQLayout *createLayout( TQWidget *widget, TQLayout*  layout, LayoutType type, bool isTQLayoutWidget = FALSE );
+    LayoutType layoutType( TQLayout *l ) const;
+    void setProperty( TQObject* widget, const TQString &prop, TQVariant value );
+    void setProperty( TQObject* widget, const TQString &prop, const TQDomElement &e );
+    void createSpacer( const TQDomElement &e, TQLayout *layout );
+    TQImage loadFromCollection( const TQString &name );
+    TQPixmap loadPixmap( const TQString &name );
+    TQPixmap loadPixmap( const TQDomElement &e );
+    TQColorGroup loadColorGroup( const TQDomElement &e );
+    void createListViewColumn( TQListView *lv, const TQString& txt,
+			       const TQPixmap& pix, bool clickable,
+			       bool resizable );
+#ifndef QT_NO_TABLE
+    void createTableColumnOrRow( TQTable *table, const TQString& txt,
+				 const TQPixmap& pix, const TQString& field,
+				 bool isRow );
+#endif
+    void createColumn( const TQDomElement &e, TQWidget *widget );
+    void loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bool &hasPixmap );
+    void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 );
+    void loadChildAction( TQObject *parent, const TQDomElement &e );
+    void loadActions( const TQDomElement &e );
+    void loadToolBars( const TQDomElement &e );
+    void loadMenuBar( const TQDomElement &e );
+    void loadPopupMenu( TQPopupMenu *p, const TQDomElement &e );
+    void loadFunctions( const TQDomElement &e );
+    TQAction *findAction( const TQString &name );
+    void loadExtraSource();
+    TQString translate( const char *sourceText, const char *comment = "" );
+    TQString translate( const TQString& sourceText, const TQString& comment = TQString::null );
+
+    void unpackUInt16( TQDataStream& in, Q_UINT16& n );
+    void unpackUInt32( TQDataStream& in, Q_UINT32& n );
+    void unpackByteArray( TQDataStream& in, TQByteArray& array );
+    void unpackCString( const UibStrTable& strings, TQDataStream& in,
+			TQCString& cstr );
+    void unpackString( const UibStrTable& strings, TQDataStream& in,
+		       TQString& str );
+    void unpackStringSplit( const UibStrTable& strings, TQDataStream& in,
+			    TQString& str );
+    void unpackVariant( const UibStrTable& strings, TQDataStream& in,
+			TQVariant& value );
+    void inputSpacer( const UibStrTable& strings, TQDataStream& in,
+		      TQLayout *parent );
+    void inputColumnOrRow( const UibStrTable& strings, TQDataStream& in,
+			   TQObject *parent, bool isRow );
+    void inputItem( const UibStrTable& strings, TQDataStream& in,
+		    TQObject *parent, TQListViewItem *parentItem = 0 );
+    void inputMenuItem( TQObject **objects, const UibStrTable& strings,
+			TQDataStream& in, TQMenuBar *menuBar );
+    TQObject *inputObject( TQObject **objects, int& numObjects,
+			  const UibStrTable& strings, TQDataStream& in,
+			  TQWidget *ancestorWidget, TQObject *parent,
+			  TQCString className = "" );
+    TQWidget *createFromUiFile( TQDomDocument doc, TQObject *connector,
+			       TQWidget *parent, const char *name );
+    TQWidget *createFromUibFile( TQDataStream& in, TQObject *connector,
+				TQWidget *parent, const char *name );
+
+private:
+    struct Image {
+	TQImage img;
+	TQString name;
+	bool operator==(  const Image &i ) const {
+	    return ( i.name == name &&
+		     i.img == img );
+	}
+    };
+
+    struct Field
+    {
+	Field() {}
+	Field( const TQString &s1, const TQPixmap &p, const TQString &s2 ) : name( s1 ), pix( p ), field( s2 ) {}
+	TQString name;
+	TQPixmap pix;
+	TQString field;
+	Q_DUMMY_COMPARISON_OPERATOR( Field )
+    };
+
+    struct SqlWidgetConnection
+    {
+	SqlWidgetConnection() {}
+	SqlWidgetConnection( const TQString &c, const TQString &t )
+	    : conn( c ), table( t ), dbControls( new TQMap<TQString, TQString>() ) {}
+	TQString conn;
+	TQString table;
+	TQMap<TQString, TQString> *dbControls;
+	Q_DUMMY_COMPARISON_OPERATOR( SqlWidgetConnection )
+    };
+
+    TQValueList<Image> images;
+    TQWidget *toplevel;
+    TQWidgetFactoryPrivate *d;
+    TQMap<TQString, TQString> *dbControls;
+    TQMap<TQString, TQStringList> dbTables;
+    TQMap<TQWidget*, SqlWidgetConnection> sqlWidgetConnections;
+    TQMap<TQString, TQString> buddies;
+    TQMap<TQTable*, TQValueList<Field> > fieldMaps;
+    TQPtrList<TQAction> actionList;
+    TQMap<TQString, TQString> languageSlots;
+    TQStringList noDatabaseWidgets;
+    bool usePixmapCollection;
+    int defMargin;
+    int defSpacing;
+    TQString code;
+    TQString uiFileVersion;
+};
+
+#endif
diff --git a/tools/designer/uilib/qwidgetfactory.cpp b/tools/designer/uilib/qwidgetfactory.cpp
index ef143d46f..269f6c355 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/qwidgetfactory.h b/tools/designer/uilib/qwidgetfactory.h
deleted file mode 100644
index bd39623e3..000000000
--- a/tools/designer/uilib/qwidgetfactory.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2005-2008 Trolltech ASA.  All rights reserved.
-**
-** This file is part of TQt Designer.
-**
-** This file may be used under the terms of the GNU General
-** Public License versions 2.0 or 3.0 as published by the Free
-** Software Foundation and appearing in the files LICENSE.GPL2
-** and LICENSE.GPL3 included in the packaging of this file.
-** Alternatively you may (at your option) use any later version
-** of the GNU General Public License if such license has been
-** publicly approved by Trolltech ASA (or its successors, if any)
-** and the KDE Free TQt Foundation.
-**
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/.
-** If you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
-**
-** Licensees holding valid TQt Commercial licenses may use this file in
-** accordance with the TQt Commercial License Agreement provided with
-** the Software.
-**
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
-** herein.
-**
-**********************************************************************/
-
-#ifndef TQWIDGETFACTORY_H
-#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>
-#endif // QT_H
-
-class TQDomDocument;
-class TQDomElement;
-class TQLayout;
-class TQListView;
-class TQListViewItem;
-class TQMenuBar;
-class TQTable;
-class TQWidget;
-class TQWidgetFactoryPrivate;
-class UibStrTable;
-
-class Q_EXPORT TQWidgetFactory
-{
-public:
-    TQWidgetFactory();
-    virtual ~TQWidgetFactory();
-
-    static TQWidget *create( const TQString &uiFile, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 );
-    static TQWidget *create( TQIODevice *dev, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 );
-    static void addWidgetFactory( TQWidgetFactory *factory );
-    static void loadImages( const TQString &dir );
-
-    virtual TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name ) const;
-    static TQStringList widgets();
-    static bool supportsWidget( const TQString &widget );
-
-private:
-    enum LayoutType { HBox, VBox, Grid, NoLayout };
-    void loadImageCollection( const TQDomElement &e );
-    void loadConnections( const TQDomElement &e, TQObject *connector );
-    void loadTabOrder( const TQDomElement &e );
-    TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* layout, const TQString &classNameArg );
-    TQLayout *createLayout( TQWidget *widget, TQLayout*  layout, LayoutType type, bool isTQLayoutWidget = FALSE );
-    LayoutType layoutType( TQLayout *l ) const;
-    void setProperty( TQObject* widget, const TQString &prop, TQVariant value );
-    void setProperty( TQObject* widget, const TQString &prop, const TQDomElement &e );
-    void createSpacer( const TQDomElement &e, TQLayout *layout );
-    TQImage loadFromCollection( const TQString &name );
-    TQPixmap loadPixmap( const TQString &name );
-    TQPixmap loadPixmap( const TQDomElement &e );
-    TQColorGroup loadColorGroup( const TQDomElement &e );
-    void createListViewColumn( TQListView *lv, const TQString& txt,
-			       const TQPixmap& pix, bool clickable,
-			       bool resizable );
-#ifndef QT_NO_TABLE
-    void createTableColumnOrRow( TQTable *table, const TQString& txt,
-				 const TQPixmap& pix, const TQString& field,
-				 bool isRow );
-#endif
-    void createColumn( const TQDomElement &e, TQWidget *widget );
-    void loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bool &hasPixmap );
-    void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 );
-    void loadChildAction( TQObject *parent, const TQDomElement &e );
-    void loadActions( const TQDomElement &e );
-    void loadToolBars( const TQDomElement &e );
-    void loadMenuBar( const TQDomElement &e );
-    void loadPopupMenu( TQPopupMenu *p, const TQDomElement &e );
-    void loadFunctions( const TQDomElement &e );
-    TQAction *findAction( const TQString &name );
-    void loadExtraSource();
-    TQString translate( const char *sourceText, const char *comment = "" );
-    TQString translate( const TQString& sourceText, const TQString& comment = TQString::null );
-
-    void unpackUInt16( TQDataStream& in, Q_UINT16& n );
-    void unpackUInt32( TQDataStream& in, Q_UINT32& n );
-    void unpackByteArray( TQDataStream& in, TQByteArray& array );
-    void unpackCString( const UibStrTable& strings, TQDataStream& in,
-			TQCString& cstr );
-    void unpackString( const UibStrTable& strings, TQDataStream& in,
-		       TQString& str );
-    void unpackStringSplit( const UibStrTable& strings, TQDataStream& in,
-			    TQString& str );
-    void unpackVariant( const UibStrTable& strings, TQDataStream& in,
-			TQVariant& value );
-    void inputSpacer( const UibStrTable& strings, TQDataStream& in,
-		      TQLayout *parent );
-    void inputColumnOrRow( const UibStrTable& strings, TQDataStream& in,
-			   TQObject *parent, bool isRow );
-    void inputItem( const UibStrTable& strings, TQDataStream& in,
-		    TQObject *parent, TQListViewItem *parentItem = 0 );
-    void inputMenuItem( TQObject **objects, const UibStrTable& strings,
-			TQDataStream& in, TQMenuBar *menuBar );
-    TQObject *inputObject( TQObject **objects, int& numObjects,
-			  const UibStrTable& strings, TQDataStream& in,
-			  TQWidget *ancestorWidget, TQObject *parent,
-			  TQCString className = "" );
-    TQWidget *createFromUiFile( TQDomDocument doc, TQObject *connector,
-			       TQWidget *parent, const char *name );
-    TQWidget *createFromUibFile( TQDataStream& in, TQObject *connector,
-				TQWidget *parent, const char *name );
-
-private:
-    struct Image {
-	TQImage img;
-	TQString name;
-	bool operator==(  const Image &i ) const {
-	    return ( i.name == name &&
-		     i.img == img );
-	}
-    };
-
-    struct Field
-    {
-	Field() {}
-	Field( const TQString &s1, const TQPixmap &p, const TQString &s2 ) : name( s1 ), pix( p ), field( s2 ) {}
-	TQString name;
-	TQPixmap pix;
-	TQString field;
-	Q_DUMMY_COMPARISON_OPERATOR( Field )
-    };
-
-    struct SqlWidgetConnection
-    {
-	SqlWidgetConnection() {}
-	SqlWidgetConnection( const TQString &c, const TQString &t )
-	    : conn( c ), table( t ), dbControls( new TQMap<TQString, TQString>() ) {}
-	TQString conn;
-	TQString table;
-	TQMap<TQString, TQString> *dbControls;
-	Q_DUMMY_COMPARISON_OPERATOR( SqlWidgetConnection )
-    };
-
-    TQValueList<Image> images;
-    TQWidget *toplevel;
-    TQWidgetFactoryPrivate *d;
-    TQMap<TQString, TQString> *dbControls;
-    TQMap<TQString, TQStringList> dbTables;
-    TQMap<TQWidget*, SqlWidgetConnection> sqlWidgetConnections;
-    TQMap<TQString, TQString> buddies;
-    TQMap<TQTable*, TQValueList<Field> > fieldMaps;
-    TQPtrList<TQAction> actionList;
-    TQMap<TQString, TQString> languageSlots;
-    TQStringList noDatabaseWidgets;
-    bool usePixmapCollection;
-    int defMargin;
-    int defSpacing;
-    TQString code;
-    TQString uiFileVersion;
-};
-
-#endif
diff --git a/tools/designer/uilib/test/main.cpp b/tools/designer/uilib/test/main.cpp
index 42981ff00..1a8c14a02 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 )
 {
-- 
cgit v1.2.1