Update to latest tqt3 automated conversion

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2012-01-26 23:32:43 -0600
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2012-01-26 23:32:43 -0600
commit: ea318d1431c89e647598c510c4245c6571aa5f46 (patch)
tree: 996d29b80c30d453dda86d1a23162d441628f169 /src/kernel
parent: aaf89d4b48f69c9293feb187db26362e550b5561 (diff)
download: tqt3-ea318d1431c89e647598c510c4245c6571aa5f46.tar.gz
tqt3-ea318d1431c89e647598c510c4245c6571aa5f46.zip
212 files changed, 1482 insertions, 1482 deletions
diff --git a/src/kernel/q1xcompatibility.h b/src/kernel/ntq1xcompatibility.h
index 8ace504b5..8ace504b5 100644
--- a/src/kernel/q1xcompatibility.h
+++ b/src/kernel/ntq1xcompatibility.h
diff --git a/src/kernel/qabstractlayout.h b/src/kernel/ntqabstractlayout.h
index b42133628..88a0eeff9 100644
--- a/src/kernel/qabstractlayout.h
+++ b/src/kernel/ntqabstractlayout.h
@@ -47,7 +47,7 @@
 
 #ifndef QT_H
 #ifndef QT_NO_COMPAT
-#include "qlayout.h"
+#include "ntqlayout.h"
 #endif
 #endif // QT_H
 
diff --git a/src/kernel/qaccel.h b/src/kernel/ntqaccel.h
index 79bafe636..717d2acef 100644
--- a/src/kernel/qaccel.h
+++ b/src/kernel/ntqaccel.h
@@ -42,8 +42,8 @@
 #define TQACCEL_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qkeysequence.h"
+#include "ntqobject.h"
+#include "ntqkeysequence.h"
 #endif // QT_H
 
 #ifndef QT_NO_ACCEL
diff --git a/src/kernel/qaccessible.h b/src/kernel/ntqaccessible.h
index 7109367f9..4dccd594d 100644
--- a/src/kernel/qaccessible.h
+++ b/src/kernel/ntqaccessible.h
@@ -40,11 +40,11 @@
 #define TQACCESSIBLE_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #include <private/qcom_p.h>
-#include "qrect.h"
-#include "qguardedptr.h"
-#include "qmemarray.h"
+#include "ntqrect.h"
+#include "ntqguardedptr.h"
+#include "ntqmemarray.h"
 #endif // QT_H
 
 #if defined(QT_ACCESSIBILITY_SUPPORT)
@@ -289,7 +289,7 @@ private:
 };
 
 #define Q_DEFINED_QACCESSIBLE_OBJECT
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif //QT_ACCESSIBILITY_SUPPORT
 
 #endif //TQACCESSIBLE_H
diff --git a/src/kernel/qapplication.h b/src/kernel/ntqapplication.h
index 6e62b4576..2ab779760 100644
--- a/src/kernel/qapplication.h
+++ b/src/kernel/ntqapplication.h
@@ -42,12 +42,12 @@
 #define TQAPPLICATION_H
 
 #ifndef QT_H
-#include "qdesktopwidget.h"
-#include "qasciidict.h"
-#include "qpalette.h"
-#include "qtranslator.h"
-#include "qstrlist.h"
-#include "qstringlist.h"
+#include "ntqdesktopwidget.h"
+#include "ntqasciidict.h"
+#include "ntqpalette.h"
+#include "ntqtranslator.h"
+#include "ntqstrlist.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 class TQSessionManager;
diff --git a/src/kernel/qasyncimageio.h b/src/kernel/ntqasyncimageio.h
index 9767b3d94..25401c06e 100644
--- a/src/kernel/qasyncimageio.h
+++ b/src/kernel/ntqasyncimageio.h
@@ -42,7 +42,7 @@
 #define TQASYNCIMAGEIO_H
 
 #ifndef QT_H
-#include "qimage.h"
+#include "ntqimage.h"
 #endif // QT_H
 
 #ifndef QT_NO_ASYNC_IMAGE_IO
diff --git a/src/kernel/qasyncio.h b/src/kernel/ntqasyncio.h
index 8f1319d96..878b2f75a 100644
--- a/src/kernel/qasyncio.h
+++ b/src/kernel/ntqasyncio.h
@@ -42,9 +42,9 @@
 #define TQASYNCIO_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qsignal.h"
-#include "qtimer.h"
+#include "ntqobject.h"
+#include "ntqsignal.h"
+#include "ntqtimer.h"
 #endif // QT_H
 
 #ifndef QT_NO_ASYNC_IO
diff --git a/src/kernel/qbitmap.h b/src/kernel/ntqbitmap.h
index 3612989fe..90fe694e4 100644
--- a/src/kernel/qbitmap.h
+++ b/src/kernel/ntqbitmap.h
@@ -42,7 +42,7 @@
 #define TQBITMAP_H
 
 #ifndef QT_H
-#include "qpixmap.h"
+#include "ntqpixmap.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qbrush.h b/src/kernel/ntqbrush.h
index c401a212c..72c61d4e6 100644
--- a/src/kernel/qbrush.h
+++ b/src/kernel/ntqbrush.h
@@ -42,8 +42,8 @@
 #define TQBRUSH_H
 
 #ifndef QT_H
-#include "qcolor.h"
-#include "qshared.h"
+#include "ntqcolor.h"
+#include "ntqshared.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qclipboard.h b/src/kernel/ntqclipboard.h
index e84aa37c4..f61005d9c 100644
--- a/src/kernel/qclipboard.h
+++ b/src/kernel/ntqclipboard.h
@@ -42,8 +42,8 @@
 #define TQCLIPBOARD_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qobject.h"
+#include "ntqwindowdefs.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 #ifndef QT_NO_CLIPBOARD
diff --git a/src/kernel/qcolor.h b/src/kernel/ntqcolor.h
index 125a257d7..fd9e7630b 100644
--- a/src/kernel/qcolor.h
+++ b/src/kernel/ntqcolor.h
@@ -42,8 +42,8 @@
 #define TQCOLOR_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qstringlist.h"
+#include "ntqwindowdefs.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 const TQRgb  RGB_MASK    = 0x00ffffff;		// masks RGB values
diff --git a/src/kernel/qconnection.h b/src/kernel/ntqconnection.h
index 7ad0cb6b0..db562210e 100644
--- a/src/kernel/qconnection.h
+++ b/src/kernel/ntqconnection.h
@@ -42,7 +42,7 @@
 #define TQCONNECTION_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 class Q_EXPORT TQConnection
@@ -74,5 +74,5 @@ private:	// Disabled copy constructor and operator=
 };
 
 #define Q_DEFINED_QCONNECTION
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQCONNECTION_H
diff --git a/src/kernel/qcursor.h b/src/kernel/ntqcursor.h
index 4bd4f8904..70c91e95b 100644
--- a/src/kernel/qcursor.h
+++ b/src/kernel/ntqcursor.h
@@ -42,8 +42,8 @@
 #define TQCURSOR_H
 
 #ifndef QT_H
-#include "qpoint.h"
-#include "qshared.h"
+#include "ntqpoint.h"
+#include "ntqshared.h"
 #endif // QT_H
 
 /*
diff --git a/src/kernel/qdesktopwidget.h b/src/kernel/ntqdesktopwidget.h
index 71fc28834..cf24fe6ca 100644
--- a/src/kernel/qdesktopwidget.h
+++ b/src/kernel/ntqdesktopwidget.h
@@ -40,7 +40,7 @@
 #define TQDESKTOPWIDGET_H
 
 #ifndef QT_H
-#include "qwidget.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 class TQApplication;
diff --git a/src/kernel/qdragobject.h b/src/kernel/ntqdragobject.h
index a392245b8..303ceb99f 100644
--- a/src/kernel/qdragobject.h
+++ b/src/kernel/ntqdragobject.h
@@ -46,10 +46,10 @@ class TQStoredDragData;
 class TQImageDragData;
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qimage.h"
-#include "qstrlist.h"
-#include "qcolor.h"
+#include "ntqobject.h"
+#include "ntqimage.h"
+#include "ntqstrlist.h"
+#include "ntqcolor.h"
 #endif // QT_H
 
 #ifndef QT_NO_MIME
diff --git a/src/kernel/qdrawutil.h b/src/kernel/ntqdrawutil.h
index f75cab52c..2d3e1fefd 100644
--- a/src/kernel/qdrawutil.h
+++ b/src/kernel/ntqdrawutil.h
@@ -42,8 +42,8 @@
 #define TQDRAWUTIL_H
 
 #ifndef QT_H
-#include "qnamespace.h"
-#include "qstring.h" // char*->TQString conversion
+#include "ntqnamespace.h"
+#include "ntqstring.h" // char*->TQString conversion
 #endif // QT_H
 
 class TQPainter;
diff --git a/src/kernel/qdropsite.h b/src/kernel/ntqdropsite.h
index 0099bb2a2..952be802c 100644
--- a/src/kernel/qdropsite.h
+++ b/src/kernel/ntqdropsite.h
@@ -41,7 +41,7 @@
 
 #ifndef QT_H
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 #endif
 
diff --git a/src/kernel/qevent.h b/src/kernel/ntqevent.h
index 8f444f8f0..08dc69b6c 100644
--- a/src/kernel/qevent.h
+++ b/src/kernel/ntqevent.h
@@ -42,11 +42,11 @@
 #define TQEVENT_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qregion.h"
-#include "qnamespace.h"
-#include "qmime.h"
-#include "qpair.h"
+#include "ntqwindowdefs.h"
+#include "ntqregion.h"
+#include "ntqnamespace.h"
+#include "ntqmime.h"
+#include "ntqpair.h"
 #endif // QT_H
 
 class Q_EXPORT TQEvent: public TQt		// event base class
diff --git a/src/kernel/qeventloop.h b/src/kernel/ntqeventloop.h
index eae247846..2a98a33e2 100644
--- a/src/kernel/qeventloop.h
+++ b/src/kernel/ntqeventloop.h
@@ -40,8 +40,8 @@
 #define TQEVENTLOOP_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qsocketnotifier.h"
+#include "ntqobject.h"
+#include "ntqsocketnotifier.h"
 #endif // QT_H
 
 class TQEventLoopPrivate;
diff --git a/src/kernel/qfocusdata.h b/src/kernel/ntqfocusdata.h
index f3e69a3de..8a44a5031 100644
--- a/src/kernel/qfocusdata.h
+++ b/src/kernel/ntqfocusdata.h
@@ -42,7 +42,7 @@
 #define TQFOCUSDATA_H
 
 #ifndef QT_H
-#include "qwidgetlist.h"
+#include "ntqwidgetlist.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qfont.h b/src/kernel/ntqfont.h
index ddb763da6..0d205410e 100644
--- a/src/kernel/qfont.h
+++ b/src/kernel/ntqfont.h
@@ -42,8 +42,8 @@
 #define TQFONT_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qstring.h"
+#include "ntqwindowdefs.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 
@@ -201,7 +201,7 @@ public:
 
 
     // a copy of this lives in qunicodetables.cpp, as we can't include
-    // qfont.h it in tools/. Do not modify without changing the script
+    // ntqfont.h it in tools/. Do not modify without changing the script
     // enum in qunicodetable_p.h aswell.
     enum Script {
 	// European Alphabetic Scripts
diff --git a/src/kernel/qfontdatabase.h b/src/kernel/ntqfontdatabase.h
index 04d44f92a..482e36634 100644
--- a/src/kernel/qfontdatabase.h
+++ b/src/kernel/ntqfontdatabase.h
@@ -42,11 +42,11 @@
 #define TQFONTDATABASE_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qstring.h"
-#include "qstringlist.h"
-#include "qfont.h"
-#include "qvaluelist.h"
+#include "ntqwindowdefs.h"
+#include "ntqstring.h"
+#include "ntqstringlist.h"
+#include "ntqfont.h"
+#include "ntqvaluelist.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qfontinfo.h b/src/kernel/ntqfontinfo.h
index bc29d280b..175aaa320 100644
--- a/src/kernel/qfontinfo.h
+++ b/src/kernel/ntqfontinfo.h
@@ -42,7 +42,7 @@
 #define TQFONTINFO_H
 
 #ifndef QT_H
-#include "qfont.h"
+#include "ntqfont.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qfontmetrics.h b/src/kernel/ntqfontmetrics.h
index 7e1f46f10..7c8c7b610 100644
--- a/src/kernel/qfontmetrics.h
+++ b/src/kernel/ntqfontmetrics.h
@@ -42,8 +42,8 @@
 #define TQFONTMETRICS_H
 
 #ifndef QT_H
-#include "qfont.h"
-#include "qrect.h"
+#include "ntqfont.h"
+#include "ntqrect.h"
 #endif // QT_H
 
 #ifdef Q_WS_QWS
diff --git a/src/kernel/qgif.h b/src/kernel/ntqgif.h
index be5a3de72..f5fee77be 100644
--- a/src/kernel/qgif.h
+++ b/src/kernel/ntqgif.h
@@ -49,7 +49,7 @@
 #define TQGIF_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 #ifndef QT_BUILTIN_GIF_READER
diff --git a/src/kernel/qgplugin.h b/src/kernel/ntqgplugin.h
index 354122bca..d7bbcbee0 100644
--- a/src/kernel/qgplugin.h
+++ b/src/kernel/ntqgplugin.h
@@ -52,7 +52,7 @@
 //
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 #ifndef QT_NO_COMPONENT
diff --git a/src/kernel/qguardedptr.h b/src/kernel/ntqguardedptr.h
index f08c086f3..21a4d154f 100644
--- a/src/kernel/qguardedptr.h
+++ b/src/kernel/ntqguardedptr.h
@@ -42,7 +42,7 @@
 #define TQGUARDEDPTR_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 // ### 4.0: rename to something without Private in it. Not really internal.
@@ -140,5 +140,5 @@ inline TQObject* TQGuardedPtrPrivate::object() const
 }
 
 #define Q_DEFINED_QGUARDEDPTR
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif
diff --git a/src/kernel/qiconset.h b/src/kernel/ntqiconset.h
index 0aa01e95d..7ecbfa52a 100644
--- a/src/kernel/qiconset.h
+++ b/src/kernel/ntqiconset.h
@@ -42,8 +42,8 @@
 #define TQICONSET_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qpixmap.h"
+#include "ntqobject.h"
+#include "ntqpixmap.h"
 #endif // QT_H
 
 #ifndef QT_NO_ICONSET
diff --git a/src/kernel/qimage.h b/src/kernel/ntqimage.h
index 057bfb8ca..34b585b7e 100644
--- a/src/kernel/qimage.h
+++ b/src/kernel/ntqimage.h
@@ -42,9 +42,9 @@
 #define TQIMAGE_H
 
 #ifndef QT_H
-#include "qpixmap.h"
-#include "qstrlist.h"
-#include "qstringlist.h"
+#include "ntqpixmap.h"
+#include "ntqstrlist.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 class TQImageDataMisc; // internal
diff --git a/src/kernel/qimageformatplugin.h b/src/kernel/ntqimageformatplugin.h
index ac973210e..db9fb3806 100644
--- a/src/kernel/qimageformatplugin.h
+++ b/src/kernel/ntqimageformatplugin.h
@@ -40,8 +40,8 @@
 #define TQIMAGEFORMATPLUGIN_H
 
 #ifndef QT_H
-#include "qgplugin.h"
-#include "qstringlist.h"
+#include "ntqgplugin.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_IMAGEFORMATPLUGIN
diff --git a/src/kernel/qinputcontext.h b/src/kernel/ntqinputcontext.h
index e06624e17..cc3eafae9 100644
--- a/src/kernel/qinputcontext.h
+++ b/src/kernel/ntqinputcontext.h
@@ -1,5 +1,5 @@
 /****************************************************************************
-** $Id: qinputcontext.h,v 1.8 2004/06/22 06:47:30 daisuke Exp $
+** $Id: ntqinputcontext.h,v 1.8 2004/06/22 06:47:30 daisuke Exp $
 **
 ** Definition of TQInputContext
 **
@@ -39,15 +39,15 @@
 #ifndef QT_NO_IM
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qglobal.h"
-#include "qevent.h"
-#include "qstring.h"
+#include "ntqobject.h"
+#include "ntqglobal.h"
+#include "ntqevent.h"
+#include "ntqstring.h"
 #if (QT_VERSION-0 >= 0x040000)
-#include "qlist.h"
-#include "qaction.h"
+#include "ntqlist.h"
+#include "ntqaction.h"
 #else
-#include "qptrlist.h"
+#include "ntqptrlist.h"
 #endif
 #endif
 
diff --git a/src/kernel/qjpegio.h b/src/kernel/ntqjpegio.h
index 9610bafe8..43e240296 100644
--- a/src/kernel/qjpegio.h
+++ b/src/kernel/ntqjpegio.h
@@ -41,7 +41,7 @@
 #ifndef TQJPEGIO_H
 #define TQJPEGIO_H
 
-#include "qglobal.h"
+#include "ntqglobal.h"
 
 #ifndef QT_NO_IMAGEIO_JPEG
 
diff --git a/src/kernel/qkeycode.h b/src/kernel/ntqkeycode.h
index dff86f893..bca9305ba 100644
--- a/src/kernel/qkeycode.h
+++ b/src/kernel/ntqkeycode.h
@@ -42,7 +42,7 @@
 #define TQKEYCODE_H
 
 #ifndef QT_H
-#include "qnamespace.h"
+#include "ntqnamespace.h"
 #endif // QT_H
 
 // all key codes are now in the TQt namespace class
diff --git a/src/kernel/qkeysequence.h b/src/kernel/ntqkeysequence.h
index 3a845efff..f77bebc59 100644
--- a/src/kernel/qkeysequence.h
+++ b/src/kernel/ntqkeysequence.h
@@ -43,8 +43,8 @@
 
 #ifndef QT_H
 #ifndef QT_H
-#include "qnamespace.h"
-#include "qstring.h"
+#include "ntqnamespace.h"
+#include "ntqstring.h"
 #endif // QT_H
 #endif
 
diff --git a/src/kernel/qlayout.h b/src/kernel/ntqlayout.h
index 798c9c867..c461724a1 100644
--- a/src/kernel/qlayout.h
+++ b/src/kernel/ntqlayout.h
@@ -42,9 +42,9 @@
 #define TQLAYOUT_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qsizepolicy.h"
-#include "qwidget.h"
+#include "ntqobject.h"
+#include "ntqsizepolicy.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 #include <limits.h>
diff --git a/src/kernel/qlocalfs.h b/src/kernel/ntqlocalfs.h
index 56c0ece3e..ac1d6c189 100644
--- a/src/kernel/qlocalfs.h
+++ b/src/kernel/ntqlocalfs.h
@@ -42,8 +42,8 @@
 #define TQLOCALFS_H
 
 #ifndef QT_H
-#include "qnetworkprotocol.h"
-#include "qdir.h"
+#include "ntqnetworkprotocol.h"
+#include "ntqdir.h"
 #endif // QT_H
 
 #ifndef QT_NO_NETWORKPROTOCOL
diff --git a/src/kernel/qmetaobject.h b/src/kernel/ntqmetaobject.h
index d2ce0ccc7..e269024b6 100644
--- a/src/kernel/qmetaobject.h
+++ b/src/kernel/ntqmetaobject.h
@@ -42,8 +42,8 @@
 #define TQMETAOBJECT_H
 
 #ifndef QT_H
-#include "qconnection.h"
-#include "qstrlist.h"
+#include "ntqconnection.h"
+#include "ntqstrlist.h"
 #endif // QT_H
 
 #ifndef Q_MOC_OUTPUT_REVISION
diff --git a/src/kernel/qmime.h b/src/kernel/ntqmime.h
index 0ea9b8d1b..60fdbc247 100644
--- a/src/kernel/qmime.h
+++ b/src/kernel/ntqmime.h
@@ -42,8 +42,8 @@
 #define TQMIME_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qmap.h"
+#include "ntqwindowdefs.h"
+#include "ntqmap.h"
 #endif // QT_H
 
 #ifndef QT_NO_MIME
@@ -125,7 +125,7 @@ private:
 #if defined(Q_WS_WIN)
 
 #ifndef QT_H
-#include "qptrlist.h" // down here for GCC 2.7.* compatibility
+#include "ntqptrlist.h" // down here for GCC 2.7.* compatibility
 #endif // QT_H
 
 /*
@@ -161,7 +161,7 @@ public:
 #if defined(Q_WS_MAC)
 
 #ifndef QT_H
-#include "qptrlist.h" // down here for GCC 2.7.* compatibility
+#include "ntqptrlist.h" // down here for GCC 2.7.* compatibility
 #endif // QT_H
 
 /*
diff --git a/src/kernel/qmngio.h b/src/kernel/ntqmngio.h
index 76f5abf69..76f5abf69 100644
--- a/src/kernel/qmngio.h
+++ b/src/kernel/ntqmngio.h
diff --git a/src/kernel/qmovie.h b/src/kernel/ntqmovie.h
index db75ac331..9f5238fc7 100644
--- a/src/kernel/qmovie.h
+++ b/src/kernel/ntqmovie.h
@@ -42,7 +42,7 @@
 #define TQMOVIE_H
 
 #ifndef QT_H
-#include "qpixmap.h" // ### remove or keep for users' convenience?
+#include "ntqpixmap.h" // ### remove or keep for users' convenience?
 #endif // QT_H
 
 #ifndef QT_NO_MOVIE
diff --git a/src/kernel/qnamespace.h b/src/kernel/ntqnamespace.h
index 85a327f3e..8e49c580c 100644
--- a/src/kernel/qnamespace.h
+++ b/src/kernel/ntqnamespace.h
@@ -42,7 +42,7 @@
 #define TQNAMESPACE_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qnetworkprotocol.h b/src/kernel/ntqnetworkprotocol.h
index 1d5635545..28e431eb5 100644
--- a/src/kernel/qnetworkprotocol.h
+++ b/src/kernel/ntqnetworkprotocol.h
@@ -42,10 +42,10 @@
 #define TQNETWORKPROTOCOL_H
 
 #ifndef QT_H
-#include "qurlinfo.h"
-#include "qstring.h"
-#include "qdict.h"
-#include "qobject.h"
+#include "ntqurlinfo.h"
+#include "ntqstring.h"
+#include "ntqdict.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 #ifndef QT_NO_NETWORKPROTOCOL
diff --git a/src/kernel/qobject.h b/src/kernel/ntqobject.h
index 4d19f91ad..804e6f1af 100644
--- a/src/kernel/qobject.h
+++ b/src/kernel/ntqobject.h
@@ -42,11 +42,11 @@
 #define TQOBJECT_H
 
 #ifndef QT_H
-#include "qobjectdefs.h"
-#include "qwindowdefs.h"
-#include "qstring.h"
-#include "qevent.h"
-#include "qnamespace.h"
+#include "ntqobjectdefs.h"
+#include "ntqwindowdefs.h"
+#include "ntqstring.h"
+#include "ntqevent.h"
+#include "ntqnamespace.h"
 #endif // QT_H
 
 #define QT_TR_NOOP(x) (x)
@@ -261,5 +261,5 @@ inline TQString TQObject::trUtf8( const char *sourceText, const char * ) {
 
 
 #define Q_DEFINED_QOBJECT
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQOBJECT_H
diff --git a/src/kernel/qobjectcleanuphandler.h b/src/kernel/ntqobjectcleanuphandler.h
index 24ffc139c..464fd7bf7 100644
--- a/src/kernel/qobjectcleanuphandler.h
+++ b/src/kernel/ntqobjectcleanuphandler.h
@@ -40,7 +40,7 @@
 #define TQOBJECTCLEANUPHANDLER_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 class TQObjectList;
diff --git a/src/kernel/qobjectdefs.h b/src/kernel/ntqobjectdefs.h
index 8402afe50..3b4b71e1d 100644
--- a/src/kernel/qobjectdefs.h
+++ b/src/kernel/ntqobjectdefs.h
@@ -42,7 +42,7 @@
 #define TQOBJECTDEFS_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qobjectdict.h b/src/kernel/ntqobjectdict.h
index f8642d8d4..b3fcd282e 100644
--- a/src/kernel/qobjectdict.h
+++ b/src/kernel/ntqobjectdict.h
@@ -42,8 +42,8 @@
 #define TQOBJECTDICT_H
 
 #ifndef QT_H
-#include "qmetaobject.h"
-#include "qasciidict.h"
+#include "ntqmetaobject.h"
+#include "ntqasciidict.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qobjectlist.h b/src/kernel/ntqobjectlist.h
index 0bc59711d..c1d8f7982 100644
--- a/src/kernel/qobjectlist.h
+++ b/src/kernel/ntqobjectlist.h
@@ -42,8 +42,8 @@
 #define TQOBJECTLIST_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qptrlist.h"
+#include "ntqobject.h"
+#include "ntqptrlist.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qpaintdevice.h b/src/kernel/ntqpaintdevice.h
index 84384f19c..771aff492 100644
--- a/src/kernel/qpaintdevice.h
+++ b/src/kernel/ntqpaintdevice.h
@@ -42,8 +42,8 @@
 #define TQPAINTDEVICE_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qrect.h"
+#include "ntqwindowdefs.h"
+#include "ntqrect.h"
 #endif // QT_H
 
 #if defined(Q_WS_QWS)
diff --git a/src/kernel/qpaintdevicedefs.h b/src/kernel/ntqpaintdevicedefs.h
index 165439f8c..beb0c09db 100644
--- a/src/kernel/qpaintdevicedefs.h
+++ b/src/kernel/ntqpaintdevicedefs.h
@@ -42,7 +42,7 @@
 #define TQPAINTDEVICEDEFS_H
 
 #error "this file is gone.  the #defines it contained are in"
-#error "q1xcompatibility.h; the functionality is in TQPaintDevice"
+#error "ntq1xcompatibility.h; the functionality is in TQPaintDevice"
 #error "and TQPaintDeviceMetrics."
 
 #endif // TQPAINTDEVICEDEFS_H
diff --git a/src/kernel/qpaintdevicemetrics.h b/src/kernel/ntqpaintdevicemetrics.h
index 50856f244..e618a1d26 100644
--- a/src/kernel/qpaintdevicemetrics.h
+++ b/src/kernel/ntqpaintdevicemetrics.h
@@ -42,7 +42,7 @@
 #define TQPAINTDEVICEMETRICS_H
 
 #ifndef QT_H
-#include "qpaintdevice.h"
+#include "ntqpaintdevice.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qpainter.h b/src/kernel/ntqpainter.h
index e81cc1731..bcccdb59e 100644
--- a/src/kernel/qpainter.h
+++ b/src/kernel/ntqpainter.h
@@ -43,14 +43,14 @@
 
 
 #ifndef QT_H
-#include "qcolor.h"
-#include "qfontmetrics.h"
-#include "qfontinfo.h"
-#include "qregion.h"
-#include "qpen.h"
-#include "qbrush.h"
-#include "qpointarray.h"
-#include "qwmatrix.h"
+#include "ntqcolor.h"
+#include "ntqfontmetrics.h"
+#include "ntqfontinfo.h"
+#include "ntqregion.h"
+#include "ntqpen.h"
+#include "ntqbrush.h"
+#include "ntqpointarray.h"
+#include "ntqwmatrix.h"
 #endif // QT_H
 
 class TQGfx;
diff --git a/src/kernel/qpalette.h b/src/kernel/ntqpalette.h
index 2d3360546..b3b155f25 100644
--- a/src/kernel/qpalette.h
+++ b/src/kernel/ntqpalette.h
@@ -42,10 +42,10 @@
 #define TQPALETTE_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qcolor.h"
-#include "qshared.h"
-#include "qbrush.h" // TQColor->TQBrush conversion
+#include "ntqwindowdefs.h"
+#include "ntqcolor.h"
+#include "ntqshared.h"
+#include "ntqbrush.h" // TQColor->TQBrush conversion
 #endif // QT_H
 
 #ifndef QT_NO_PALETTE
diff --git a/src/kernel/qpen.h b/src/kernel/ntqpen.h
index 93d98d200..e92a7cc06 100644
--- a/src/kernel/qpen.h
+++ b/src/kernel/ntqpen.h
@@ -42,8 +42,8 @@
 #define TQPEN_H
 
 #ifndef QT_H
-#include "qcolor.h"
-#include "qshared.h"
+#include "ntqcolor.h"
+#include "ntqshared.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qpicture.h b/src/kernel/ntqpicture.h
index 7322bb936..9a76a7b5d 100644
--- a/src/kernel/qpicture.h
+++ b/src/kernel/ntqpicture.h
@@ -42,8 +42,8 @@
 #define TQPICTURE_H
 
 #ifndef QT_H
-#include "qpaintdevice.h"
-#include "qbuffer.h"
+#include "ntqpaintdevice.h"
+#include "ntqbuffer.h"
 #endif // QT_H
 
 #ifndef QT_NO_PICTURE
diff --git a/src/kernel/qpixmap.h b/src/kernel/ntqpixmap.h
index 89496e7a3..abf203690 100644
--- a/src/kernel/qpixmap.h
+++ b/src/kernel/ntqpixmap.h
@@ -42,10 +42,10 @@
 #define TQPIXMAP_H
 
 #ifndef QT_H
-#include "qpaintdevice.h"
-#include "qcolor.h" // char*->TQColor conversion
-#include "qstring.h" // char*->TQString conversion
-#include "qnamespace.h"
+#include "ntqpaintdevice.h"
+#include "ntqcolor.h" // char*->TQColor conversion
+#include "ntqstring.h" // char*->TQString conversion
+#include "ntqnamespace.h"
 #endif // QT_H
 
 class TQGfx;
diff --git a/src/kernel/qpixmapcache.h b/src/kernel/ntqpixmapcache.h
index 47e729cf4..29bcb82e0 100644
--- a/src/kernel/qpixmapcache.h
+++ b/src/kernel/ntqpixmapcache.h
@@ -42,7 +42,7 @@
 #define TQPIXMAPCACHE_H
 
 #ifndef QT_H
-#include "qpixmap.h"
+#include "ntqpixmap.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qpngio.h b/src/kernel/ntqpngio.h
index 1a9d5c291..ce41e7d55 100644
--- a/src/kernel/qpngio.h
+++ b/src/kernel/ntqpngio.h
@@ -42,7 +42,7 @@
 #define TQPNGIO_H
 
 #ifndef QT_H
-#include "qimage.h"
+#include "ntqimage.h"
 #endif // QT_H
 
 #ifndef QT_NO_IMAGEIO_PNG
diff --git a/src/kernel/qpoint.h b/src/kernel/ntqpoint.h
index cab2ee797..731683a4c 100644
--- a/src/kernel/qpoint.h
+++ b/src/kernel/ntqpoint.h
@@ -42,7 +42,7 @@
 #define TQPOINT_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
+#include "ntqwindowdefs.h"
 #endif // QT_H
 
 
@@ -215,5 +215,5 @@ inline const TQPoint operator/( const TQPoint &p, double c )
 }
 
 #define Q_DEFINED_QPOINT
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQPOINT_H
diff --git a/src/kernel/qpointarray.h b/src/kernel/ntqpointarray.h
index a78023b80..a0aa8ea74 100644
--- a/src/kernel/qpointarray.h
+++ b/src/kernel/ntqpointarray.h
@@ -42,8 +42,8 @@
 #define TQPOINTARRAY_H
 
 #ifndef QT_H
-#include "qmemarray.h"
-#include "qpoint.h"
+#include "ntqmemarray.h"
+#include "ntqpoint.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qpolygonscanner.h b/src/kernel/ntqpolygonscanner.h
index be6369891..276f9afcb 100644
--- a/src/kernel/qpolygonscanner.h
+++ b/src/kernel/ntqpolygonscanner.h
@@ -42,7 +42,7 @@
 #define TQPOLYGONSCANNER_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 class TQPointArray;
diff --git a/src/kernel/qprinter.h b/src/kernel/ntqprinter.h
index b08b97cb5..fa7b9caa8 100644
--- a/src/kernel/qprinter.h
+++ b/src/kernel/ntqprinter.h
@@ -42,9 +42,9 @@
 #define TQPRINTER_H
 
 #ifndef QT_H
-#include "qpaintdevice.h"
-#include "qstring.h"
-#include "qstringlist.h"
+#include "ntqpaintdevice.h"
+#include "ntqstring.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #ifndef QT_NO_PRINTER
diff --git a/src/kernel/qprocess.h b/src/kernel/ntqprocess.h
index 9a710df76..e9a77e3ed 100644
--- a/src/kernel/qprocess.h
+++ b/src/kernel/ntqprocess.h
@@ -42,9 +42,9 @@
 #define TQPROCESS_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qstringlist.h"
-#include "qdir.h"
+#include "ntqobject.h"
+#include "ntqstringlist.h"
+#include "ntqdir.h"
 #endif // QT_H
 
 #ifndef QT_NO_PROCESS
diff --git a/src/kernel/qrect.h b/src/kernel/ntqrect.h
index b1ab9090e..426c17560 100644
--- a/src/kernel/qrect.h
+++ b/src/kernel/ntqrect.h
@@ -42,7 +42,7 @@
 #define TQRECT_H
 
 #ifndef QT_H
-#include "qsize.h"
+#include "ntqsize.h"
 #endif // QT_H
 
 #if defined(topLeft)
@@ -272,5 +272,5 @@ inline bool TQRect::contains( int x, int y ) const
 	   y >= y1 && y <= y2;
 }
 #define Q_DEFINED_QRECT
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQRECT_H
diff --git a/src/kernel/qregion.h b/src/kernel/ntqregion.h
index 9b6557cbe..798b33cde 100644
--- a/src/kernel/qregion.h
+++ b/src/kernel/ntqregion.h
@@ -42,8 +42,8 @@
 #define TQREGION_H
 
 #ifndef QT_H
-#include "qshared.h"
-#include "qrect.h"
+#include "ntqshared.h"
+#include "ntqrect.h"
 #endif // QT_H
 
 #ifdef Q_WS_X11
diff --git a/src/kernel/qsession.h b/src/kernel/ntqsession.h
index 36fd657b8..36fd657b8 100644
--- a/src/kernel/qsession.h
+++ b/src/kernel/ntqsession.h
diff --git a/src/kernel/qsessionmanager.h b/src/kernel/ntqsessionmanager.h
index 865a13262..6a435c3a1 100644
--- a/src/kernel/qsessionmanager.h
+++ b/src/kernel/ntqsessionmanager.h
@@ -42,10 +42,10 @@
 #define TQSESSIONMANAGER_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qwindowdefs.h"
-#include "qstring.h"
-#include "qstringlist.h"
+#include "ntqobject.h"
+#include "ntqwindowdefs.h"
+#include "ntqstring.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 #ifndef QT_NO_SESSIONMANAGER
 
diff --git a/src/kernel/qsignal.h b/src/kernel/ntqsignal.h
index d5b4cd7e7..0664fe5d2 100644
--- a/src/kernel/qsignal.h
+++ b/src/kernel/ntqsignal.h
@@ -42,8 +42,8 @@
 #define TQSIGNAL_H
 
 #ifndef QT_H
-#include "qvariant.h"
-#include "qobject.h"
+#include "ntqvariant.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qsignalmapper.h b/src/kernel/ntqsignalmapper.h
index 1ad42890b..2b560a7cd 100644
--- a/src/kernel/qsignalmapper.h
+++ b/src/kernel/ntqsignalmapper.h
@@ -42,7 +42,7 @@
 #define TQSIGNALMAPPER_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 #ifndef QT_NO_SIGNALMAPPER
 class  TQSignalMapperData;
diff --git a/src/kernel/qsignalslotimp.h b/src/kernel/ntqsignalslotimp.h
index 7e8cf1d44..e1c3bf0f5 100644
--- a/src/kernel/qsignalslotimp.h
+++ b/src/kernel/ntqsignalslotimp.h
@@ -42,9 +42,9 @@
 #define TQSIGNALSLOTIMP_H
 
 #ifndef QT_H
-#include "qconnection.h"
-#include "qptrlist.h"
-#include "qptrvector.h"
+#include "ntqconnection.h"
+#include "ntqptrlist.h"
+#include "ntqptrvector.h"
 #endif // QT_H
 
 class Q_EXPORT TQConnectionList : public TQPtrList<TQConnection>
@@ -93,5 +93,5 @@ public:
 };
 
 #define Q_DEFINED_QCONNECTION_LIST
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // TQSIGNALSLOTIMP_H
diff --git a/src/kernel/qsimplerichtext.h b/src/kernel/ntqsimplerichtext.h
index 8860f114b..e8b479a8d 100644
--- a/src/kernel/qsimplerichtext.h
+++ b/src/kernel/ntqsimplerichtext.h
@@ -42,9 +42,9 @@
 #define TQSIMPLERICHTEXT_H
 
 #ifndef QT_H
-#include "qnamespace.h"
-#include "qstring.h"
-#include "qregion.h"
+#include "ntqnamespace.h"
+#include "ntqstring.h"
+#include "ntqregion.h"
 #endif // QT_H
 
 #ifndef QT_NO_RICHTEXT
diff --git a/src/kernel/qsize.h b/src/kernel/ntqsize.h
index a8b6fabe5..01905dfd3 100644
--- a/src/kernel/qsize.h
+++ b/src/kernel/ntqsize.h
@@ -42,14 +42,14 @@
 #define TQSIZE_H
 
 #ifndef QT_H
-#include "qpoint.h" // ### change to qwindowdefs.h?
+#include "ntqpoint.h" // ### change to ntqwindowdefs.h?
 #endif // QT_H
 
 class Q_EXPORT TQSize
 // ### Make TQSize inherit TQt in TQt 4.0
 {
 public:
-    // ### Move this enum to qnamespace.h in TQt 4.0
+    // ### Move this enum to ntqnamespace.h in TQt 4.0
     enum ScaleMode {
 	ScaleFree,
 	ScaleMin,
diff --git a/src/kernel/qsizegrip.h b/src/kernel/ntqsizegrip.h
index 2b8b6eca2..20fab72e0 100644
--- a/src/kernel/qsizegrip.h
+++ b/src/kernel/ntqsizegrip.h
@@ -42,7 +42,7 @@
 #define TQSIZEGRIP_H
 
 #ifndef QT_H
-#include "qwidget.h"
+#include "ntqwidget.h"
 #endif // QT_H
 
 #ifndef QT_NO_SIZEGRIP
diff --git a/src/kernel/qsizepolicy.h b/src/kernel/ntqsizepolicy.h
index 87099c32d..85b087a53 100644
--- a/src/kernel/qsizepolicy.h
+++ b/src/kernel/ntqsizepolicy.h
@@ -42,7 +42,7 @@
 #define TQSIZEPOLICY_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 // Documentation is in qabstractlayout.cpp.
diff --git a/src/kernel/qsocketnotifier.h b/src/kernel/ntqsocketnotifier.h
index ce3396f39..df92ce8ea 100644
--- a/src/kernel/qsocketnotifier.h
+++ b/src/kernel/ntqsocketnotifier.h
@@ -42,7 +42,7 @@
 #define TQSOCKETNOTIFIER_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qsound.h b/src/kernel/ntqsound.h
index 52bf794a9..3e4efda58 100644
--- a/src/kernel/qsound.h
+++ b/src/kernel/ntqsound.h
@@ -41,7 +41,7 @@
 #define TQSOUND_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 #ifndef QT_NO_SOUND
diff --git a/src/kernel/qstyle.h b/src/kernel/ntqstyle.h
index fec9522a9..f36ad8a2b 100644
--- a/src/kernel/qstyle.h
+++ b/src/kernel/ntqstyle.h
@@ -41,7 +41,7 @@
 #define TQSTYLE_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qstylesheet.h b/src/kernel/ntqstylesheet.h
index 4b7e31043..b73d6f0ae 100644
--- a/src/kernel/qstylesheet.h
+++ b/src/kernel/ntqstylesheet.h
@@ -42,11 +42,11 @@
 #define TQSTYLESHEET_H
 
 #ifndef QT_H
-#include "qstring.h"
-#include "qvaluelist.h"
-#include "qptrvector.h"
-#include "qdict.h"
-#include "qobject.h"
+#include "ntqstring.h"
+#include "ntqvaluelist.h"
+#include "ntqptrvector.h"
+#include "ntqdict.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 #ifndef QT_NO_RICHTEXT
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
new file mode 100644
index 000000000..6a2a54289
--- /dev/null
+++ b/src/kernel/ntqt.h
@@ -0,0 +1,375 @@
+/****************************************************************************
+**
+** TQt GUI Toolkit
+**
+** This header file efficiently includes all TQt GUI Toolkit functionality.
+**
+** Generated : Mon Oct 13 13:07:29 CEST 2003
+
+**
+** Copyright (C) 1995-2008 Trolltech ASA.  All rights reserved.
+**
+** This file is part of the TQt GUI Toolkit.
+**
+*****************************************************************************/
+
+#ifndef QT_H
+#define QT_H
+#include "ntqglobal.h"
+#include "ntqfeatures.h"
+#include "ntqshared.h"
+#include "ntqptrcollection.h"
+#include "ntqglist.h"
+#include "ntqobjectdefs.h"
+#include "ntqnamespace.h"
+#include "ntqgarray.h"
+#include "ntqmemarray.h"
+#include "ntqcstring.h"
+#include "ntqstring.h"
+#include "ntqptrlist.h"
+#include "ntqiodevice.h"
+#include "ntqkeysequence.h"
+#include "ntqwindowdefs.h"
+#include "ntqgdict.h"
+#include "ntqfont.h"
+#include "ntqdatastream.h"
+#include "ntqpair.h"
+#include "ntqpoint.h"
+#include <stdio.h>
+#include "ntqtextstream.h"
+#include "ntqfontinfo.h"
+#include "ntqsizepolicy.h"
+#include "ntqtl.h"
+#include "ntqsize.h"
+#include "ntqrect.h"
+#include "ntqbitarray.h"
+#include "ntqregion.h"
+#include "ntqsql.h"
+#include "ntqstrlist.h"
+#include "ntqvaluelist.h"
+#include "ntqmap.h"
+#include "ntqdatetime.h"
+#include "ntqmime.h"
+#include "ntqasciidict.h"
+#include "ntqpaintdevice.h"
+#include "ntqfontmetrics.h"
+#include "ntqdict.h"
+#include "ntqevent.h"
+#include "ntqhostaddress.h"
+#include "ntqstringlist.h"
+#include "ntqcolor.h"
+#include <ntqdom.h>
+#include "ntqobject.h"
+#include <ntqdrawutil.h>
+#include "ntqbrush.h"
+#include "ntqpalette.h"
+#include "ntqwidget.h"
+#include "ntqjpunicode.h"
+#include "ntqtextcodec.h"
+#include "ntqstyle.h"
+#include "ntqframe.h"
+#include "ntqfile.h"
+#include "ntqfileinfo.h"
+#include "ntqurlinfo.h"
+#include "ntqwidgetlist.h"
+#include <ntqcombobox.h>
+#include "ntqgroupbox.h"
+#include "ntqdialog.h"
+#include <ntqdataview.h>
+#include "ntqdockwindow.h"
+#include "ntqcommonstyle.h"
+#include "ntqnetworkprotocol.h"
+#include <ntqeuckrcodec.h>
+#include <ntqgb18030codec.h>
+#include "ntqgcache.h"
+#include "ntqpixmap.h"
+#include <ntqgif.h>
+#include <ntqglcolormap.h>
+#include <ntqcache.h>
+#include <ntqdropsite.h>
+#include "ntqgplugin.h"
+#include <ntqgrid.h>
+#include "ntqrangecontrol.h"
+#include "ntqbuttongroup.h"
+#include <ntqdatetimeedit.h>
+#include "ntqgvector.h"
+#include "ntqhbox.h"
+#include <ntqhbuttongroup.h>
+#include "ntqiconset.h"
+#include <ntqhgroupbox.h>
+#include "ntqsocketnotifier.h"
+#include <ntqeventloop.h>
+#include <ntqhttp.h>
+#include <ntqaction.h>
+#include "ntqbuffer.h"
+#include "ntqimage.h"
+#include <ntqimageformatplugin.h>
+#include "ntqlineedit.h"
+#include <ntqintcache.h>
+#include "ntqintdict.h"
+#include "ntqmotifstyle.h"
+#include "ntqpicture.h"
+#include <ntqjiscodec.h>
+#include <ntqeucjpcodec.h>
+#include <ntqkeycode.h>
+#include <ntqaccel.h>
+#include "ntqlabel.h"
+#include "ntqlayout.h"
+#include <ntqlcdnumber.h>
+#include <ntqlibrary.h>
+#include <ntqinputdialog.h>
+#include "ntqscrollbar.h"
+#include "ntqscrollview.h"
+#include "ntqdir.h"
+#include "ntqwindowsstyle.h"
+#include "ntqconnection.h"
+#include "ntqbitmap.h"
+#include "ntqvariant.h"
+#include "ntqsignal.h"
+#include <ntqmessagebox.h>
+#include "ntqmetaobject.h"
+#include "ntqheader.h"
+#include <ntqmotifplusstyle.h>
+#include <ntqcdestyle.h>
+#include <ntqmovie.h>
+#include "ntqptrvector.h"
+#include "ntqmutex.h"
+#include "ntqbutton.h"
+#include <ntqnetwork.h>
+#include <ntqftp.h>
+#include "ntqguardedptr.h"
+#include <ntqobjectcleanuphandler.h>
+#include "ntqsqlfield.h"
+#include <ntqobjectdict.h>
+#include <ntqobjectlist.h>
+#include <ntqcolordialog.h>
+#include <ntqpaintdevicemetrics.h>
+#include "ntqpointarray.h"
+#include "ntqmenudata.h"
+#include <ntqlistview.h>
+#include "ntqpen.h"
+#include "ntqdragobject.h"
+#include <ntqiconview.h>
+#include <ntqpixmapcache.h>
+#include <ntqplatinumstyle.h>
+#include <ntqpngio.h>
+#include <ntqcursor.h>
+#include <ntqerrormessage.h>
+#include <ntqpolygonscanner.h>
+#include "ntqpopupmenu.h"
+#include <ntqprintdialog.h>
+#include <ntqprinter.h>
+#include <ntqprocess.h>
+#include "ntqprogressbar.h"
+#include "ntqsemimodal.h"
+#include <ntqasciicache.h>
+#include "ntqptrdict.h"
+#include <ntqcleanuphandler.h>
+#include <ntqptrqueue.h>
+#include <ntqptrstack.h>
+#include "ntqstylesheet.h"
+#include <ntqpushbutton.h>
+#include <ntqradiobutton.h>
+#include <ntqdial.h>
+#include <ntqdockarea.h>
+#include "ntqregexp.h"
+#include <ntqclipboard.h>
+#include <ntqrtlcodec.h>
+#include <ntqlistbox.h>
+#include <ntqgridview.h>
+#include "ntqsemaphore.h"
+#include <ntqprogressdialog.h>
+#include "ntqsocketdevice.h"
+#include <ntqsessionmanager.h>
+#include <ntqsettings.h>
+#include <ntqsgistyle.h>
+#include <ntqfontdialog.h>
+#include "ntqtimer.h"
+#include <ntqsignalmapper.h>
+#include <ntqsignalslotimp.h>
+#include <ntqsimplerichtext.h>
+#include "ntqwmatrix.h"
+#include <ntqsizegrip.h>
+#include <ntqabstractlayout.h>
+#include <ntqsjiscodec.h>
+#include <ntqslider.h>
+#include <ntqsocket.h>
+#include <ntqserversocket.h>
+#include <ntqdns.h>
+#include <ntqsortedlist.h>
+#include <ntqsound.h>
+#include <ntqspinbox.h>
+#include <ntqsplashscreen.h>
+#include <ntqsplitter.h>
+#include "ntqsqlerror.h"
+#include "ntqeditorfactory.h"
+#include "ntqsqlquery.h"
+#include "ntqsqlrecord.h"
+#include <ntqsqldriverplugin.h>
+#include "ntqsqlindex.h"
+#include "ntqsqlcursor.h"
+#include <ntqsqldriver.h>
+#include <ntqsqlform.h>
+#include "ntqtable.h"
+#include <ntqsqlpropertymap.h>
+#include <ntqsqldatabase.h>
+#include <ntqdatabrowser.h>
+#include <ntqsqlresult.h>
+#include <ntqsqlselectcursor.h>
+#include <ntqstatusbar.h>
+#include <ntqmenubar.h>
+#include <ntqcanvas.h>
+#include "ntqtranslator.h"
+#include <ntqstrvec.h>
+#include <ntqinterlacestyle.h>
+#include <ntqstylefactory.h>
+#include <ntqstyleplugin.h>
+#include "ntqtextedit.h"
+#include <ntqsyntaxhighlighter.h>
+#include <ntqtabbar.h>
+#include <ntqtabdialog.h>
+#include "ntqsqleditorfactory.h"
+#include <ntqtabwidget.h>
+#include <ntqtextbrowser.h>
+#include <ntqbig5codec.h>
+#include <ntqtextcodecfactory.h>
+#include <ntqtextcodecplugin.h>
+#include <ntqmultilineedit.h>
+#include "ntqtoolbar.h"
+#include <ntqtextview.h>
+#include "ntqwaitcondition.h"
+#include <ntqasyncio.h>
+#include <ntqfontdatabase.h>
+#include <ntqmainwindow.h>
+#include <ntqtoolbox.h>
+#include <ntqtoolbutton.h>
+#include <ntqtooltip.h>
+#include "ntqdesktopwidget.h"
+#include <ntqtsciicodec.h>
+#include "ntqurl.h"
+#include "ntqurloperator.h"
+#include <ntqfiledialog.h>
+#include <ntqutfcodec.h>
+#include <ntquuid.h>
+#include <ntqvalidator.h>
+#include <ntqasyncimageio.h>
+#include <ntqvaluestack.h>
+#include <ntqvaluevector.h>
+#include <ntqdatatable.h>
+#include <ntqvbox.h>
+#include <ntqvbuttongroup.h>
+#include <ntqvfbhdr.h>
+#include <ntqvgroupbox.h>
+#include <ntqthread.h>
+#include <ntqwhatsthis.h>
+#include <ntqapplication.h>
+#include <ntqwidgetintdict.h>
+#include <ntqfocusdata.h>
+#include <ntqwidgetplugin.h>
+#include <ntqwidgetstack.h>
+#include <ntqcheckbox.h>
+#include <ntqcompactstyle.h>
+#include <ntqwizard.h>
+#include <ntqpainter.h>
+#include <ntqworkspace.h>
+#include <ntqlocalfs.h>
+#include <ntqxml.h>
+
+#if defined( QT_MOC_CPP ) || defined( QT_H_CPP ) || defined( Q_OS_MACX )
+#include <private/qcom_p.h>
+#include <private/qucom_p.h>
+#include "private/qgfxdriverinterface_p.h"
+#include "private/qcom_p.h"
+#include "private/qimageformatinterface_p.h"
+#include "private/qisciicodec_p.h"
+#include "private/qkbddriverinterface_p.h"
+#include "private/qlayoutengine_p.h"
+#include "private/qcomlibrary_p.h"
+#include "private/qmousedriverinterface_p.h"
+#include "private/qeffects_p.h"
+#include "private/qgpluginmanager_p.h"
+#include "private/qinternal_p.h"
+#include "private/qsqldriverinterface_p.h"
+#include "private/qsqlmanager_p.h"
+#include "private/qlock_p.h"
+#include "private/qcomponentfactory_p.h"
+#include "private/qstyleinterface_p.h"
+#include "private/qrichtext_p.h"
+#include "private/qsvgdevice_p.h"
+#include "private/qfontcodecs_p.h"
+#include "private/qtextcodecinterface_p.h"
+#include "private/qpsprinter_p.h"
+#include "private/qtitlebar_p.h"
+#include "private/qucom_p.h"
+#include "private/qucomextra_p.h"
+#include "private/qpluginmanager_p.h"
+#include "private/qdir_p.h"
+#include "private/qsettings_p.h"
+#include "private/qsqlextension_p.h"
+#include "private/qdialogbuttons_p.h"
+#include "private/qwidgetinterface_p.h"
+#include "private/qwidgetresizehandler_p.h"
+#include "private/qlibrary_p.h"
+#endif // Private headers
+
+
+#ifdef Q_WS_X11
+#include "private/qtkdeintegration_x11_p.h"
+#endif
+
+#ifdef Q_WS_MAC
+#include <qaquastyle.h>
+#include <qmacstyle_mac.h>
+#endif // Q_WS_MAC
+
+#ifdef Q_WS_WIN
+#include <qwindowsxpstyle.h>
+#endif
+
+#ifdef Q_WS_QWS
+#include <private/qtextengine_p.h>
+#include "qfontmanager_qws.h"
+#include <qfontfactorybdf_qws.h>
+#include <qgfxvoodoodefs_qws.h>
+#include <qgfxmatroxdefs_qws.h>
+#include <qgfxdriverplugin_qws.h>
+#include <qkbddriverfactory_qws.h>
+#include <qkbddriverplugin_qws.h>
+#include <qmousedriverfactory_qws.h>
+#include <qmousedriverplugin_qws.h>
+#include <qcopchannel_qws.h>
+#include <qdirectpainter_qws.h>
+#include "qmemorymanager_qws.h"
+#include <qmouse_qws.h>
+#include <qfontfactoryttf_qws.h>
+#ifndef Q_OS_MAC
+# include <qsoundqss_qws.h>
+#endif
+#include "qgfx_qws.h"
+#include <qgfxdriverfactory_qws.h>
+#include "qwsdisplay_qws.h"
+#include "qwssocket_qws.h"
+#include "qwsdecoration_qws.h"
+#include "qwsutils_qws.h"
+#include <qwscursor_qws.h>
+#include "qwsmanager_qws.h"
+#include "qwsdefaultdecoration_qws.h"
+#include <qgfxraster_qws.h>
+#include "qwscommand_qws.h"
+#include <qwshydrodecoration_qws.h>
+#include <qwskde2decoration_qws.h>
+#include <qwskdedecoration_qws.h>
+#include <qwsbeosdecoration_qws.h>
+#include "qwsproperty_qws.h"
+#include <qwsregionmanager_qws.h>
+#include "qwsevent_qws.h"
+#include <qwindowsystem_qws.h>
+#include <qwswindowsdecoration_qws.h>
+#endif // Q_WS_QWS
+
+
+#ifdef Q_WS_WCE
+#include <qpocketpcstyle_wce.h>
+#endif // Q_WS_WCE
+
+#endif // QT_H
diff --git a/src/kernel/qthread.h b/src/kernel/ntqthread.h
index 192772855..56480a3fb 100644
--- a/src/kernel/qthread.h
+++ b/src/kernel/ntqthread.h
@@ -44,11 +44,11 @@
 #if defined(QT_THREAD_SUPPORT)
 
 #ifndef QT_H
-#include "qwindowdefs.h"
+#include "ntqwindowdefs.h"
 #ifndef QT_NO_COMPAT
-#include "qmutex.h"
-#include "qsemaphore.h"
-#include "qwaitcondition.h"
+#include "ntqmutex.h"
+#include "ntqsemaphore.h"
+#include "ntqwaitcondition.h"
 #endif // QT_NO_COMPAT
 #endif // QT_H
 
diff --git a/src/kernel/qtimer.h b/src/kernel/ntqtimer.h
index 3767e1d35..103c65ab9 100644
--- a/src/kernel/qtimer.h
+++ b/src/kernel/ntqtimer.h
@@ -42,7 +42,7 @@
 #define TQTIMER_H
 
 #ifndef QT_H
-#include "qobject.h"
+#include "ntqobject.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qtranslator.h b/src/kernel/ntqtranslator.h
index 1d7273c2b..eccc8e4c1 100644
--- a/src/kernel/qtranslator.h
+++ b/src/kernel/ntqtranslator.h
@@ -43,8 +43,8 @@
 #define TQTRANSLATOR_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qvaluelist.h"
+#include "ntqobject.h"
+#include "ntqvaluelist.h"
 #endif // QT_H
 
 #ifndef QT_NO_TRANSLATION
diff --git a/src/kernel/qurl.h b/src/kernel/ntqurl.h
index a7430c9dd..5069849fe 100644
--- a/src/kernel/qurl.h
+++ b/src/kernel/ntqurl.h
@@ -42,7 +42,7 @@
 #define TQURL_H
 
 #ifndef QT_H
-#include "qstring.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #ifndef QT_NO_URL
diff --git a/src/kernel/qurlinfo.h b/src/kernel/ntqurlinfo.h
index bf6f751a2..18ef71c57 100644
--- a/src/kernel/qurlinfo.h
+++ b/src/kernel/ntqurlinfo.h
@@ -42,10 +42,10 @@
 #define TQURLINFO_H
 
 #ifndef QT_H
-#include "qdatetime.h"
-#include "qstring.h"
+#include "ntqdatetime.h"
+#include "ntqstring.h"
 #if defined(QT_ABI_QT4)
-#include "qiodevice.h"
+#include "ntqiodevice.h"
 #endif
 #endif // QT_H
 
diff --git a/src/kernel/qurloperator.h b/src/kernel/ntqurloperator.h
index 7b258161a..654cc313f 100644
--- a/src/kernel/qurloperator.h
+++ b/src/kernel/ntqurloperator.h
@@ -42,11 +42,11 @@
 #define TQURLOPERATOR_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qurl.h"
-#include "qptrlist.h"
-#include "qnetworkprotocol.h"
-#include "qstringlist.h" // TQString->TQStringList conversion
+#include "ntqobject.h"
+#include "ntqurl.h"
+#include "ntqptrlist.h"
+#include "ntqnetworkprotocol.h"
+#include "ntqstringlist.h" // TQString->TQStringList conversion
 #endif // QT_H
 
 #ifndef QT_NO_NETWORKPROTOCOL
diff --git a/src/kernel/qvariant.h b/src/kernel/ntqvariant.h
index 04cb4c24e..e7a09f5c1 100644
--- a/src/kernel/qvariant.h
+++ b/src/kernel/ntqvariant.h
@@ -42,7 +42,7 @@
 #define TQVARIANT_H
 
 #ifndef QT_H
-#include "qstring.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #ifndef QT_NO_VARIANT
@@ -319,9 +319,9 @@ public:
 
 // down here for GCC 2.7.* compatibility
 #ifndef QT_H
-#include "qvaluelist.h"
-#include "qstringlist.h"
-#include "qmap.h"
+#include "ntqvaluelist.h"
+#include "ntqstringlist.h"
+#include "ntqmap.h"
 #endif // QT_H
 
 inline TQVariant::Type TQVariant::type() const
diff --git a/src/kernel/qvfbhdr.h b/src/kernel/ntqvfbhdr.h
index 3f6cbe34c..300ace8bb 100644
--- a/src/kernel/qvfbhdr.h
+++ b/src/kernel/ntqvfbhdr.h
@@ -40,8 +40,8 @@
 #define TQVFBHDR_H
 
 #ifndef QT_H
-#include "qcolor.h"
-#include "qrect.h"
+#include "ntqcolor.h"
+#include "ntqrect.h"
 #endif // QT_H
 
 #define QT_VFB_MOUSE_PIPE	"/tmp/.qtvfb_mouse-%1"
diff --git a/src/kernel/qwidget.h b/src/kernel/ntqwidget.h
index 94c4a3af9..383ffc8e0 100644
--- a/src/kernel/qwidget.h
+++ b/src/kernel/ntqwidget.h
@@ -42,14 +42,14 @@
 #define TQWIDGET_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qobject.h"
-#include "qpaintdevice.h"
-#include "qpalette.h"
-#include "qfont.h"
-#include "qfontmetrics.h"
-#include "qfontinfo.h"
-#include "qsizepolicy.h"
+#include "ntqwindowdefs.h"
+#include "ntqobject.h"
+#include "ntqpaintdevice.h"
+#include "ntqpalette.h"
+#include "ntqfont.h"
+#include "ntqfontmetrics.h"
+#include "ntqfontinfo.h"
+#include "ntqsizepolicy.h"
 #endif // QT_H
 
 #if defined(Q_WS_X11) && !defined(QT_NO_IM)
@@ -1089,6 +1089,6 @@ struct Q_EXPORT TQWExtra {
 };
 
 #define Q_DEFINED_QWIDGET
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 
 #endif // TQWIDGET_H
diff --git a/src/kernel/qwidgetintdict.h b/src/kernel/ntqwidgetintdict.h
index 7fcc592f6..512f7830e 100644
--- a/src/kernel/qwidgetintdict.h
+++ b/src/kernel/ntqwidgetintdict.h
@@ -42,8 +42,8 @@
 #define TQWIDGETINTDICT_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qintdict.h"
+#include "ntqwidget.h"
+#include "ntqintdict.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/qwidgetlist.h b/src/kernel/ntqwidgetlist.h
index 14a1bfd8a..03e40b7cf 100644
--- a/src/kernel/qwidgetlist.h
+++ b/src/kernel/ntqwidgetlist.h
@@ -42,8 +42,8 @@
 #define TQWIDGETLIST_H
 
 #ifndef QT_H
-#include "qwidget.h"
-#include "qptrlist.h"
+#include "ntqwidget.h"
+#include "ntqptrlist.h"
 #endif // QT_H
 
 class Q_EXPORT TQWidgetList : public TQPtrList<TQWidget>
diff --git a/src/kernel/qwindowdefs.h b/src/kernel/ntqwindowdefs.h
index 426ca1d37..bbc317570 100644
--- a/src/kernel/qwindowdefs.h
+++ b/src/kernel/ntqwindowdefs.h
@@ -43,9 +43,9 @@
 #define TQWINDOWDEFS_H
 
 #ifndef QT_H
-#include "qobjectdefs.h"
-#include "qstring.h"
-#include "qnamespace.h"
+#include "ntqobjectdefs.h"
+#include "ntqstring.h"
+#include "ntqnamespace.h"
 #endif // QT_H
 
 // Class forward definitions
@@ -84,7 +84,7 @@ class TQTime;
 class TQClipboard;
 
 
-// Widget list (defined in qwidgetlist.h)
+// Widget list (defined in ntqwidgetlist.h)
 
 class TQWidgetList;
 class TQWidgetListIt;
diff --git a/src/kernel/qwmatrix.h b/src/kernel/ntqwmatrix.h
index 0cf1a4a8b..bb3042f3d 100644
--- a/src/kernel/qwmatrix.h
+++ b/src/kernel/ntqwmatrix.h
@@ -42,10 +42,10 @@
 #define TQWMATRIX_H
 
 #ifndef QT_H
-#include "qwindowdefs.h"
-#include "qpointarray.h"
-#include "qrect.h"
-#include "qregion.h"
+#include "ntqwindowdefs.h"
+#include "ntqpointarray.h"
+#include "ntqrect.h"
+#include "ntqregion.h"
 #endif // QT_H
 
 #ifndef QT_NO_WMATRIX
diff --git a/src/kernel/qabstractlayout.cpp b/src/kernel/qabstractlayout.cpp
index 2292a4e7c..bf1851991 100644
--- a/src/kernel/qabstractlayout.cpp
+++ b/src/kernel/qabstractlayout.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "qlayout.h"
+#include "ntqlayout.h"
 
 #ifndef QT_NO_LAYOUT
-#include "qapplication.h"
+#include "ntqapplication.h"
 #include "qlayoutengine_p.h"
-#include "qmenubar.h"
-#include "qtoolbar.h"
+#include "ntqmenubar.h"
+#include "ntqtoolbar.h"
 
 static int menuBarHeightForWidth( TQMenuBar *menubar, int w )
 {
diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp
index 8bedd90cf..019dd8369 100644
--- a/src/kernel/qaccel.cpp
+++ b/src/kernel/qaccel.cpp
@@ -38,21 +38,21 @@
 **
 **********************************************************************/
 
-#include "qaccel.h"
+#include "ntqaccel.h"
 
 #ifndef QT_NO_ACCEL
 
-#include "qsignal.h"
-#include "qapplication.h"
-#include "qwidget.h"
-#include "qptrlist.h"
-#include "qwhatsthis.h"
-#include "qguardedptr.h"
-#include "qstatusbar.h"
-#include "qdockwindow.h"
-#include "qsignalslotimp.h"
+#include "ntqsignal.h"
+#include "ntqapplication.h"
+#include "ntqwidget.h"
+#include "ntqptrlist.h"
+#include "ntqwhatsthis.h"
+#include "ntqguardedptr.h"
+#include "ntqstatusbar.h"
+#include "ntqdockwindow.h"
+#include "ntqsignalslotimp.h"
 /*!
-    \class TQAccel qaccel.h
+    \class TQAccel ntqaccel.h
     \brief The TQAccel class handles keyboard accelerator and shortcut keys.
 
     \ingroup misc
@@ -85,7 +85,7 @@
     combined with modifiers (\c SHIFT, \c CTRL, \c ALT or \c
     UNICODE_ACCEL). For example, \c{CTRL + Key_P} could be a shortcut
     for printing a document. The key codes are listed in \c
-    qnamespace.h. As an alternative, use \c UNICODE_ACCEL with the
+    ntqnamespace.h. As an alternative, use \c UNICODE_ACCEL with the
     unicode code point of the character. For example, \c{UNICODE_ACCEL
     + 'A'} gives the same accelerator as \c Key_A.
 
diff --git a/src/kernel/qaccessible.cpp b/src/kernel/qaccessible.cpp
index 346838785..e89cf2c04 100644
--- a/src/kernel/qaccessible.cpp
+++ b/src/kernel/qaccessible.cpp
@@ -36,18 +36,18 @@
 **
 **********************************************************************/
 
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 
 #if defined(QT_ACCESSIBILITY_SUPPORT)
 
-#include "qptrdict.h"
-#include "qmetaobject.h"
+#include "ntqptrdict.h"
+#include "ntqmetaobject.h"
 #include <private/qpluginmanager_p.h>
-#include "qapplication.h"
+#include "ntqapplication.h"
 #include <stdlib.h>
 
 /*!
-    \class TQAccessible qaccessible.h
+    \class TQAccessible ntqaccessible.h
     \brief The TQAccessible class provides enums and static functions
     relating to accessibility.
 
@@ -422,7 +422,7 @@ bool TQAccessible::isActive()
 }
 
 /*!
-    \class TQAccessibleInterface qaccessible.h
+    \class TQAccessibleInterface ntqaccessible.h
     \brief The TQAccessibleInterface class defines an interface that exposes information about accessible objects.
 
     \ingroup misc
@@ -633,7 +633,7 @@ bool TQAccessible::isActive()
 
 
 /*!
-    \class TQAccessibleObject qaccessible.h
+    \class TQAccessibleObject ntqaccessible.h
     \brief The TQAccessibleObject class implements parts of the
     TQAccessibleInterface for TQObjects.
 
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index ffb147ab5..6eb69ff45 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -38,36 +38,36 @@
 **
 **********************************************************************/
 
-#include "qobjectlist.h"
-#include "qapplication.h"
-#include "qeventloop.h"
+#include "ntqobjectlist.h"
+#include "ntqapplication.h"
+#include "ntqeventloop.h"
 #include "qeventloop_p.h"
-#include "qwidget.h"
-#include "qwidgetlist.h"
-#include "qwidgetintdict.h"
-#include "qptrdict.h"
-#include "qcleanuphandler.h"
-
-#include "qtranslator.h"
-#include "qtextcodec.h"
-#include "qsessionmanager.h"
-#include "qdragobject.h"
-#include "qclipboard.h"
-#include "qcursor.h"
-#include "qstyle.h"
-#include "qstylefactory.h"
-#include "qfile.h"
-#include "qmessagebox.h"
-#include "qdir.h"
-#include "qfileinfo.h"
+#include "ntqwidget.h"
+#include "ntqwidgetlist.h"
+#include "ntqwidgetintdict.h"
+#include "ntqptrdict.h"
+#include "ntqcleanuphandler.h"
+
+#include "ntqtranslator.h"
+#include "ntqtextcodec.h"
+#include "ntqsessionmanager.h"
+#include "ntqdragobject.h"
+#include "ntqclipboard.h"
+#include "ntqcursor.h"
+#include "ntqstyle.h"
+#include "ntqstylefactory.h"
+#include "ntqfile.h"
+#include "ntqmessagebox.h"
+#include "ntqdir.h"
+#include "ntqfileinfo.h"
 #ifdef Q_WS_WIN
 #include "qinputcontext_p.h"
 #endif
 #include "qfontdata_p.h"
 
 #if defined(QT_THREAD_SUPPORT)
-#  include "qmutex.h"
-#  include "qthread.h"
+#  include "ntqmutex.h"
+#  include "ntqthread.h"
 #endif // QT_THREAD_SUPPORT
 
 #include <stdlib.h>
@@ -77,7 +77,7 @@
 #endif
 
 /*!
-  \class TQApplication qapplication.h
+  \class TQApplication ntqapplication.h
   \brief The TQApplication class manages the GUI application's control
   flow and main settings.
 
@@ -282,9 +282,9 @@
   TQApplication. This can be useful if you wish to share code between
   a non-GUI server and a GUI client.
 
-  \headerfile qnamespace.h
-  \headerfile qwindowdefs.h
-  \headerfile qglobal.h
+  \headerfile ntqnamespace.h
+  \headerfile ntqwindowdefs.h
+  \headerfile ntqglobal.h
 */
 
 /*! \enum TQt::HANDLE
@@ -1167,8 +1167,8 @@ TQApplication::~TQApplication()
     \code
 	// showargs.cpp - displays program arguments in a list box
 
-	#include <qapplication.h>
-	#include <qlistbox.h>
+	#include <ntqapplication.h>
+	#include <ntqlistbox.h>
 
 	int main( int argc, char **argv )
 	{
@@ -2079,7 +2079,7 @@ TQWidgetList *TQApplication::topLevelWidgets()
     delete list;                      // delete the list, not the widgets
   \endcode
 
-  The TQWidgetList class is defined in the \c qwidgetlist.h header
+  The TQWidgetList class is defined in the \c ntqwidgetlist.h header
   file.
 
   \warning Delete the list as soon as you have finished using it.
@@ -4122,7 +4122,7 @@ bool TQApplication::reverseLayout()
 
 
 /*!
-  \class TQSessionManager qsessionmanager.h
+  \class TQSessionManager ntqsessionmanager.h
   \brief The TQSessionManager class provides access to the session manager.
 
   \ingroup application
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 7f0d4d3d4..1c285c44c 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -64,45 +64,45 @@
 # undef truncate
 #endif
 
-#include "qapplication.h"
+#include "ntqapplication.h"
 #include "qapplication_p.h"
 #include "qcolor_p.h"
-#include "qcursor.h"
-#include "qwidget.h"
+#include "ntqcursor.h"
+#include "ntqwidget.h"
 #include "qwidget_p.h"
-#include "qobjectlist.h"
-#include "qwidgetlist.h"
-#include "qwidgetintdict.h"
-#include "qbitarray.h"
-#include "qpainter.h"
-#include "qpixmapcache.h"
-#include "qdatetime.h"
-#include "qtextcodec.h"
-#include "qdatastream.h"
-#include "qbuffer.h"
-#include "qsocketnotifier.h"
-#include "qsessionmanager.h"
-#include "qvaluelist.h"
-#include "qdict.h"
-#include "qguardedptr.h"
-#include "qclipboard.h"
-#include "qwhatsthis.h" // ######## dependency
-#include "qsettings.h"
-#include "qstylefactory.h"
-#include "qfileinfo.h"
+#include "ntqobjectlist.h"
+#include "ntqwidgetlist.h"
+#include "ntqwidgetintdict.h"
+#include "ntqbitarray.h"
+#include "ntqpainter.h"
+#include "ntqpixmapcache.h"
+#include "ntqdatetime.h"
+#include "ntqtextcodec.h"
+#include "ntqdatastream.h"
+#include "ntqbuffer.h"
+#include "ntqsocketnotifier.h"
+#include "ntqsessionmanager.h"
+#include "ntqvaluelist.h"
+#include "ntqdict.h"
+#include "ntqguardedptr.h"
+#include "ntqclipboard.h"
+#include "ntqwhatsthis.h" // ######## dependency
+#include "ntqsettings.h"
+#include "ntqstylefactory.h"
+#include "ntqfileinfo.h"
 
 // Input method stuff - UNFINISHED
 #ifndef QT_NO_IM
-#include "qinputcontext.h"
+#include "ntqinputcontext.h"
 #endif // QT_NO_IM
 #include "qinternal_p.h" // shared double buffer cleanup
 
 #if defined(QT_THREAD_SUPPORT)
-# include "qthread.h"
+# include "ntqthread.h"
 #endif
 
 #if defined(QT_DEBUG) && defined(Q_OS_LINUX)
-# include "qfile.h"
+# include "ntqfile.h"
 #endif
 
 #include "qt_x11_p.h"
@@ -1636,7 +1636,7 @@ static Visual *find_truecolor_visual( Display *dpy, int scr, int *depth, int *nc
 #include <X11/keysymdef.h>
 
 // ### This should be static but it isn't because of the friend declaration
-// ### in qpaintdevice.h which then should have a static too but can't have
+// ### in ntqpaintdevice.h which then should have a static too but can't have
 // ### it because "storage class specifiers invalid in friend function
 // ### declarations" :-) Ideas anyone?
 void qt_init_internal( int *argcptr, char **argv,
diff --git a/src/kernel/qasyncimageio.cpp b/src/kernel/qasyncimageio.cpp
index c8e8d6ef5..41164a4c6 100644
--- a/src/kernel/qasyncimageio.cpp
+++ b/src/kernel/qasyncimageio.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qasyncimageio.h"
+#include "ntqasyncimageio.h"
 
 #ifndef QT_NO_ASYNC_IMAGE_IO
 
-#include "qptrlist.h"
-#include "qgif.h"
+#include "ntqptrlist.h"
+#include "ntqgif.h"
 #include <stdlib.h>
 
 extern void qt_init_image_handlers();
@@ -52,7 +52,7 @@ extern void qt_init_image_plugins();
 #define Q_TRANSPARENT 0x00ffffff
 
 /*!
-    \class TQImageConsumer qasyncimageio.h
+    \class TQImageConsumer ntqasyncimageio.h
     \brief The TQImageConsumer class is an abstraction used by TQImageDecoder.
 
     \ingroup images
@@ -154,7 +154,7 @@ extern void qt_init_image_plugins();
 
 
 /*!
-    \class TQImageDecoder qasyncimageio.h
+    \class TQImageDecoder ntqasyncimageio.h
     \brief The TQImageDecoder class is an incremental image decoder for all supported image formats.
 
     \ingroup images
@@ -178,7 +178,7 @@ extern void qt_init_image_plugins();
     \legalese
 
     TQt supports GIF reading if it is configured that way during
-    installation (see qgif.h). If it is, we are required to state that
+    installation (see ntqgif.h). If it is, we are required to state that
     "The Graphics Interchange Format(c) is the Copyright property of
     CompuServe Incorporated. GIF(sm) is a Service Mark property of
     CompuServe Incorporated."
@@ -199,7 +199,7 @@ static const int max_header = 32;
 
 
 
-// See qgif.h for important information regarding this option
+// See ntqgif.h for important information regarding this option
 #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
 class TQGIFFormat : public TQImageFormat {
 public:
@@ -299,7 +299,7 @@ public:
     {
 	if ( !factories ) {
 	    factories = new TQPtrList<TQImageFormatType>;
-// See qgif.h for important information regarding this option
+// See ntqgif.h for important information regarding this option
 #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
 	    gif_decoder_factory = new TQGIFFormatType;
 #endif
@@ -310,7 +310,7 @@ public:
 
     static TQPtrList<TQImageFormatType> * factories;
 
-// See qgif.h for important information regarding this option
+// See ntqgif.h for important information regarding this option
 #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
     static TQGIFFormatType * gif_decoder_factory;
 #endif
@@ -320,7 +320,7 @@ public:
 };
 
 TQPtrList<TQImageFormatType> * TQImageDecoderPrivate::factories = 0;
-// See qgif.h for important information regarding this option
+// See ntqgif.h for important information regarding this option
 #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
 TQGIFFormatType * TQImageDecoderPrivate::gif_decoder_factory = 0;
 #endif
@@ -330,7 +330,7 @@ void TQImageDecoderPrivate::cleanup()
 {
     delete factories;
     factories = 0;
-// See qgif.h for important information regarding this option
+// See ntqgif.h for important information regarding this option
 #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
     delete gif_decoder_factory;
     gif_decoder_factory = 0;
@@ -531,7 +531,7 @@ void TQImageDecoder::unregisterDecoderFactory(TQImageFormatType* f)
 }
 
 /*!
-    \class TQImageFormat qasyncimageio.h
+    \class TQImageFormat ntqasyncimageio.h
     \brief The TQImageFormat class is an incremental image decoder for a specific image format.
 
     \ingroup images
@@ -583,7 +583,7 @@ TQImageFormat::~TQImageFormat()
 */
 
 /*!
-    \class TQImageFormatType qasyncimageio.h
+    \class TQImageFormatType ntqasyncimageio.h
     \brief The TQImageFormatType class is a factory that makes TQImageFormat objects.
 
     \ingroup images
@@ -659,11 +659,11 @@ bool qt_builtin_gif_reader()
 #endif
 }
 
-// See qgif.h for important information regarding this option
+// See ntqgif.h for important information regarding this option
 #if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
 
 /* -- NOTDOC
-  \class TQGIFFormat qasyncimageio.h
+  \class TQGIFFormat ntqasyncimageio.h
   \brief Incremental image decoder for GIF image format.
 
   \ingroup images
@@ -702,7 +702,7 @@ TQGIFFormat::~TQGIFFormat()
 
 
 /* -- NOTDOC
-  \class TQGIFFormatType qasyncimageio.h
+  \class TQGIFFormatType ntqasyncimageio.h
   \brief Incremental image decoder for GIF image format.
 
   \ingroup images
diff --git a/src/kernel/qasyncio.cpp b/src/kernel/qasyncio.cpp
index 643e35656..84912e1ff 100644
--- a/src/kernel/qasyncio.cpp
+++ b/src/kernel/qasyncio.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "qasyncio.h"
-#include "qiodevice.h"
+#include "ntqasyncio.h"
+#include "ntqiodevice.h"
 #include <stdlib.h>
 
 #ifndef QT_NO_ASYNC_IO
 
 /*!
-  \class TQAsyncIO qasyncio.h
+  \class TQAsyncIO ntqasyncio.h
   \obsolete
   \brief The TQAsyncIO class encapsulates I/O asynchronicity.
 
@@ -86,7 +86,7 @@ void TQAsyncIO::ready()
 
 
 /*!
-  \class TQDataSink qasyncio.h
+  \class TQDataSink ntqasyncio.h
   \obsolete
   \brief The TQDataSink class is an asynchronous consumer of data.
 
@@ -132,7 +132,7 @@ void TQDataSink::maybeReady()
 
 
 /*!
-  \class TQDataSource qasyncio.h
+  \class TQDataSource ntqasyncio.h
   \obsolete
   \brief The TQDataSource class is an asynchronous producer of data.
 
@@ -209,7 +209,7 @@ void TQDataSource::rewind()
 }
 
 /*!
-  \class TQIODeviceSource qasyncio.h
+  \class TQIODeviceSource ntqasyncio.h
   \obsolete
   \brief The TQIODeviceSource class is a TQDataSource that draws data from a TQIODevice.
 
@@ -297,7 +297,7 @@ void TQIODeviceSource::rewind()
 
 
 /*!
-  \class TQDataPump qasyncio.h
+  \class TQDataPump ntqasyncio.h
   \obsolete
   \brief The TQDataPump class moves data from a TQDataSource to a TQDataSink during event processing.
 
diff --git a/src/kernel/qbitmap.cpp b/src/kernel/qbitmap.cpp
index 9e1ea6fbe..1e341e545 100644
--- a/src/kernel/qbitmap.cpp
+++ b/src/kernel/qbitmap.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qbitmap.h"
-#include "qimage.h"
+#include "ntqbitmap.h"
+#include "ntqimage.h"
 
 
 /*!
-    \class TQBitmap qbitmap.h
+    \class TQBitmap ntqbitmap.h
     \brief The TQBitmap class provides monochrome (1-bit depth) pixmaps.
 
     \ingroup graphics
diff --git a/src/kernel/qclipboard.cpp b/src/kernel/qclipboard.cpp
index 2fdffc826..32da6a764 100644
--- a/src/kernel/qclipboard.cpp
+++ b/src/kernel/qclipboard.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qclipboard.h"
+#include "ntqclipboard.h"
 
 #ifndef QT_NO_CLIPBOARD
 
-#include "qapplication.h"
+#include "ntqapplication.h"
 #include "qapplication_p.h"
-#include "qdragobject.h"
-#include "qpixmap.h"
+#include "ntqdragobject.h"
+#include "ntqpixmap.h"
 
 /*!
-    \class TQClipboard qclipboard.h
+    \class TQClipboard ntqclipboard.h
     \brief The TQClipboard class provides access to the window system clipboard.
 
     \ingroup io
diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/qclipboard_x11.cpp
index 0c780a89d..379e8249a 100644
--- a/src/kernel/qclipboard_x11.cpp
+++ b/src/kernel/qclipboard_x11.cpp
@@ -60,19 +60,19 @@
 # undef open
 #endif
 
-#include "qclipboard.h"
+#include "ntqclipboard.h"
 
 #ifndef QT_NO_CLIPBOARD
 
-#include "qapplication.h"
-#include "qeventloop.h"
-#include "qbitmap.h"
-#include "qdatetime.h"
-#include "qdragobject.h"
-#include "qbuffer.h"
-#include "qtextcodec.h"
-#include "qvaluelist.h"
-#include "qmap.h"
+#include "ntqapplication.h"
+#include "ntqeventloop.h"
+#include "ntqbitmap.h"
+#include "ntqdatetime.h"
+#include "ntqdragobject.h"
+#include "ntqbuffer.h"
+#include "ntqtextcodec.h"
+#include "ntqvaluelist.h"
+#include "ntqmap.h"
 #include "qt_x11_p.h"
 #include "qapplication_p.h"
 
diff --git a/src/kernel/qcolor.cpp b/src/kernel/qcolor.cpp
index 4806191e3..832e5b7f7 100644
--- a/src/kernel/qcolor.cpp
+++ b/src/kernel/qcolor.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "qcolor.h"
-#include "qnamespace.h"
-#include "qdatastream.h"
+#include "ntqcolor.h"
+#include "ntqnamespace.h"
+#include "ntqdatastream.h"
 
 #include <stdio.h>
 
 
 /*!
-    \class TQColor qcolor.h
+    \class TQColor ntqcolor.h
     \brief The TQColor class provides colors based on RGB or HSV values.
 
     \ingroup images
diff --git a/src/kernel/qcolor_p.cpp b/src/kernel/qcolor_p.cpp
index 273909741..680737ffc 100644
--- a/src/kernel/qcolor_p.cpp
+++ b/src/kernel/qcolor_p.cpp
@@ -39,13 +39,13 @@
 **
 **********************************************************************/
 
-#include "qglobal.h"
+#include "ntqglobal.h"
 #if defined(Q_CC_BOR)
 // needed for qsort() because of a std namespace problem on Borland
 #include "qplatformdefs.h"
 #endif
 
-#include "qcolor.h"
+#include "ntqcolor.h"
 
 #ifndef QT_NO_COLORNAMES
 
diff --git a/src/kernel/qcolor_x11.cpp b/src/kernel/qcolor_x11.cpp
index 8bd1eb48e..38080b42a 100644
--- a/src/kernel/qcolor_x11.cpp
+++ b/src/kernel/qcolor_x11.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qcolor.h"
+#include "ntqcolor.h"
 #include "qcolor_p.h"
 #include "string.h"
-#include "qpaintdevice.h"
-#include "qapplication.h"
+#include "ntqpaintdevice.h"
+#include "ntqapplication.h"
 #include "qapplication_p.h"
 #include "qt_x11_p.h"
 
@@ -58,7 +58,7 @@
   this TQt application.
  *****************************************************************************/
 
-#include "qintdict.h"
+#include "ntqintdict.h"
 
 struct TQColorData {
     uint pix;					// allocated pixel value
diff --git a/src/kernel/qconnection.cpp b/src/kernel/qconnection.cpp
index ac8e93efa..b30a76413 100644
--- a/src/kernel/qconnection.cpp
+++ b/src/kernel/qconnection.cpp
@@ -38,9 +38,9 @@
 **
 **********************************************************************/
 
-#include "qconnection.h"
+#include "ntqconnection.h"
 
-/*! \class TQConnection qconnection.h
+/*! \class TQConnection ntqconnection.h
   \brief The TQConnection class is an internal class, used in the signal/slot mechanism.
 
   \internal
diff --git a/src/kernel/qcursor.cpp b/src/kernel/qcursor.cpp
index 112e70c72..12e7cc780 100644
--- a/src/kernel/qcursor.cpp
+++ b/src/kernel/qcursor.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qcursor.h"
+#include "ntqcursor.h"
 
 #ifndef QT_NO_CURSOR
 
-#include "qbitmap.h"
-#include "qimage.h"
-#include "qdatastream.h"
+#include "ntqbitmap.h"
+#include "ntqimage.h"
+#include "ntqdatastream.h"
 
 
 /*!
-    \class TQCursor qcursor.h
+    \class TQCursor ntqcursor.h
 
     \brief The TQCursor class provides a mouse cursor with an arbitrary
     shape.
diff --git a/src/kernel/qcursor_x11.cpp b/src/kernel/qcursor_x11.cpp
index 2eccebbc4..b880988fb 100644
--- a/src/kernel/qcursor_x11.cpp
+++ b/src/kernel/qcursor_x11.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qcursor.h"
-#include "qbitmap.h"
-#include "qimage.h"
-#include "qapplication.h"
-#include "qdatastream.h"
-#include "qnamespace.h"
+#include "ntqcursor.h"
+#include "ntqbitmap.h"
+#include "ntqimage.h"
+#include "ntqapplication.h"
+#include "ntqdatastream.h"
+#include "ntqnamespace.h"
 #include "qt_x11_p.h"
 #include <X11/cursorfont.h>
 
diff --git a/src/kernel/qdesktopwidget_x11.cpp b/src/kernel/qdesktopwidget_x11.cpp
index c4a9fc477..d8c10605b 100644
--- a/src/kernel/qdesktopwidget_x11.cpp
+++ b/src/kernel/qdesktopwidget_x11.cpp
@@ -36,9 +36,9 @@
 **
 **********************************************************************/
 
-#include "qdesktopwidget.h"
-#include "qapplication.h"
-#include "qobjectlist.h"
+#include "ntqdesktopwidget.h"
+#include "ntqapplication.h"
+#include "ntqobjectlist.h"
 #include "qt_x11_p.h"
 #include <cstdlib>
 
diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp
index 759d960d4..8c64ce107 100644
--- a/src/kernel/qdnd_x11.cpp
+++ b/src/kernel/qdnd_x11.cpp
@@ -40,20 +40,20 @@
 
 #include "qplatformdefs.h"
 
-#include "qapplication.h"
+#include "ntqapplication.h"
 
 #ifndef QT_NO_DRAGANDDROP
 
-#include "qwidget.h"
-#include "qintdict.h"
-#include "qdatetime.h"
-#include "qdict.h"
-#include "qguardedptr.h"
-#include "qdragobject.h"
-#include "qobjectlist.h"
-#include "qcursor.h"
-#include "qbitmap.h"
-#include "qpainter.h"
+#include "ntqwidget.h"
+#include "ntqintdict.h"
+#include "ntqdatetime.h"
+#include "ntqdict.h"
+#include "ntqguardedptr.h"
+#include "ntqdragobject.h"
+#include "ntqobjectlist.h"
+#include "ntqcursor.h"
+#include "ntqbitmap.h"
+#include "ntqpainter.h"
 
 #include "qt_x11_p.h"
 
@@ -1484,7 +1484,7 @@ bool qt_xdnd_handle_badwindow()
 
 
 /*!
-    \class TQDragMoveEvent qevent.h
+    \class TQDragMoveEvent ntqevent.h
     \ingroup events
     \ingroup draganddrop
     \brief The TQDragMoveEvent class provides an event which is sent while a drag and drop is in progress.
@@ -1658,7 +1658,7 @@ bool qt_dnd_enable( TQWidget* w, bool on )
 
 
 /*!
-    \class TQDropEvent qevent.h
+    \class TQDropEvent ntqevent.h
     \ingroup events
     \ingroup draganddrop
 
diff --git a/src/kernel/qdragobject.cpp b/src/kernel/qdragobject.cpp
index bf838cc85..96653b1c2 100644
--- a/src/kernel/qdragobject.cpp
+++ b/src/kernel/qdragobject.cpp
@@ -45,15 +45,15 @@
 
 #ifndef QT_NO_MIME
 
-#include "qdragobject.h"
-#include "qtextcodec.h"
-#include "qapplication.h"
-#include "qpoint.h"
-#include "qwidget.h"
-#include "qbuffer.h"
-#include "qgif.h"
-#include "qregexp.h"
-#include "qdir.h"
+#include "ntqdragobject.h"
+#include "ntqtextcodec.h"
+#include "ntqapplication.h"
+#include "ntqpoint.h"
+#include "ntqwidget.h"
+#include "ntqbuffer.h"
+#include "ntqgif.h"
+#include "ntqregexp.h"
+#include "ntqdir.h"
 #include <ctype.h>
 
 // both a struct for storing stuff in and a wrapper to avoid polluting
@@ -569,7 +569,7 @@ TQWidget * TQDragObject::source()
 
 
 /*!
-    \class TQDragObject qdragobject.h
+    \class TQDragObject ntqdragobject.h
 
     \brief The TQDragObject class encapsulates MIME-based data
     transfer.
@@ -578,7 +578,7 @@ TQWidget * TQDragObject::source()
 
     TQDragObject is the base class for all data that needs to be
     transferred between and within applications, both for drag and
-    drop and for the \link qclipboard.html clipboard\endlink.
+    drop and for the \link ntqclipboard.html clipboard\endlink.
 
     See the \link dnd.html Drag-and-drop documentation\endlink for an
     overview of how to provide drag and drop in your application.
@@ -674,7 +674,7 @@ void TQTextDrag::setSubtype( const TQCString & st)
 }
 
 /*!
-    \class TQTextDrag qdragobject.h
+    \class TQTextDrag ntqdragobject.h
 
     \brief The TQTextDrag class is a drag and drop object for
     transferring plain and Unicode text.
@@ -989,7 +989,7 @@ public:
 
 
 /*!
-    \class TQImageDrag qdragobject.h
+    \class TQImageDrag ntqdragobject.h
 
     \brief The TQImageDrag class provides a drag and drop object for
     transferring images.
@@ -1210,7 +1210,7 @@ bool TQImageDrag::decode( const TQMimeSource* e, TQPixmap& pm )
 
 
 /*!
-    \class TQStoredDrag qdragobject.h
+    \class TQStoredDrag ntqdragobject.h
     \brief The TQStoredDrag class provides a simple stored-value drag object for arbitrary MIME data.
 
     \ingroup draganddrop
@@ -1286,7 +1286,7 @@ TQByteArray TQStoredDrag::encodedData(const char* m) const
 
 
 /*!
-    \class TQUriDrag qdragobject.h
+    \class TQUriDrag ntqdragobject.h
     \brief The TQUriDrag class provides a drag object for a list of URI references.
 
     \ingroup draganddrop
@@ -1703,7 +1703,7 @@ TQWidget* TQDropEvent::source() const
 #endif
 
 /*!
-    \class TQColorDrag qdragobject.h
+    \class TQColorDrag ntqdragobject.h
 
     \brief The TQColorDrag class provides a drag and drop object for
     transferring colors.
diff --git a/src/kernel/qdrawutil.cpp b/src/kernel/qdrawutil.cpp
index fa271c978..d9505797b 100644
--- a/src/kernel/qdrawutil.cpp
+++ b/src/kernel/qdrawutil.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qdrawutil.h"
+#include "ntqdrawutil.h"
 #ifndef QT_NO_DRAWUTIL
-#include "qbitmap.h"
-#include "qpixmapcache.h"
-#include "qapplication.h"
-#include "qpainter.h"
+#include "ntqbitmap.h"
+#include "ntqpixmapcache.h"
+#include "ntqapplication.h"
+#include "ntqpainter.h"
 
 /*!
     \relates TQPainter
 
-    \c{#include <qdrawutil.h>}
+    \c{#include <ntqdrawutil.h>}
 
     Draws a horizontal (\a y1 == \a y2) or vertical (\a x1 == \a x2)
     shaded line using the painter \a p.
@@ -166,7 +166,7 @@ void qDrawShadeLine( TQPainter *p, int x1, int y1, int x2, int y2,
 /*!
     \relates TQPainter
 
-    \c{#include <qdrawutil.h>}
+    \c{#include <ntqdrawutil.h>}
 
     Draws the shaded rectangle specified by (\a x, \a y, \a w, \a h)
     using the painter \a p.
@@ -272,7 +272,7 @@ void qDrawShadeRect( TQPainter *p, int x, int y, int w, int h,
 /*!
     \relates TQPainter
 
-    \c{#include <qdrawutil.h>}
+    \c{#include <ntqdrawutil.h>}
 
     Draws the shaded panel specified by (\a x, \a y, \a w, \a h) using
     the painter \a p.
@@ -427,7 +427,7 @@ static void qDrawWinShades( TQPainter *p,
 /*!
     \relates TQPainter
 
-    \c{#include <qdrawutil.h>}
+    \c{#include <ntqdrawutil.h>}
 
     Draws the Windows-style button specified by (\a x, \a y, \a w, \a
     h) using the painter \a p.
@@ -466,7 +466,7 @@ void qDrawWinButton( TQPainter *p, int x, int y, int w, int h,
 /*!
     \relates TQPainter
 
-    \c{#include <qdrawutil.h>}
+    \c{#include <ntqdrawutil.h>}
 
     Draws the Windows-style panel specified by (\a x, \a y, \a w, \a
     h) using the painter \a p.
@@ -508,7 +508,7 @@ void qDrawWinPanel( TQPainter *p, int x, int y, int w, int h,
 /*!
     \relates TQPainter
 
-    \c{#include <qdrawutil.h>}
+    \c{#include <ntqdrawutil.h>}
 
     Draws the plain rectangle specified by (\a x, \a y, \a w, \a h)
     using the painter \a p.
diff --git a/src/kernel/qdropsite.cpp b/src/kernel/qdropsite.cpp
index 412720416..07dd965dc 100644
--- a/src/kernel/qdropsite.cpp
+++ b/src/kernel/qdropsite.cpp
@@ -36,16 +36,16 @@
 **
 **********************************************************************/
 
-#include "qdropsite.h"
+#include "ntqdropsite.h"
 
 #ifndef QT_NO_DRAGANDDROP
 
-#include "qwidget.h"
+#include "ntqwidget.h"
 
 
 // NOT REVISED
 /*!
-  \class TQDropSite qdropsite.h
+  \class TQDropSite ntqdropsite.h
   \brief The TQDropSite class provides nothing and does nothing.
 
   \obsolete
diff --git a/src/kernel/qevent.cpp b/src/kernel/qevent.cpp
index 75bcb2244..9c9aace01 100644
--- a/src/kernel/qevent.cpp
+++ b/src/kernel/qevent.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "qevent.h"
-#include "qcursor.h"
-#include "qapplication.h"
+#include "ntqevent.h"
+#include "ntqcursor.h"
+#include "ntqapplication.h"
 
 
 /*!
-    \class TQEvent qevent.h
+    \class TQEvent ntqevent.h
     \brief The TQEvent class is the base class of all
     event classes. Event objects contain event parameters.
 
@@ -210,7 +210,7 @@
 
 
 /*!
-    \class TQTimerEvent qevent.h
+    \class TQTimerEvent ntqevent.h
     \brief The TQTimerEvent class contains parameters that describe a
     timer event.
 
@@ -245,7 +245,7 @@
 
 
 /*!
-    \class TQMouseEvent qevent.h
+    \class TQMouseEvent ntqevent.h
     \ingroup events
 
     \brief The TQMouseEvent class contains parameters that describe a mouse event.
@@ -480,7 +480,7 @@ TQt::ButtonState TQMouseEvent::stateAfter() const
 
 
 /*!
-    \class TQWheelEvent qevent.h
+    \class TQWheelEvent ntqevent.h
     \brief The TQWheelEvent class contains parameters that describe a wheel event.
 
     \ingroup events
@@ -680,7 +680,7 @@ TQWheelEvent::TQWheelEvent( const TQPoint &pos, int delta, int state, Orientatio
 */
 
 /*!
-    \class TQKeyEvent qevent.h
+    \class TQKeyEvent ntqevent.h
     \brief The TQKeyEvent class contains describes a key event.
 
     \ingroup events
@@ -1152,7 +1152,7 @@ TQt::ButtonState TQKeyEvent::stateAfter() const
 
 
 /*!
-    \class TQFocusEvent qevent.h
+    \class TQFocusEvent ntqevent.h
     \brief The TQFocusEvent class contains event parameters for widget focus
     events.
 
@@ -1256,7 +1256,7 @@ void TQFocusEvent::resetReason()
 
 
 /*!
-    \class TQPaintEvent qevent.h
+    \class TQPaintEvent ntqevent.h
     \brief The TQPaintEvent class contains event parameters for paint events.
 
     \ingroup events
@@ -1328,7 +1328,7 @@ void TQFocusEvent::resetReason()
 */
 
 /*!
-    \class TQMoveEvent qevent.h
+    \class TQMoveEvent ntqevent.h
     \brief The TQMoveEvent class contains event parameters for move events.
 
     \ingroup events
@@ -1363,7 +1363,7 @@ void TQFocusEvent::resetReason()
 
 
 /*!
-    \class TQResizeEvent qevent.h
+    \class TQResizeEvent ntqevent.h
     \brief The TQResizeEvent class contains event parameters for resize events.
 
     \ingroup events
@@ -1397,7 +1397,7 @@ void TQFocusEvent::resetReason()
 
 
 /*!
-    \class TQCloseEvent qevent.h
+    \class TQCloseEvent ntqevent.h
     \brief The TQCloseEvent class contains parameters that describe a close event.
 
     \ingroup events
@@ -1499,7 +1499,7 @@ void TQFocusEvent::resetReason()
 */
 
 /*!
-   \class TQIconDragEvent qevent.h
+   \class TQIconDragEvent ntqevent.h
    \brief The TQIconDragEvent class signals that a main icon drag has begun.
 
     \ingroup events
@@ -1554,7 +1554,7 @@ void TQFocusEvent::resetReason()
 */
 
 /*!
-    \class TQContextMenuEvent qevent.h
+    \class TQContextMenuEvent ntqevent.h
     \brief The TQContextMenuEvent class contains parameters that describe a context menu event.
 
     \ingroup events
@@ -1766,7 +1766,7 @@ TQContextMenuEvent::TQContextMenuEvent( Reason reason, const TQPoint &pos, int s
 
 
 /*!
-    \class TQIMEvent qevent.h
+    \class TQIMEvent ntqevent.h
     \brief The TQIMEvent class provides parameters for input method events.
 
     \ingroup events
@@ -1905,7 +1905,7 @@ TQContextMenuEvent::TQContextMenuEvent( Reason reason, const TQPoint &pos, int s
 */
 
 /*!
-    \class TQTabletEvent qevent.h
+    \class TQTabletEvent ntqevent.h
     \brief The TQTabletEvent class contains parameters that describe a Tablet
     event.
 
@@ -2148,7 +2148,7 @@ TQTabletEvent::TQTabletEvent( Type t, const TQPoint &pos, const TQPoint &globalP
 */
 
 /*!
-    \class TQChildEvent qevent.h
+    \class TQChildEvent ntqevent.h
     \brief The TQChildEvent class contains event parameters for child object
     events.
 
@@ -2202,7 +2202,7 @@ TQTabletEvent::TQTabletEvent( Type t, const TQPoint &pos, const TQPoint &globalP
 
 
 /*!
-    \class TQCustomEvent qevent.h
+    \class TQCustomEvent ntqevent.h
     \brief The TQCustomEvent class provides support for custom events.
 
     \ingroup events
@@ -2455,7 +2455,7 @@ TQCustomEvent::TQCustomEvent( int type )
 
 
 /*!
-    \class TQDragEnterEvent qevent.h
+    \class TQDragEnterEvent ntqevent.h
     \brief The TQDragEnterEvent class provides an event which is sent to the widget when a drag and drop first drags onto the widget.
 
     \ingroup events
@@ -2479,7 +2479,7 @@ TQCustomEvent::TQCustomEvent( int type )
 */
 
 /*!
-    \class TQDragLeaveEvent qevent.h
+    \class TQDragLeaveEvent ntqevent.h
     \brief The TQDragLeaveEvent class provides an event which is sent to the widget when a drag and drop leaves the widget.
 
     \ingroup events
@@ -2502,7 +2502,7 @@ TQCustomEvent::TQCustomEvent( int type )
 */
 
 /*!
-    \class TQHideEvent qevent.h
+    \class TQHideEvent ntqevent.h
     \brief The TQHideEvent class provides an event which is sent after a widget is hidden.
 
     \ingroup events
@@ -2527,7 +2527,7 @@ TQCustomEvent::TQCustomEvent( int type )
 */
 
 /*!
-    \class TQShowEvent qevent.h
+    \class TQShowEvent ntqevent.h
     \brief The TQShowEvent class provides an event which is sent when a widget is shown.
 
     \ingroup events
diff --git a/src/kernel/qeventloop.cpp b/src/kernel/qeventloop.cpp
index 3ad30a41e..f09d3e9a8 100644
--- a/src/kernel/qeventloop.cpp
+++ b/src/kernel/qeventloop.cpp
@@ -37,9 +37,9 @@
 **********************************************************************/
 
 #include "qeventloop_p.h" // includes qplatformdefs.h
-#include "qeventloop.h"
-#include "qapplication.h"
-#include "qdatetime.h"
+#include "ntqeventloop.h"
+#include "ntqapplication.h"
+#include "ntqdatetime.h"
 
 /*!
     \class TQEventLoop
diff --git a/src/kernel/qeventloop_p.h b/src/kernel/qeventloop_p.h
index 3894517b9..7eb32a5d8 100644
--- a/src/kernel/qeventloop_p.h
+++ b/src/kernel/qeventloop_p.h
@@ -58,7 +58,7 @@
 # undef raise
 #endif
 
-#include "qwindowdefs.h"
+#include "ntqwindowdefs.h"
 
 class TQSocketNotifier;
 #ifdef Q_OS_MAC
@@ -66,7 +66,7 @@ class TQMacSockNotPrivate;
 #endif
 
 #if defined(Q_OS_UNIX) || defined (Q_WS_WIN)
-#include "qptrlist.h"
+#include "ntqptrlist.h"
 #endif // Q_OS_UNIX || Q_WS_WIN
 
 #if defined(Q_OS_UNIX)
diff --git a/src/kernel/qeventloop_unix.cpp b/src/kernel/qeventloop_unix.cpp
index d1aee1f62..b131a701f 100644
--- a/src/kernel/qeventloop_unix.cpp
+++ b/src/kernel/qeventloop_unix.cpp
@@ -37,9 +37,9 @@
 **********************************************************************/
 
 #include "qeventloop_p.h" // includes qplatformdefs.h
-#include "qeventloop.h"
-#include "qapplication.h"
-#include "qbitarray.h"
+#include "ntqeventloop.h"
+#include "ntqapplication.h"
+#include "ntqbitarray.h"
 #include <stdlib.h>
 #include <sys/types.h>
 
diff --git a/src/kernel/qeventloop_x11.cpp b/src/kernel/qeventloop_x11.cpp
index 26716b179..ae2183a0e 100644
--- a/src/kernel/qeventloop_x11.cpp
+++ b/src/kernel/qeventloop_x11.cpp
@@ -37,14 +37,14 @@
 **********************************************************************/
 
 #include "qeventloop_p.h" // includes qplatformdefs.h
-#include "qeventloop.h"
-#include "qapplication.h"
-#include "qbitarray.h"
+#include "ntqeventloop.h"
+#include "ntqapplication.h"
+#include "ntqbitarray.h"
 #include "qcolor_p.h"
 #include "qt_x11_p.h"
 
 #if defined(QT_THREAD_SUPPORT)
-#  include "qmutex.h"
+#  include "ntqmutex.h"
 #endif // QT_THREAD_SUPPORT
 
 #include <errno.h>
diff --git a/src/kernel/qfocusdata.cpp b/src/kernel/qfocusdata.cpp
index 838a2ab15..0f06da4e3 100644
--- a/src/kernel/qfocusdata.cpp
+++ b/src/kernel/qfocusdata.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "qfocusdata.h"
+#include "ntqfocusdata.h"
 
 /*!
-    \class TQFocusData qfocusdata.h
+    \class TQFocusData ntqfocusdata.h
     \brief The TQFocusData class maintains the list of widgets in the focus
     chain.
 
diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp
index 5fd1a8755..6e78fa43a 100644
--- a/src/kernel/qfont.cpp
+++ b/src/kernel/qfont.cpp
@@ -40,19 +40,19 @@
 
 #define QT_FATAL_ASSERT
 
-#include "qfont.h"
-#include "qfontdatabase.h"
-#include "qfontmetrics.h"
-#include "qfontinfo.h"
-#include "qpainter.h"
-#include "qdict.h"
-#include "qcache.h"
-#include "qdatastream.h"
-#include "qapplication.h"
-#include "qcleanuphandler.h"
-#include "qstringlist.h"
+#include "ntqfont.h"
+#include "ntqfontdatabase.h"
+#include "ntqfontmetrics.h"
+#include "ntqfontinfo.h"
+#include "ntqpainter.h"
+#include "ntqdict.h"
+#include "ntqcache.h"
+#include "ntqdatastream.h"
+#include "ntqapplication.h"
+#include "ntqcleanuphandler.h"
+#include "ntqstringlist.h"
 #ifdef Q_WS_MAC
-#include "qpaintdevicemetrics.h"
+#include "ntqpaintdevicemetrics.h"
 #endif
 
 #include <private/qunicodetables_p.h>
@@ -237,7 +237,7 @@ TQFontEngineData::~TQFontEngineData()
 
 
 /*!
-    \class TQFont qfont.h
+    \class TQFont ntqfont.h
     \brief The TQFont class specifies a font used for drawing text.
 
     \ingroup graphics
@@ -1808,7 +1808,7 @@ TQDataStream &operator>>( TQDataStream &s, TQFont &font )
  *****************************************************************************/
 
 /*!
-    \class TQFontMetrics qfontmetrics.h
+    \class TQFontMetrics ntqfontmetrics.h
     \brief The TQFontMetrics class provides font metrics information.
 
     \ingroup graphics
@@ -2443,7 +2443,7 @@ TQRect TQFontMetrics::boundingRect( TQChar ch ) const
     If several of the horizontal or several of the vertical alignment
     flags are set, the resulting alignment is undefined.
 
-    These flags are defined in \c qnamespace.h.
+    These flags are defined in \c ntqnamespace.h.
 
     If \c ExpandTabs is set in \a flgs, then: if \a tabarray is
     non-null, it specifies a 0-terminated sequence of pixel-positions
@@ -2505,7 +2505,7 @@ TQRect TQFontMetrics::boundingRect( int x, int y, int w, int h, int flgs,
     \i \c WordBreak breaks the text to fit the rectangle.
     \endlist
 
-    These flags are defined in \c qnamespace.h.
+    These flags are defined in \c ntqnamespace.h.
 
     If \c ExpandTabs is set in \a flgs, then: if \a tabarray is
     non-null, it specifies a 0-terminated sequence of pixel-positions
@@ -2591,7 +2591,7 @@ int TQFontMetrics::lineWidth() const
  *****************************************************************************/
 
 /*!
-    \class TQFontInfo qfontinfo.h
+    \class TQFontInfo ntqfontinfo.h
 
     \brief The TQFontInfo class provides general information about fonts.
 
diff --git a/src/kernel/qfont_x11.cpp b/src/kernel/qfont_x11.cpp
index 5d9debaf1..82120732e 100644
--- a/src/kernel/qfont_x11.cpp
+++ b/src/kernel/qfont_x11.cpp
@@ -44,15 +44,15 @@
 
 #include "qplatformdefs.h"
 
-#include "qfont.h"
-#include "qapplication.h"
-#include "qcleanuphandler.h"
-#include "qfontinfo.h"
-#include "qfontdatabase.h"
-#include "qfontmetrics.h"
-#include "qpaintdevice.h"
-#include "qpaintdevicemetrics.h"
-#include "qtextcodec.h"
+#include "ntqfont.h"
+#include "ntqapplication.h"
+#include "ntqcleanuphandler.h"
+#include "ntqfontinfo.h"
+#include "ntqfontdatabase.h"
+#include "ntqfontmetrics.h"
+#include "ntqpaintdevice.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqtextcodec.h"
 
 #include <private/qfontcodecs_p.h>
 #include <private/qunicodetables_p.h>
diff --git a/src/kernel/qfontdata_p.h b/src/kernel/qfontdata_p.h
index eb83ffb3c..fc0734489 100644
--- a/src/kernel/qfontdata_p.h
+++ b/src/kernel/qfontdata_p.h
@@ -53,9 +53,9 @@
 //
 //
 
-#include "qobject.h"
-#include "qfont.h"
-#include "qpaintdevicemetrics.h"
+#include "ntqobject.h"
+#include "ntqfont.h"
+#include "ntqpaintdevicemetrics.h"
 
 // forwards
 class TQFontEngine;
diff --git a/src/kernel/qfontdatabase.cpp b/src/kernel/qfontdatabase.cpp
index 6e2d3ebfd..96cc1118b 100644
--- a/src/kernel/qfontdatabase.cpp
+++ b/src/kernel/qfontdatabase.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qfontdatabase.h"
+#include "ntqfontdatabase.h"
 
 #ifndef QT_NO_FONTDATABASE
 
-#include <qtl.h>
-#include <qapplication.h>
+#include <ntqtl.h>
+#include <ntqapplication.h>
 
 #include <private/qunicodetables_p.h>
 #include "qfontengine_p.h"
 
-#include <qcleanuphandler.h>
+#include <ntqcleanuphandler.h>
 
 #ifdef Q_WS_X11
 #include <locale.h>
@@ -1293,7 +1293,7 @@ TQString TQFontDatabase::styleString( const TQFont &f )
 
 
 /*!
-    \class TQFontDatabase qfontdatabase.h
+    \class TQFontDatabase ntqfontdatabase.h
     \brief The TQFontDatabase class provides information about the fonts available in the underlying window system.
 
     \ingroup environment
@@ -1332,8 +1332,8 @@ TQString TQFontDatabase::styleString( const TQFont &f )
 
     Example:
 \code
-#include <qapplication.h>
-#include <qfontdatabase.h>
+#include <ntqapplication.h>
+#include <ntqfontdatabase.h>
 #include <else.h>
 
 int main( int argc, char **argv )
diff --git a/src/kernel/qfontdatabase_x11.cpp b/src/kernel/qfontdatabase_x11.cpp
index 77a7ad17f..9231bf50d 100644
--- a/src/kernel/qfontdatabase_x11.cpp
+++ b/src/kernel/qfontdatabase_x11.cpp
@@ -40,8 +40,8 @@
 
 #include <qplatformdefs.h>
 
-#include <qdatetime.h>
-#include <qpaintdevicemetrics.h>
+#include <ntqdatetime.h>
+#include <ntqpaintdevicemetrics.h>
 
 #include "qt_x11_p.h"
 
diff --git a/src/kernel/qfontengine_p.h b/src/kernel/qfontengine_p.h
index 7c0fc0219..bd3d33a3f 100644
--- a/src/kernel/qfontengine_p.h
+++ b/src/kernel/qfontengine_p.h
@@ -38,12 +38,12 @@
 #define TQFONTENGINE_P_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 #ifdef Q_WS_WIN
 #include "qt_windows.h"
-#include "qptrdict.h"
+#include "ntqptrdict.h"
 #endif
 
 #include "qtextengine_p.h"
@@ -529,8 +529,8 @@ private:
 
 #elif defined( Q_WS_MAC )
 #include "qt_mac.h"
-#include <qmap.h>
-#include <qcache.h>
+#include <ntqmap.h>
+#include <ntqcache.h>
 
 class TQFontEngineMac : public TQFontEngine
 {
diff --git a/src/kernel/qfontengine_x11.cpp b/src/kernel/qfontengine_x11.cpp
index 5693e238d..290e3519d 100644
--- a/src/kernel/qfontengine_x11.cpp
+++ b/src/kernel/qfontengine_x11.cpp
@@ -40,20 +40,20 @@
 
 // #define FONTENGINE_DEBUG
 
-#include <qwidget.h>
-#include <qcstring.h>
-#include <qtextcodec.h>
+#include <ntqwidget.h>
+#include <ntqcstring.h>
+#include <ntqtextcodec.h>
 
-#include "qbitmap.h"
-#include "qfontdatabase.h"
-#include "qpaintdevice.h"
-#include "qpaintdevicemetrics.h"
-#include "qpainter.h"
-#include "qimage.h"
+#include "ntqbitmap.h"
+#include "ntqfontdatabase.h"
+#include "ntqpaintdevice.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqpainter.h"
+#include "ntqimage.h"
 
 #include "qt_x11_p.h"
 
-#include "qfont.h"
+#include "ntqfont.h"
 #include "qtextengine_p.h"
 
 #include <private/qunicodetables_p.h>
diff --git a/src/kernel/qgplugin.cpp b/src/kernel/qgplugin.cpp
index e95257634..a8733b07b 100644
--- a/src/kernel/qgplugin.cpp
+++ b/src/kernel/qgplugin.cpp
@@ -36,7 +36,7 @@
 **
 **********************************************************************/
 
-#include "qgplugin.h"
+#include "ntqgplugin.h"
 
 #ifndef QT_NO_COMPONENT
 
diff --git a/src/kernel/qguardedptr.cpp b/src/kernel/qguardedptr.cpp
index 079904197..e631b1988 100644
--- a/src/kernel/qguardedptr.cpp
+++ b/src/kernel/qguardedptr.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "qguardedptr.h"
+#include "ntqguardedptr.h"
 
 /*!
-    \class TQGuardedPtr qguardedptr.h
+    \class TQGuardedPtr ntqguardedptr.h
     \brief The TQGuardedPtr class is a template class that provides guarded pointers to TQObjects.
 
     \ingroup objectmodel
diff --git a/src/kernel/qiconset.cpp b/src/kernel/qiconset.cpp
index da672b037..2ba52a7b8 100644
--- a/src/kernel/qiconset.cpp
+++ b/src/kernel/qiconset.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "qiconset.h"
+#include "ntqiconset.h"
 
 #ifndef QT_NO_ICONSET
 
-#include "qapplication.h"
-#include "qbitmap.h"
-#include "qcleanuphandler.h"
-#include "qimage.h"
-#include "qpainter.h"
+#include "ntqapplication.h"
+#include "ntqbitmap.h"
+#include "ntqcleanuphandler.h"
+#include "ntqimage.h"
+#include "ntqpainter.h"
 
 enum { NumSizes = 2, NumModes = 3, NumStates = 2 };
 
diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp
index edc77a851..56bd482e0 100644
--- a/src/kernel/qimage.cpp
+++ b/src/kernel/qimage.cpp
@@ -38,24 +38,24 @@
 **
 **********************************************************************/
 
-#include "qimage.h"
-#include "qregexp.h"
-#include "qfile.h"
-#include "qdatastream.h"
-#include "qtextstream.h"
-#include "qbuffer.h"
-#include "qptrlist.h"
-#include "qasyncimageio.h"
-#include "qpngio.h"
-#include "qmngio.h"
-#include "qjpegio.h"
-#include "qmap.h"
+#include "ntqimage.h"
+#include "ntqregexp.h"
+#include "ntqfile.h"
+#include "ntqdatastream.h"
+#include "ntqtextstream.h"
+#include "ntqbuffer.h"
+#include "ntqptrlist.h"
+#include "ntqasyncimageio.h"
+#include "ntqpngio.h"
+#include "ntqmngio.h"
+#include "ntqjpegio.h"
+#include "ntqmap.h"
 #include <private/qpluginmanager_p.h>
 #include "qimageformatinterface_p.h"
-#include "qwmatrix.h"
-#include "qapplication.h"
-#include "qmime.h"
-#include "qdragobject.h"
+#include "ntqwmatrix.h"
+#include "ntqapplication.h"
+#include "ntqmime.h"
+#include "ntqdragobject.h"
 #include <ctype.h>
 #include <stdlib.h>
 
@@ -100,7 +100,7 @@
     An entry in the color table is an RGB triplet encoded as a \c
     uint. Use the \link ::qRed() qRed()\endlink, \link ::qGreen()
     qGreen()\endlink and \link ::qBlue() qBlue()\endlink functions (\c
-    qcolor.h) to access the components, and \link ::qRgb()
+    ntqcolor.h) to access the components, and \link ::qRgb()
     qRgb\endlink to make an RGB triplet (see the TQColor class
     documentation).
 
@@ -890,7 +890,7 @@ TQImage TQImage::copy(int x, int y, int w, int h, int conversion_flags) const
 
     A color value is an RGB triplet. Use the \link ::qRed()
     qRed()\endlink, \link ::qGreen() qGreen()\endlink and \link
-    ::qBlue() qBlue()\endlink functions (defined in \c qcolor.h) to
+    ::qBlue() qBlue()\endlink functions (defined in \c ntqcolor.h) to
     get the color value components.
 
     \sa setColor() numColors() TQColor
@@ -902,7 +902,7 @@ TQImage TQImage::copy(int x, int y, int w, int h, int conversion_flags) const
     Sets a color in the color table at index \a i to \a c.
 
     A color value is an RGB triplet. Use the \link ::qRgb()
-    qRgb()\endlink function (defined in \c qcolor.h) to make RGB
+    qRgb()\endlink function (defined in \c ntqcolor.h) to make RGB
     triplets.
 
     \sa color() setNumColors() numColors()
@@ -922,7 +922,7 @@ TQImage TQImage::copy(int x, int y, int w, int h, int conversion_flags) const
     directly, because the pixel format depends on the byte order on
     the underlying platform. Hint: use \link ::qRed() qRed()\endlink,
     \link ::qGreen() qGreen()\endlink and \link ::qBlue()
-    qBlue()\endlink, etc. (qcolor.h) to access the pixels.
+    qBlue()\endlink, etc. (ntqcolor.h) to access the pixels.
 
     \warning If you are accessing 16-bpp image data, you must handle
     endianness yourself. (TQt/Embedded only)
@@ -2373,7 +2373,7 @@ TQImage TQImage::convertBitOrder( Endian bitOrder ) const
     return image;
 }
 
-// ### Candidate (renamed) for qcolor.h
+// ### Candidate (renamed) for ntqcolor.h
 static
 bool isGray(TQRgb c)
 {
@@ -3716,7 +3716,7 @@ static void swapPixel01( TQImage *image )	// 1-bpp: swap 0 and 1 pixels
  *****************************************************************************/
 
 /*!
-    \class TQImageIO qimage.h
+    \class TQImageIO ntqimage.h
 
     \brief The TQImageIO class contains parameters for loading and
     saving images.
@@ -3954,7 +3954,7 @@ static TQImageHandler *get_image_handler( const char *format )
 
 /*!
     Defines an image I/O handler for the image format called \a
-    format, which is recognized using the \link qregexp.html#details
+    format, which is recognized using the \link ntqregexp.html#details
     regular expression\endlink \a header, read using \a readImage and
     written using \a writeImage.
 
diff --git a/src/kernel/qimageformatplugin.cpp b/src/kernel/qimageformatplugin.cpp
index 78ca5cdac..101f09bc0 100644
--- a/src/kernel/qimageformatplugin.cpp
+++ b/src/kernel/qimageformatplugin.cpp
@@ -36,13 +36,13 @@
 **
 **********************************************************************/
 
-#include "qimageformatplugin.h"
+#include "ntqimageformatplugin.h"
 #ifndef QT_NO_IMAGEFORMATPLUGIN
 #include "qimageformatinterface_p.h"
-#include "qimage.h"
+#include "ntqimage.h"
 
 /*!
-    \class TQImageFormatPlugin qimageformatplugin.h
+    \class TQImageFormatPlugin ntqimageformatplugin.h
     \brief The TQImageFormatPlugin class provides an abstract base for custom image format plugins.
 
     \ingroup plugins
diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp
index 557ef38e4..a5884db93 100644
--- a/src/kernel/qinputcontext.cpp
+++ b/src/kernel/qinputcontext.cpp
@@ -35,15 +35,15 @@
 
 //#define QT_NO_IM_PREEDIT_RELOCATION
 
-#include "qinputcontext.h"
+#include "ntqinputcontext.h"
 
 #ifndef QT_NO_IM
 
 #include "qplatformdefs.h"
 
-#include "qapplication.h"
-#include "qwidget.h"
-#include "qpopupmenu.h"
+#include "ntqapplication.h"
+#include "ntqwidget.h"
+#include "ntqpopupmenu.h"
 
 #include <stdlib.h>
 #include <limits.h>
@@ -93,7 +93,7 @@ public:
 
 // UPDATED COMMENT REQUIRED -- 2004-07-08 YamaKen
 /*!
-    \class TQInputContext qinputcontext.h
+    \class TQInputContext ntqinputcontext.h
     \brief The TQInputContext class abstracts the input method dependent data and composing state.
 
     \ingroup i18n
diff --git a/src/kernel/qinputcontext_p.h b/src/kernel/qinputcontext_p.h
index 85ce98162..0a7d193d3 100644
--- a/src/kernel/qinputcontext_p.h
+++ b/src/kernel/qinputcontext_p.h
@@ -52,7 +52,7 @@
 //
 //
 
-#include "qglobal.h"
+#include "ntqglobal.h"
 
 class TQKeyEvent;
 class TQWidget;
@@ -61,8 +61,8 @@ class TQString;
 
 
 #ifdef Q_WS_X11
-#include "qarray.h"
-#include "qwindowdefs.h"
+#include "ntqarray.h"
+#include "ntqwindowdefs.h"
 #include "qt_x11_p.h"
 #endif
 
diff --git a/src/kernel/qinputcontext_x11.cpp b/src/kernel/qinputcontext_x11.cpp
index b7865ece3..44ebf0f7f 100644
--- a/src/kernel/qinputcontext_x11.cpp
+++ b/src/kernel/qinputcontext_x11.cpp
@@ -36,14 +36,14 @@
 **
 **********************************************************************/
 
-#include "qinputcontext.h"
+#include "ntqinputcontext.h"
 
 #ifndef QT_NO_IM
 
 #include "qplatformdefs.h"
 
-#include "qapplication.h"
-#include "qwidget.h"
+#include "ntqapplication.h"
+#include "ntqwidget.h"
 
 #include "qt_x11_p.h"
 
diff --git a/src/kernel/qinternal.cpp b/src/kernel/qinternal.cpp
index 1f779a04e..2a58f01d3 100644
--- a/src/kernel/qinternal.cpp
+++ b/src/kernel/qinternal.cpp
@@ -39,10 +39,10 @@
 **********************************************************************/
 
 #include "private/qinternal_p.h"
-#include "qwidget.h"
-#include "qpixmap.h"
-#include "qpainter.h"
-#include "qcleanuphandler.h"
+#include "ntqwidget.h"
+#include "ntqpixmap.h"
+#include "ntqpainter.h"
+#include "ntqcleanuphandler.h"
 
 // Modern systems (year 2011) have very large screens in excess of 1000 pixels wide
 // Some may even have screens in excess of 4000 pixels wide(!)
diff --git a/src/kernel/qinternal_p.h b/src/kernel/qinternal_p.h
index 7e3c8774b..875263dd9 100644
--- a/src/kernel/qinternal_p.h
+++ b/src/kernel/qinternal_p.h
@@ -53,11 +53,11 @@
 //
 //
 #ifndef QT_H
-#include "qnamespace.h"
-#include "qrect.h"
-#include "qptrlist.h"
-#include "qcstring.h"
-#include "qiodevice.h"
+#include "ntqnamespace.h"
+#include "ntqrect.h"
+#include "ntqptrlist.h"
+#include "ntqcstring.h"
+#include "ntqiodevice.h"
 #endif // QT_H
 
 class TQWidget;
diff --git a/src/kernel/qjpegio.cpp b/src/kernel/qjpegio.cpp
index 43a747924..de1832b26 100644
--- a/src/kernel/qjpegio.cpp
+++ b/src/kernel/qjpegio.cpp
@@ -42,12 +42,12 @@
 #define QT_CLEAN_NAMESPACE
 #endif
 
-#include "qimage.h"
+#include "ntqimage.h"
 
 #ifndef QT_NO_IMAGEIO_JPEG
 
-#include "qiodevice.h"
-#include "qjpegio.h"
+#include "ntqiodevice.h"
+#include "ntqjpegio.h"
 
 #include <stdio.h>      // jpeglib needs this to be pre-included
 #include <setjmp.h>
diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/qkeysequence.cpp
index 68f6faeb1..727b443bf 100644
--- a/src/kernel/qkeysequence.cpp
+++ b/src/kernel/qkeysequence.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "qkeysequence.h"
+#include "ntqkeysequence.h"
 
 #ifndef QT_NO_ACCEL
 
-#include "qaccel.h"
-#include "qshared.h"
-#include "qvaluelist.h"
+#include "ntqaccel.h"
+#include "ntqshared.h"
+#include "ntqvaluelist.h"
 #ifndef QT_NO_REGEXP
-# include "qregexp.h"
+# include "ntqregexp.h"
 #endif
 
 #ifdef Q_WS_MAC
@@ -57,7 +57,7 @@
 #endif
 
 /*!
-    \class TQKeySequence qkeysequence.h
+    \class TQKeySequence ntqkeysequence.h
     \brief The TQKeySequence class encapsulates a key sequence as used
     by accelerators.
 
@@ -67,7 +67,7 @@
     optionally combined with modifiers, e.g. \c SHIFT, \c CTRL, \c
     ALT, \c META, or \c UNICODE_ACCEL. For example, \c{CTRL + Key_P}
     might be a sequence used as a shortcut for printing a document.
-    The key codes are listed in \c{qnamespace.h}. As an alternative,
+    The key codes are listed in \c{ntqnamespace.h}. As an alternative,
     use \c UNICODE_ACCEL with the unicode code point of the character.
     For example, \c{UNICODE_ACCEL + 'A'} gives the same key sequence
     as \c Key_A.
@@ -241,7 +241,7 @@ TQKeySequence::TQKeySequence( const TQString& key )
 /*!
     Constructs a key sequence that has a single \a key.
 
-    The key codes are listed in \c{qnamespace.h} and can be
+    The key codes are listed in \c{ntqnamespace.h} and can be
     combined with modifiers, e.g. with \c SHIFT, \c CTRL, \c
     ALT, \c META or \c UNICODE_ACCEL.
 */
@@ -256,7 +256,7 @@ TQKeySequence::TQKeySequence( int key )
     Constructs a key sequence with up to 4 keys \a k1, \a k2,
     \a k3 and \a k4.
 
-    The key codes are listed in \c{qnamespace.h} and can be
+    The key codes are listed in \c{ntqnamespace.h} and can be
     combined with modifiers, e.g. with \c SHIFT, \c CTRL, \c
     ALT, \c META or \c UNICODE_ACCEL.
 */
diff --git a/src/kernel/qlayout.cpp b/src/kernel/qlayout.cpp
index 9f0792908..df9229ed8 100644
--- a/src/kernel/qlayout.cpp
+++ b/src/kernel/qlayout.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "qlayout.h"
+#include "ntqlayout.h"
 
 #ifndef QT_NO_LAYOUT
 
-#include "qapplication.h"
-#include "qwidget.h"
-#include "qptrlist.h"
-#include "qsizepolicy.h"
+#include "ntqapplication.h"
+#include "ntqwidget.h"
+#include "ntqptrlist.h"
+#include "ntqsizepolicy.h"
 
 #include "qlayoutengine_p.h"
 
diff --git a/src/kernel/qlayoutengine.cpp b/src/kernel/qlayoutengine.cpp
index f4c45846d..558d42671 100644
--- a/src/kernel/qlayoutengine.cpp
+++ b/src/kernel/qlayoutengine.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qlayout.h"
+#include "ntqlayout.h"
 #include "private/qlayoutengine_p.h"
 
 #ifndef QT_NO_LAYOUT
diff --git a/src/kernel/qlayoutengine_p.h b/src/kernel/qlayoutengine_p.h
index 4231a9c85..2e49891aa 100644
--- a/src/kernel/qlayoutengine_p.h
+++ b/src/kernel/qlayoutengine_p.h
@@ -42,7 +42,7 @@
 #define TQLAYOUTENGINE_P_H
 
 #ifndef TQLAYOUT_H
-    #error "Need to include qlayout.h before including qlayoutengine_p.h"
+    #error "Need to include ntqlayout.h before including qlayoutengine_p.h"
 #endif
 
 //
@@ -60,7 +60,7 @@
 
 
 #ifndef QT_H
-#include "qabstractlayout.h"
+#include "ntqabstractlayout.h"
 #endif // QT_H
 
 #ifndef QT_NO_LAYOUT
diff --git a/src/kernel/qlocalfs.cpp b/src/kernel/qlocalfs.cpp
index 6c4949369..a3e141ba3 100644
--- a/src/kernel/qlocalfs.cpp
+++ b/src/kernel/qlocalfs.cpp
@@ -38,22 +38,22 @@
 **
 **********************************************************************/
 
-#include "qlocalfs.h"
+#include "ntqlocalfs.h"
 
 #ifndef QT_NO_NETWORKPROTOCOL
 
-#include "qfileinfo.h"
-#include "qfile.h"
-#include "qurlinfo.h"
-#include "qapplication.h"
-#include "qurloperator.h"
-#include "qguardedptr.h"
+#include "ntqfileinfo.h"
+#include "ntqfile.h"
+#include "ntqurlinfo.h"
+#include "ntqapplication.h"
+#include "ntqurloperator.h"
+#include "ntqguardedptr.h"
 
 //#define TQLOCALFS_DEBUG
 
 
 /*!
-    \class TQLocalFs qlocalfs.h
+    \class TQLocalFs ntqlocalfs.h
     \brief The TQLocalFs class is an implementation of a
     TQNetworkProtocol that works on the local file system.
 \if defined(commercial)
diff --git a/src/kernel/qlock_p.h b/src/kernel/qlock_p.h
index 5550b94c0..5fb1526ca 100644
--- a/src/kernel/qlock_p.h
+++ b/src/kernel/qlock_p.h
@@ -52,7 +52,7 @@
 //
 
 #ifndef QT_H
-#include "qstring.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 class TQLockData;
diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp
index a2fc39b27..d9e6a152c 100644
--- a/src/kernel/qmetaobject.cpp
+++ b/src/kernel/qmetaobject.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "qmetaobject.h"
-#include "qasciidict.h"
+#include "ntqmetaobject.h"
+#include "ntqasciidict.h"
 
 #ifdef QT_THREAD_SUPPORT
 #include <private/qmutexpool_p.h>
 #endif // QT_THREAD_SUPPORT
 
 /*!
-  \class TQMetaData qmetaobject.h
+  \class TQMetaData ntqmetaobject.h
   \reentrant
 
   \brief The TQMetaData class provides information about a member function that is known to the meta object system.
@@ -64,7 +64,7 @@
  */
 
 /*!
-  \class TQClassInfo qmetaobject.h
+  \class TQClassInfo ntqmetaobject.h
 
   \brief The TQClassInfo class provides a struct that stores some basic information about a single class.
 
@@ -81,7 +81,7 @@
 
 
 /*!
-    \class TQMetaObject qmetaobject.h
+    \class TQMetaObject ntqmetaobject.h
     \brief The TQMetaObject class contains meta information about TQt objects.
 
     \ingroup objectmodel
@@ -845,7 +845,7 @@ bool TQMetaObject::qt_static_property( TQObject* o, int id, int f, TQVariant* v)
 
 
 /*!
-    \class TQMetaProperty qmetaobject.h
+    \class TQMetaProperty ntqmetaobject.h
 
     \brief The TQMetaProperty class stores meta data about a property.
 
diff --git a/src/kernel/qmime.cpp b/src/kernel/qmime.cpp
index b783bac98..34d4b2152 100644
--- a/src/kernel/qmime.cpp
+++ b/src/kernel/qmime.cpp
@@ -36,21 +36,21 @@
 **
 **********************************************************************/
 
-#include "qmime.h"
+#include "ntqmime.h"
 
 #ifndef QT_NO_MIME
 
-#include "qmap.h"
-#include "qstringlist.h"
-#include "qfileinfo.h"
-#include "qdir.h"
-#include "qdragobject.h"
-#include "qcleanuphandler.h"
-#include "qapplication.h" // ### for now
-#include "qclipboard.h" // ### for now
+#include "ntqmap.h"
+#include "ntqstringlist.h"
+#include "ntqfileinfo.h"
+#include "ntqdir.h"
+#include "ntqdragobject.h"
+#include "ntqcleanuphandler.h"
+#include "ntqapplication.h" // ### for now
+#include "ntqclipboard.h" // ### for now
 
 /*!
-    \class TQMimeSource qmime.h
+    \class TQMimeSource ntqmime.h
     \brief The TQMimeSource class is an abstraction of objects which provide formatted data of a certain MIME type.
 
     \ingroup io
@@ -180,7 +180,7 @@ public:
 
 
 /*!
-    \class TQMimeSourceFactory qmime.h
+    \class TQMimeSourceFactory ntqmime.h
     \brief The TQMimeSourceFactory class is an extensible provider of mime-typed data.
 
     \ingroup io
diff --git a/src/kernel/qmngio.cpp b/src/kernel/qmngio.cpp
index 809291842..0bd83131a 100644
--- a/src/kernel/qmngio.cpp
+++ b/src/kernel/qmngio.cpp
@@ -42,14 +42,14 @@
 #define QT_CLEAN_NAMESPACE
 #endif
 
-#include "qdatetime.h"
+#include "ntqdatetime.h"
 
 #ifndef QT_NO_IMAGEIO_MNG
 
-#include "qimage.h"
-#include "qasyncimageio.h"
-#include "qiodevice.h"
-#include "qmngio.h"
+#include "ntqimage.h"
+#include "ntqasyncimageio.h"
+#include "ntqiodevice.h"
+#include "ntqmngio.h"
 
 // Define XMD_H prohibits the included headers of libmng.h to typedef INT32.
 // This is needed for Borland with STL support, since in that case, INT32 is
@@ -209,7 +209,7 @@ class TQMNGFormatType : public TQImageFormatType
 
 
 /*
-  \class TQMNGFormat qmngio.h
+  \class TQMNGFormat ntqmngio.h
   \brief Incremental image decoder for MNG image format.
 
   \ingroup images
@@ -241,7 +241,7 @@ TODO: decide on this point.  gIFg gives disposal types, so it can be done.
 */
 
 /*
-  \class TQMNGFormatType qasyncimageio.h
+  \class TQMNGFormatType ntqasyncimageio.h
   \brief Incremental image decoder for MNG image format.
 
   \ingroup images
diff --git a/src/kernel/qmotifdnd_x11.cpp b/src/kernel/qmotifdnd_x11.cpp
index ddb7bb17b..0085b8956 100644
--- a/src/kernel/qmotifdnd_x11.cpp
+++ b/src/kernel/qmotifdnd_x11.cpp
@@ -68,11 +68,11 @@ in doc/dnd.doc, where the documentation system can see it. */
 
 #include "qplatformdefs.h"
 
-#include "qapplication.h"
+#include "ntqapplication.h"
 
 #ifndef QT_NO_DRAGANDDROP
 
-#include "qwidget.h"
+#include "ntqwidget.h"
 #include "qt_x11_p.h"
 
 #include <stdlib.h>
diff --git a/src/kernel/qmovie.cpp b/src/kernel/qmovie.cpp
index 2f2d9148a..431660674 100644
--- a/src/kernel/qmovie.cpp
+++ b/src/kernel/qmovie.cpp
@@ -40,15 +40,15 @@
 
 // #define QT_SAVE_MOVIE_HACK
 
-#include "qtimer.h"
-#include "qpainter.h"
-#include "qptrlist.h"
-#include "qbitmap.h"
-#include "qmovie.h"
-#include "qfile.h"
-#include "qbuffer.h"
-#include "qobject.h"
-#include "qpixmapcache.h"
+#include "ntqtimer.h"
+#include "ntqpainter.h"
+#include "ntqptrlist.h"
+#include "ntqbitmap.h"
+#include "ntqmovie.h"
+#include "ntqfile.h"
+#include "ntqbuffer.h"
+#include "ntqobject.h"
+#include "ntqpixmapcache.h"
 
 #ifndef QT_NO_MOVIE
 
@@ -56,13 +56,13 @@
 #include "qgfx_qws.h"
 #endif
 
-#include "qasyncio.h"
-#include "qasyncimageio.h"
+#include "ntqasyncio.h"
+#include "ntqasyncimageio.h"
 
 #include <stdlib.h>
 
 /*!
-    \class TQMovie qmovie.h
+    \class TQMovie ntqmovie.h
     \brief The TQMovie class provides incremental loading of animations or images, signalling as it progresses.
 
     \ingroup images
@@ -94,7 +94,7 @@
 
     The supported formats are MNG (if TQt is configured with MNG
     support enabled) and GIF (if TQt is configured with GIF support
-    enabled, see qgif.h).
+    enabled, see ntqgif.h).
 
     If TQt is configured to support GIF reading, we are required to
     state that "The Graphics Interchange Format(c) is the Copyright
diff --git a/src/kernel/qnetworkprotocol.cpp b/src/kernel/qnetworkprotocol.cpp
index 6861a26d0..c53649119 100644
--- a/src/kernel/qnetworkprotocol.cpp
+++ b/src/kernel/qnetworkprotocol.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "qnetworkprotocol.h"
+#include "ntqnetworkprotocol.h"
 
 #ifndef QT_NO_NETWORKPROTOCOL
 
-#include "qlocalfs.h"
-#include "qurloperator.h"
-#include "qtimer.h"
-#include "qmap.h"
-#include "qptrqueue.h"
+#include "ntqlocalfs.h"
+#include "ntqurloperator.h"
+#include "ntqtimer.h"
+#include "ntqmap.h"
+#include "ntqptrqueue.h"
 
 //#define TQNETWORKPROTOCOL_DEBUG
 #define NETWORK_OP_DELAY 1000
@@ -99,7 +99,7 @@ public:
 };
 
 /*!
-    \class TQNetworkProtocol qnetworkprotocol.h
+    \class TQNetworkProtocol ntqnetworkprotocol.h
     \brief The TQNetworkProtocol class provides a common API for network protocols.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp
index 7cc01174e..619308be3 100644
--- a/src/kernel/qobject.cpp
+++ b/src/kernel/qobject.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qvariant.h"
-#include "qapplication.h"
-#include "qobject.h"
-#include "qobjectlist.h"
-#include "qsignalslotimp.h"
-#include "qregexp.h"
-#include "qmetaobject.h"
+#include "ntqvariant.h"
+#include "ntqapplication.h"
+#include "ntqobject.h"
+#include "ntqobjectlist.h"
+#include "ntqsignalslotimp.h"
+#include "ntqregexp.h"
+#include "ntqmetaobject.h"
 #include <private/qucom_p.h>
 #include "qucomextra_p.h"
-#include "qptrvector.h"
+#include "ntqptrvector.h"
 
 #ifdef QT_THREAD_SUPPORT
-#include <qmutex.h>
+#include <ntqmutex.h>
 #include <private/qmutexpool_p.h>
 #endif
 
@@ -76,7 +76,7 @@ public:
 };
 
 /*!
-    \class TQt qnamespace.h
+    \class TQt ntqnamespace.h
 
     \brief The TQt class is a namespace for miscellaneous identifiers
     that need to be global-like.
@@ -106,7 +106,7 @@ public:
 
 
 /*!
-    \class TQObject qobject.h
+    \class TQObject ntqobject.h
     \brief The TQObject class is the base class of all TQt objects.
 
     \ingroup objectmodel
@@ -1105,7 +1105,7 @@ static void objSearch( TQObjectList *result,
     Returns a list of child objects, or 0 if this object has no
     children.
 
-    The TQObjectList class is defined in the \c qobjectlist.h header
+    The TQObjectList class is defined in the \c ntqobjectlist.h header
     file.
 
     The first child added is the \link TQPtrList::first() first\endlink
@@ -1127,7 +1127,7 @@ static void objSearch( TQObjectList *result,
     Returns a pointer to the list of all object trees (their root
     objects), or 0 if there are no objects.
 
-    The TQObjectList class is defined in the \c qobjectlist.h header
+    The TQObjectList class is defined in the \c ntqobjectlist.h header
     file.
 
     The most recent root object created is the \link TQPtrList::first()
@@ -1181,7 +1181,7 @@ const TQObjectList *TQObject::objectTrees()
     delete l; // delete the list, not the objects
     \endcode
 
-    The TQObjectList class is defined in the \c qobjectlist.h header
+    The TQObjectList class is defined in the \c ntqobjectlist.h header
     file.
 
     \warning Delete the list as soon you have finished using it. The
diff --git a/src/kernel/qobjectcleanuphandler.cpp b/src/kernel/qobjectcleanuphandler.cpp
index 7e12e7cb4..f9f5d3e2f 100644
--- a/src/kernel/qobjectcleanuphandler.cpp
+++ b/src/kernel/qobjectcleanuphandler.cpp
@@ -36,11 +36,11 @@
 **
 **********************************************************************/
 
-#include "qobjectcleanuphandler.h"
-#include "qobjectlist.h"
+#include "ntqobjectcleanuphandler.h"
+#include "ntqobjectlist.h"
 
 /*!
-    \class TQObjectCleanupHandler qobjectcleanuphandler.h
+    \class TQObjectCleanupHandler ntqobjectcleanuphandler.h
     \brief The TQObjectCleanupHandler class watches the lifetime of multiple TQObjects.
 
     \ingroup objectmodel
diff --git a/src/kernel/qpaintdevice_x11.cpp b/src/kernel/qpaintdevice_x11.cpp
index 2bc747c32..aefd8971a 100644
--- a/src/kernel/qpaintdevice_x11.cpp
+++ b/src/kernel/qpaintdevice_x11.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qpaintdevice.h"
-#include "qpaintdevicemetrics.h"
-#include "qpainter.h"
-#include "qwidget.h"
-#include "qbitmap.h"
-#include "qapplication.h"
+#include "ntqpaintdevice.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqpainter.h"
+#include "ntqwidget.h"
+#include "ntqbitmap.h"
+#include "ntqapplication.h"
 #include "qt_x11_p.h"
 
 
 /*!
-    \class TQPaintDevice qpaintdevice.h
+    \class TQPaintDevice ntqpaintdevice.h
     \brief The TQPaintDevice class is the base class of objects that
     can be painted.
 
@@ -270,8 +270,8 @@ TQPaintDeviceX11Data* TQPaintDevice::getX11Data( bool def ) const
     Returns the window system handle of the paint device, for
     low-level access. Using this function is not portable.
 
-    The HANDLE type varies with platform; see \c qpaintdevice.h and
-    \c qwindowdefs.h for details.
+    The HANDLE type varies with platform; see \c ntqpaintdevice.h and
+    \c ntqwindowdefs.h for details.
 
     \sa x11Display()
 */
diff --git a/src/kernel/qpaintdevicemetrics.cpp b/src/kernel/qpaintdevicemetrics.cpp
index c6f0e4d53..046533fbe 100644
--- a/src/kernel/qpaintdevicemetrics.cpp
+++ b/src/kernel/qpaintdevicemetrics.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "qpaintdevicemetrics.h"
+#include "ntqpaintdevicemetrics.h"
 
 /*!
-    \class TQPaintDeviceMetrics qpaintdevicemetrics.h
+    \class TQPaintDeviceMetrics ntqpaintdevicemetrics.h
     \brief The TQPaintDeviceMetrics class provides information about a
     paint device.
 
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp
index 2d99ef754..d0d069702 100644
--- a/src/kernel/qpainter.cpp
+++ b/src/kernel/qpainter.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qpainter.h"
+#include "ntqpainter.h"
 #include "qpainter_p.h"
-#include "qbitmap.h"
-#include "qptrstack.h"
-#include "qptrdict.h"
-#include "qdatastream.h"
-#include "qwidget.h"
-#include "qimage.h"
-#include "qpaintdevicemetrics.h"
-#include "qapplication.h"
+#include "ntqbitmap.h"
+#include "ntqptrstack.h"
+#include "ntqptrdict.h"
+#include "ntqdatastream.h"
+#include "ntqwidget.h"
+#include "ntqimage.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqapplication.h"
 #include "qrichtext_p.h"
-#include "qregexp.h"
-#include "qcleanuphandler.h"
+#include "ntqregexp.h"
+#include "ntqcleanuphandler.h"
 #ifdef Q_WS_QWS
 #include "qgfx_qws.h"
 #endif
@@ -69,7 +69,7 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack;
 #endif
 
 /*!
-    \class TQPainter qpainter.h
+    \class TQPainter ntqpainter.h
     \brief The TQPainter class does low-level painting e.g. on widgets.
 
     \ingroup graphics
@@ -235,7 +235,7 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack;
     platforms may behave incorrectly with coordinates as small as
     +/-4000.
 
-    \headerfile qdrawutil.h
+    \headerfile ntqdrawutil.h
 
     \sa TQPaintDevice TQWidget TQPixmap TQPrinter TQPicture
 	\link simple-application.html Application Walkthrough \endlink
@@ -3139,7 +3139,7 @@ TQRect TQPainter::boundingRect( const TQRect &r, int flags,
  *****************************************************************************/
 
 /*!
-    \class TQPen qpen.h
+    \class TQPen ntqpen.h
     \brief The TQPen class defines how a TQPainter should draw lines and outlines
     of shapes.
 
@@ -3568,7 +3568,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPen &p )
  *****************************************************************************/
 
 /*!
-    \class TQBrush qbrush.h
+    \class TQBrush ntqbrush.h
 
     \brief The TQBrush class defines the fill pattern of shapes drawn by a TQPainter.
 
diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
index d2127be2f..6214dc3b4 100644
--- a/src/kernel/qpainter_x11.cpp
+++ b/src/kernel/qpainter_x11.cpp
@@ -40,13 +40,13 @@
 
 #include "qplatformdefs.h"
 
-#include "qfont.h"
-#include "qpainter.h"
-#include "qwidget.h"
-#include "qbitmap.h"
-#include "qpixmapcache.h"
-#include "qtextcodec.h"
-#include "qpaintdevicemetrics.h"
+#include "ntqfont.h"
+#include "ntqpainter.h"
+#include "ntqwidget.h"
+#include "ntqbitmap.h"
+#include "ntqpixmapcache.h"
+#include "ntqtextcodec.h"
+#include "ntqpaintdevicemetrics.h"
 
 #include "qt_x11_p.h"
 
@@ -137,7 +137,7 @@ static const TQt::HANDLE rendhd = 0;
 #endif
 
 // hack, so we don't have to make TQRegion::clipRectangles() public or include
-// X11 headers in qregion.h
+// X11 headers in ntqregion.h
 inline void *qt_getClipRects( const TQRegion &r, int &num )
 {
     return r.clipRectangles( num );
@@ -435,8 +435,8 @@ static void init_gc_cache()
 
 // #define GC_CACHE_STAT
 #if defined(GC_CACHE_STAT)
-#include "qtextstream.h"
-#include "qbuffer.h"
+#include "ntqtextstream.h"
+#include "ntqbuffer.h"
 
 static int g_numhits    = 0;
 static int g_numcreates = 0;
diff --git a/src/kernel/qpalette.cpp b/src/kernel/qpalette.cpp
index 9d23df6cd..3821306c0 100644
--- a/src/kernel/qpalette.cpp
+++ b/src/kernel/qpalette.cpp
@@ -38,18 +38,18 @@
 **
 **********************************************************************/
 
-#include "qpalette.h"
+#include "ntqpalette.h"
 
 #ifndef QT_NO_PALETTE
-#include "qdatastream.h"
-#include "qcleanuphandler.h"
+#include "ntqdatastream.h"
+#include "ntqcleanuphandler.h"
 
 /*****************************************************************************
   TQColorGroup member functions
  *****************************************************************************/
 
 /*!
-    \class TQColorGroup qpalette.h
+    \class TQColorGroup ntqpalette.h
     \brief The TQColorGroup class contains a group of widget colors.
 
     \ingroup appearance
@@ -513,7 +513,7 @@ bool TQColorGroup::operator==( const TQColorGroup &g ) const
  *****************************************************************************/
 
 /*!
-    \class TQPalette qpalette.h
+    \class TQPalette ntqpalette.h
 
     \brief The TQPalette class contains color groups for each widget state.
 
diff --git a/src/kernel/qpicture.cpp b/src/kernel/qpicture.cpp
index 8d02588bc..aeb0f56e0 100644
--- a/src/kernel/qpicture.cpp
+++ b/src/kernel/qpicture.cpp
@@ -38,23 +38,23 @@
 **
 **********************************************************************/
 
-#include "qpicture.h"
+#include "ntqpicture.h"
 
 #ifndef QT_NO_PICTURE
 
-#include "qpainter.h"
-#include "qpixmap.h"
-#include "qimage.h"
-#include "qfile.h"
-#include "qdatastream.h"
-#include "qpaintdevicemetrics.h"
+#include "ntqpainter.h"
+#include "ntqpixmap.h"
+#include "ntqimage.h"
+#include "ntqfile.h"
+#include "ntqdatastream.h"
+#include "ntqpaintdevicemetrics.h"
 
 #ifndef QT_NO_SVG
 #include "private/qsvgdevice_p.h"
 #endif
 
 /*!
-    \class TQPicture qpicture.h
+    \class TQPicture ntqpicture.h
     \brief The TQPicture class is a paint device that records and
     replays TQPainter commands.
 
diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp
index 7d2580081..ca1490a5a 100644
--- a/src/kernel/qpixmap.cpp
+++ b/src/kernel/qpixmap.cpp
@@ -38,23 +38,23 @@
 **
 **********************************************************************/
 
-#include "qpixmap.h"
-
-#include "qbitmap.h"
-#include "qimage.h"
-#include "qwidget.h"
-#include "qpainter.h"
-#include "qdatastream.h"
-#include "qbuffer.h"
-#include "qobjectlist.h"
-#include "qapplication.h"
+#include "ntqpixmap.h"
+
+#include "ntqbitmap.h"
+#include "ntqimage.h"
+#include "ntqwidget.h"
+#include "ntqpainter.h"
+#include "ntqdatastream.h"
+#include "ntqbuffer.h"
+#include "ntqobjectlist.h"
+#include "ntqapplication.h"
 #include <private/qinternal_p.h>
-#include "qmime.h"
-#include "qdragobject.h"
-#include "qfile.h"
+#include "ntqmime.h"
+#include "ntqdragobject.h"
+#include "ntqfile.h"
 
 /*!
-    \class TQPixmap qpixmap.h
+    \class TQPixmap ntqpixmap.h
     \brief The TQPixmap class is an off-screen, pixel-based paint device.
 
     \ingroup graphics
diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp
index 8bbc20e8a..4040b055a 100644
--- a/src/kernel/qpixmap_x11.cpp
+++ b/src/kernel/qpixmap_x11.cpp
@@ -67,11 +67,11 @@
 #undef QT_MITSHM_XFORM
 #endif
 
-#include "qbitmap.h"
-#include "qpaintdevicemetrics.h"
-#include "qimage.h"
-#include "qwmatrix.h"
-#include "qapplication.h"
+#include "ntqbitmap.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqimage.h"
+#include "ntqwmatrix.h"
+#include "ntqapplication.h"
 #include "qt_x11_p.h"
 
 #include <stdlib.h>
diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp
index 14616e045..f29e0402c 100644
--- a/src/kernel/qpixmapcache.cpp
+++ b/src/kernel/qpixmapcache.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "qpixmapcache.h"
-#include "qcache.h"
-#include "qobject.h"
-#include "qcleanuphandler.h"
+#include "ntqpixmapcache.h"
+#include "ntqcache.h"
+#include "ntqobject.h"
+#include "ntqcleanuphandler.h"
 
 
 // REVISED: paul
 /*!
-    \class TQPixmapCache qpixmapcache.h
+    \class TQPixmapCache ntqpixmapcache.h
 
     \brief The TQPixmapCache class provides an application-global cache for
     pixmaps.
diff --git a/src/kernel/qpngio.cpp b/src/kernel/qpngio.cpp
index bbb4037bd..eee32c438 100644
--- a/src/kernel/qpngio.cpp
+++ b/src/kernel/qpngio.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qpngio.h"
+#include "ntqpngio.h"
 
 #ifndef QT_NO_IMAGEIO_PNG
 
-#include "qasyncimageio.h"
-#include "qiodevice.h"
+#include "ntqasyncimageio.h"
+#include "ntqiodevice.h"
 
 #include <png.h>
 #if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
@@ -764,7 +764,7 @@ void write_png_image(TQImageIO* iio)
 }
 
 /*!
-    \class TQPNGImagePacker qpngio.h
+    \class TQPNGImagePacker ntqpngio.h
     \brief The TQPNGImagePacker class creates well-compressed PNG animations.
 
     \ingroup images
@@ -979,7 +979,7 @@ class TQPNGFormatType : public TQImageFormatType
 
 
 /*
-  \class TQPNGFormat qpngio.h
+  \class TQPNGFormat ntqpngio.h
   \brief The TQPNGFormat class provides an incremental image decoder for PNG
   image format.
 
@@ -1012,7 +1012,7 @@ class TQPNGFormatType : public TQImageFormatType
 */
 
 /*
-  \class TQPNGFormatType qasyncimageio.h
+  \class TQPNGFormatType ntqasyncimageio.h
   \brief The TQPNGFormatType class provides an incremental image decoder
   for PNG image format.
 
diff --git a/src/kernel/qpoint.cpp b/src/kernel/qpoint.cpp
index 6e8359cf8..35fd3bc34 100644
--- a/src/kernel/qpoint.cpp
+++ b/src/kernel/qpoint.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qpoint.h"
-#include "qdatastream.h"
+#include "ntqpoint.h"
+#include "ntqdatastream.h"
 
 
 /*!
-    \class TQPoint qpoint.h
+    \class TQPoint ntqpoint.h
     \brief The TQPoint class defines a point in the plane.
 
     \ingroup images
diff --git a/src/kernel/qpointarray.cpp b/src/kernel/qpointarray.cpp
index 9df82efa0..3258a4415 100644
--- a/src/kernel/qpointarray.cpp
+++ b/src/kernel/qpointarray.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qpointarray.h"
-#include "qrect.h"
-#include "qdatastream.h"
-#include "qwmatrix.h"
+#include "ntqpointarray.h"
+#include "ntqrect.h"
+#include "ntqdatastream.h"
+#include "ntqwmatrix.h"
 #include <stdarg.h>
 
 const double Q_PI = 3.14159265358979323846;   // pi // one more useful comment
 
 
 /*!
-    \class TQPointArray qpointarray.h
+    \class TQPointArray ntqpointarray.h
     \brief The TQPointArray class provides an array of points.
 
     \ingroup images
diff --git a/src/kernel/qpolygonscanner.cpp b/src/kernel/qpolygonscanner.cpp
index ace53d29d..92f36f3e6 100644
--- a/src/kernel/qpolygonscanner.cpp
+++ b/src/kernel/qpolygonscanner.cpp
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#include "qpolygonscanner.h"
-#include "qpointarray.h"
+#include "ntqpolygonscanner.h"
+#include "ntqpointarray.h"
 #include <stdlib.h>
 
 
diff --git a/src/kernel/qprinter.cpp b/src/kernel/qprinter.cpp
index a4d64a0d6..3dd79b99c 100644
--- a/src/kernel/qprinter.cpp
+++ b/src/kernel/qprinter.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-#include "qprinter.h"
+#include "ntqprinter.h"
 #include "qprinter_p.h"
 
 #ifndef QT_NO_PRINTER
 
 /*!
-    \class TQPrinter qprinter.h
+    \class TQPrinter ntqprinter.h
     \brief The TQPrinter class is a paint device that paints on a printer.
 
     \ingroup images
diff --git a/src/kernel/qprinter_p.h b/src/kernel/qprinter_p.h
index 42caeade0..17d528985 100644
--- a/src/kernel/qprinter_p.h
+++ b/src/kernel/qprinter_p.h
@@ -43,9 +43,9 @@
 #ifndef QT_NO_PRINTER
 
 #ifndef QT_H
-#include <qshared.h>
-#include <qstring.h>
-#include <qsize.h>
+#include <ntqshared.h>
+#include <ntqstring.h>
+#include <ntqsize.h>
 #endif // QT_H
 
 class TQPrinterPrivate
diff --git a/src/kernel/qprinter_unix.cpp b/src/kernel/qprinter_unix.cpp
index 9c24c8fce..bbe30a850 100644
--- a/src/kernel/qprinter_unix.cpp
+++ b/src/kernel/qprinter_unix.cpp
@@ -47,14 +47,14 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
 # undef open
 #endif
 
-#include "qprinter.h"
+#include "ntqprinter.h"
 
 #ifndef QT_NO_PRINTER
 
-#include "qpaintdevicemetrics.h"
+#include "ntqpaintdevicemetrics.h"
 #include "qpsprinter_p.h"
-#include "qprintdialog.h"
-#include "qapplication.h"
+#include "ntqprintdialog.h"
+#include "ntqapplication.h"
 #include "qprinter_p.h"
 
 #include <unistd.h> // For ::sleep()
diff --git a/src/kernel/qprocess.cpp b/src/kernel/qprocess.cpp
index 59dc27abe..64262960a 100644
--- a/src/kernel/qprocess.cpp
+++ b/src/kernel/qprocess.cpp
@@ -41,11 +41,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "qprocess.h"
+#include "ntqprocess.h"
 
 #ifndef QT_NO_PROCESS
 
-#include "qapplication.h"
+#include "ntqapplication.h"
 #include "private/qinternal_p.h"
 
 
@@ -53,7 +53,7 @@
 
 
 /*!
-    \class TQProcess qprocess.h
+    \class TQProcess ntqprocess.h
 
     \brief The TQProcess class is used to start external programs and
     to communicate with them.
diff --git a/src/kernel/qprocess_unix.cpp b/src/kernel/qprocess_unix.cpp
index 57bb56f5d..1c2e0b9f5 100644
--- a/src/kernel/qprocess_unix.cpp
+++ b/src/kernel/qprocess_unix.cpp
@@ -45,17 +45,17 @@
 #undef connect
 #endif
 
-#include "qprocess.h"
+#include "ntqprocess.h"
 
 #ifndef QT_NO_PROCESS
 
-#include "qapplication.h"
-#include "qptrqueue.h"
-#include "qptrlist.h"
-#include "qsocketnotifier.h"
-#include "qtimer.h"
-#include "qcleanuphandler.h"
-#include "qregexp.h"
+#include "ntqapplication.h"
+#include "ntqptrqueue.h"
+#include "ntqptrlist.h"
+#include "ntqsocketnotifier.h"
+#include "ntqtimer.h"
+#include "ntqcleanuphandler.h"
+#include "ntqregexp.h"
 #include "private/qinternal_p.h"
 
 #include <stdlib.h>
diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp
index 0fc94ad24..f52b43710 100644
--- a/src/kernel/qpsprinter.cpp
+++ b/src/kernel/qpsprinter.cpp
@@ -56,23 +56,23 @@
 
 #undef Q_PRINTER_USE_TYPE42
 
-#include "qpainter.h"
-#include "qapplication.h"
-#include "qpaintdevicemetrics.h"
-#include "qimage.h"
-#include "qdatetime.h"
-#include "qstring.h"
-#include "qdict.h"
-#include "qmemarray.h"
-#include "qfile.h"
-#include "qbuffer.h"
-#include "qintdict.h"
-#include "qtextcodec.h"
-#include "qsettings.h"
-#include "qmap.h"
-#include "qfontdatabase.h"
-#include "qregexp.h"
-#include "qbitmap.h"
+#include "ntqpainter.h"
+#include "ntqapplication.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqimage.h"
+#include "ntqdatetime.h"
+#include "ntqstring.h"
+#include "ntqdict.h"
+#include "ntqmemarray.h"
+#include "ntqfile.h"
+#include "ntqbuffer.h"
+#include "ntqintdict.h"
+#include "ntqtextcodec.h"
+#include "ntqsettings.h"
+#include "ntqmap.h"
+#include "ntqfontdatabase.h"
+#include "ntqregexp.h"
+#include "ntqbitmap.h"
 #include <private/qunicodetables_p.h>
 
 #if defined(Q_OS_WIN32)
@@ -5355,7 +5355,7 @@ static void emitBits( char *out, int & byte, int & bit,
 
 //#define DEBUG_COMPRESS
 #ifdef DEBUG_COMPRESS
-#include <qdatetime.h>
+#include <ntqdatetime.h>
 #endif
 
 static TQByteArray compress( const TQImage & image, bool gray ) {
diff --git a/src/kernel/qpsprinter_p.h b/src/kernel/qpsprinter_p.h
index e560b95fa..070f43207 100644
--- a/src/kernel/qpsprinter_p.h
+++ b/src/kernel/qpsprinter_p.h
@@ -58,8 +58,8 @@
 
 
 #ifndef QT_H
-#include "qprinter.h"
-#include "qtextstream.h"
+#include "ntqprinter.h"
+#include "ntqtextstream.h"
 #endif // QT_H
 
 #ifndef QT_NO_PRINTER
diff --git a/src/kernel/qrect.cpp b/src/kernel/qrect.cpp
index 17197aa33..3a8bd2fb6 100644
--- a/src/kernel/qrect.cpp
+++ b/src/kernel/qrect.cpp
@@ -39,8 +39,8 @@
 **********************************************************************/
 
 #define	 TQRECT_C
-#include "qrect.h"
-#include "qdatastream.h"
+#include "ntqrect.h"
+#include "ntqdatastream.h"
 
 /*!
     \class TQRect
@@ -54,7 +54,7 @@
     a bottom-right corner, but it is normally expressed as an
     upper-left corner and a size.
 
-    The coordinate type is TQCOORD (defined in \c qwindowdefs.h as \c
+    The coordinate type is TQCOORD (defined in \c ntqwindowdefs.h as \c
     int). The minimum value of TQCOORD is TQCOORD_MIN (-2147483648) and
     the maximum value is  TQCOORD_MAX (2147483647).
 
diff --git a/src/kernel/qregion.cpp b/src/kernel/qregion.cpp
index af15d565f..6537b74ce 100644
--- a/src/kernel/qregion.cpp
+++ b/src/kernel/qregion.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "qregion.h"
-#include "qpointarray.h"
-#include "qbuffer.h"
-#include "qdatastream.h"
+#include "ntqregion.h"
+#include "ntqpointarray.h"
+#include "ntqbuffer.h"
+#include "ntqdatastream.h"
 
 // BEING REVISED: paul
 /*!
-    \class TQRegion qregion.h
+    \class TQRegion ntqregion.h
     \brief The TQRegion class specifies a clip region for a painter.
 
     \ingroup images
diff --git a/src/kernel/qregion_x11.cpp b/src/kernel/qregion_x11.cpp
index 78155fecc..2094a00c7 100644
--- a/src/kernel/qregion_x11.cpp
+++ b/src/kernel/qregion_x11.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qregion.h"
-#include "qpointarray.h"
-#include "qbuffer.h"
-#include "qimage.h"
-#include "qbitmap.h"
+#include "ntqregion.h"
+#include "ntqpointarray.h"
+#include "ntqbuffer.h"
+#include "ntqimage.h"
+#include "ntqbitmap.h"
 #include "qt_x11_p.h"
 
 #include <stdlib.h>
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp
index e572fb8f8..783b89188 100644
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/qrichtext.cpp
@@ -43,25 +43,25 @@
 #ifndef QT_NO_RICHTEXT
 
 
-#include "qstringlist.h"
-#include "qfont.h"
-#include "qtextstream.h"
-#include "qfile.h"
-#include "qapplication.h"
-#include "qmap.h"
-#include "qfileinfo.h"
-#include "qstylesheet.h"
-#include "qmime.h"
-#include "qimage.h"
-#include "qdragobject.h"
-#include "qpaintdevicemetrics.h"
-#include "qpainter.h"
-#include "qdrawutil.h"
-#include "qcursor.h"
-#include "qptrstack.h"
-#include "qptrdict.h"
-#include "qstyle.h"
-#include "qcleanuphandler.h"
+#include "ntqstringlist.h"
+#include "ntqfont.h"
+#include "ntqtextstream.h"
+#include "ntqfile.h"
+#include "ntqapplication.h"
+#include "ntqmap.h"
+#include "ntqfileinfo.h"
+#include "ntqstylesheet.h"
+#include "ntqmime.h"
+#include "ntqimage.h"
+#include "ntqdragobject.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqpainter.h"
+#include "ntqdrawutil.h"
+#include "ntqcursor.h"
+#include "ntqptrstack.h"
+#include "ntqptrdict.h"
+#include "ntqstyle.h"
+#include "ntqcleanuphandler.h"
 #include "qtextengine_p.h"
 #include <private/qunicodetables_p.h>
 
@@ -6694,8 +6694,8 @@ void TQTextImage::adjustToPainter( TQPainter* p )
 }
 
 #if !defined(Q_WS_X11)
-#include <qbitmap.h>
-#include <qcleanuphandler.h>
+#include <ntqbitmap.h>
+#include <ntqcleanuphandler.h>
 static TQPixmap *qrt_selection = 0;
 static TQSingleCleanupHandler<TQPixmap> qrt_cleanup_pixmap;
 static void qrt_createSelectionPixmap( const TQColorGroup &cg )
diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h
index 2d7844382..7c5453b55 100644
--- a/src/kernel/qrichtext_p.h
+++ b/src/kernel/qrichtext_p.h
@@ -54,27 +54,27 @@
 //
 
 #ifndef QT_H
-#include "qstring.h"
-#include "qptrlist.h"
-#include "qrect.h"
-#include "qfontmetrics.h"
-#include "qintdict.h"
-#include "qmap.h"
-#include "qstringlist.h"
-#include "qfont.h"
-#include "qcolor.h"
-#include "qsize.h"
-#include "qvaluelist.h"
-#include "qvaluestack.h"
-#include "qobject.h"
-#include "qdict.h"
-#include "qpixmap.h"
-#include "qstylesheet.h"
-#include "qptrvector.h"
-#include "qpainter.h"
-#include "qlayout.h"
-#include "qobject.h"
-#include "qapplication.h"
+#include "ntqstring.h"
+#include "ntqptrlist.h"
+#include "ntqrect.h"
+#include "ntqfontmetrics.h"
+#include "ntqintdict.h"
+#include "ntqmap.h"
+#include "ntqstringlist.h"
+#include "ntqfont.h"
+#include "ntqcolor.h"
+#include "ntqsize.h"
+#include "ntqvaluelist.h"
+#include "ntqvaluestack.h"
+#include "ntqobject.h"
+#include "ntqdict.h"
+#include "ntqpixmap.h"
+#include "ntqstylesheet.h"
+#include "ntqptrvector.h"
+#include "ntqpainter.h"
+#include "ntqlayout.h"
+#include "ntqobject.h"
+#include "ntqapplication.h"
 #endif // QT_H
 
 #ifndef QT_NO_RICHTEXT
diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/qscriptengine.cpp
index 6967f4847..ab6bd2f36 100644
--- a/src/kernel/qscriptengine.cpp
+++ b/src/kernel/qscriptengine.cpp
@@ -36,9 +36,9 @@
 
 #include "qscriptengine_p.h"
 
-#include "qstring.h"
-#include "qrect.h"
-#include "qfont.h"
+#include "ntqstring.h"
+#include "ntqrect.h"
+#include "ntqfont.h"
 #include <private/qunicodetables_p.h>
 #include "qtextengine_p.h"
 #include "qfontengine_p.h"
diff --git a/src/kernel/qscriptengine_x11.cpp b/src/kernel/qscriptengine_x11.cpp
index 5bbbfdc3b..06523b700 100644
--- a/src/kernel/qscriptengine_x11.cpp
+++ b/src/kernel/qscriptengine_x11.cpp
@@ -1899,8 +1899,8 @@ static void indic_attributes(int script, const TQString &text, int from, int len
 //
 // --------------------------------------------------------------------------------------------------------------------------------------------
 
-#include <qtextcodec.h>
-#include <qlibrary.h>
+#include <ntqtextcodec.h>
+#include <ntqlibrary.h>
 
 
 static void thaiWordBreaks(const TQChar *string, const int len, TQCharAttributes *attributes)
diff --git a/src/kernel/qsharedmemory_p.h b/src/kernel/qsharedmemory_p.h
index 00f190a2b..30cd171ee 100644
--- a/src/kernel/qsharedmemory_p.h
+++ b/src/kernel/qsharedmemory_p.h
@@ -52,7 +52,7 @@
 //
 
 #ifndef QT_H
-#include "qstring.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #if !defined (QT_QWS_NO_SHM)
diff --git a/src/kernel/qsignal.cpp b/src/kernel/qsignal.cpp
index 5e6f2a48d..acc74829f 100644
--- a/src/kernel/qsignal.cpp
+++ b/src/kernel/qsignal.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qsignal.h"
-#include "qmetaobject.h"
-#include "qguardedptr.h"
+#include "ntqsignal.h"
+#include "ntqmetaobject.h"
+#include "ntqguardedptr.h"
 
 /*!
-    \class TQSignal qsignal.h
+    \class TQSignal ntqsignal.h
     \brief The TQSignal class can be used to send signals for classes
     that don't inherit TQObject.
 
@@ -67,7 +67,7 @@
 
     Example:
     \code
-	#include <qsignal.h>
+	#include <ntqsignal.h>
 
 	class MyClass
 	{
diff --git a/src/kernel/qsignalmapper.cpp b/src/kernel/qsignalmapper.cpp
index fda65b054..0e23de826 100644
--- a/src/kernel/qsignalmapper.cpp
+++ b/src/kernel/qsignalmapper.cpp
@@ -38,9 +38,9 @@
 **
 **********************************************************************/
 
-#include "qsignalmapper.h"
+#include "ntqsignalmapper.h"
 #ifndef QT_NO_SIGNALMAPPER
-#include "qptrdict.h"
+#include "ntqptrdict.h"
 
 struct TQSignalMapperRec {
     TQSignalMapperRec()
@@ -67,7 +67,7 @@ public:
 };
 
 /*!
-    \class TQSignalMapper qsignalmapper.h
+    \class TQSignalMapper ntqsignalmapper.h
     \brief The TQSignalMapper class bundles signals from identifiable senders.
 
     \ingroup io
diff --git a/src/kernel/qsimplerichtext.cpp b/src/kernel/qsimplerichtext.cpp
index b21efba04..20bea6af4 100644
--- a/src/kernel/qsimplerichtext.cpp
+++ b/src/kernel/qsimplerichtext.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qsimplerichtext.h"
+#include "ntqsimplerichtext.h"
 
 #ifndef QT_NO_RICHTEXT
 #include "qrichtext_p.h"
-#include "qapplication.h"
+#include "ntqapplication.h"
 
 class TQSimpleRichTextData
 {
@@ -76,7 +76,7 @@ void TQSimpleRichTextData::adjustSize(TQPainter *p) {
 }
 
 /*!
-    \class TQSimpleRichText qsimplerichtext.h
+    \class TQSimpleRichText ntqsimplerichtext.h
     \brief The TQSimpleRichText class provides a small displayable piece of rich text.
 
     \ingroup text
diff --git a/src/kernel/qsize.cpp b/src/kernel/qsize.cpp
index c2b8d9b94..4cd0735c3 100644
--- a/src/kernel/qsize.cpp
+++ b/src/kernel/qsize.cpp
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#include "qsize.h"
-#include "qdatastream.h"
+#include "ntqsize.h"
+#include "ntqdatastream.h"
 
 
 /*!
@@ -51,7 +51,7 @@
 
   A size is specified by a width and a height.
 
-  The coordinate type is TQCOORD (defined in \c <qwindowdefs.h> as \c int).
+  The coordinate type is TQCOORD (defined in \c <ntqwindowdefs.h> as \c int).
   The minimum value of TQCOORD is TQCOORD_MIN (-2147483648) and the maximum
   value is TQCOORD_MAX (2147483647).
 
diff --git a/src/kernel/qsizegrip.cpp b/src/kernel/qsizegrip.cpp
index c0de2643c..decff43a7 100644
--- a/src/kernel/qsizegrip.cpp
+++ b/src/kernel/qsizegrip.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qsizegrip.h"
+#include "ntqsizegrip.h"
 
 #ifndef QT_NO_SIZEGRIP
 
-#include "qpainter.h"
-#include "qapplication.h"
-#include "qstyle.h"
+#include "ntqpainter.h"
+#include "ntqapplication.h"
+#include "ntqstyle.h"
 
 #if defined(Q_WS_X11)
 #include "qt_x11_p.h"
 extern Atom qt_sizegrip;			// defined in qapplication_x11.cpp
 #elif defined (Q_WS_WIN )
-#include "qobjectlist.h"
+#include "ntqobjectlist.h"
 #include "qt_windows.h"
 #elif defined(Q_WS_MAC)
 bool qt_mac_update_sizer(TQWidget *, int); //qwidget_mac.cpp
@@ -79,7 +79,7 @@ static TQWidget* qt_sizegrip_workspace( TQWidget* w )
 
 
 /*!
-    \class TQSizeGrip qsizegrip.h
+    \class TQSizeGrip ntqsizegrip.h
 
     \brief The TQSizeGrip class provides a corner-grip for resizing a top-level window.
 
diff --git a/src/kernel/qsocketnotifier.cpp b/src/kernel/qsocketnotifier.cpp
index 1e8e0f239..b7bceb15e 100644
--- a/src/kernel/qsocketnotifier.cpp
+++ b/src/kernel/qsocketnotifier.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "qsocketnotifier.h"
-#include "qapplication.h"
-#include "qevent.h"
-#include "qeventloop.h"
+#include "ntqsocketnotifier.h"
+#include "ntqapplication.h"
+#include "ntqevent.h"
+#include "ntqeventloop.h"
 #include "qplatformdefs.h"
 
 #if defined(Q_OS_UNIX)
@@ -50,7 +50,7 @@
 
 
 /*!
-    \class TQSocketNotifier qsocketnotifier.h
+    \class TQSocketNotifier ntqsocketnotifier.h
     \brief The TQSocketNotifier class provides support for socket callbacks.
 
     \ingroup io
diff --git a/src/kernel/qsound.cpp b/src/kernel/qsound.cpp
index 845b6a754..604bf130d 100644
--- a/src/kernel/qsound.cpp
+++ b/src/kernel/qsound.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qsound.h"
+#include "ntqsound.h"
 
 #ifndef QT_NO_SOUND
 
-#include "qptrlist.h"
+#include "ntqptrlist.h"
 
 static TQPtrList<TQAuServer> *servers=0;
 
@@ -98,7 +98,7 @@ public:
 };
 
 /*!
-    \class TQSound qsound.h
+    \class TQSound ntqsound.h
     \brief The TQSound class provides access to the platform audio facilities.
 
     \ingroup multimedia
diff --git a/src/kernel/qsound_x11.cpp b/src/kernel/qsound_x11.cpp
index 26c5afb73..59f6d0a0e 100644
--- a/src/kernel/qsound_x11.cpp
+++ b/src/kernel/qsound_x11.cpp
@@ -40,13 +40,13 @@
 
 #define QT_CLEAN_NAMESPACE
 
-#include "qsound.h"
+#include "ntqsound.h"
 
 #ifndef QT_NO_SOUND
 
-#include "qptrdict.h"
-#include "qsocketnotifier.h"
-#include "qapplication.h"
+#include "ntqptrdict.h"
+#include "ntqsocketnotifier.h"
+#include "ntqapplication.h"
 
 
 #ifdef QT_NAS_SUPPORT
diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp
index 9222e3735..25c9b1801 100644
--- a/src/kernel/qstyle.cpp
+++ b/src/kernel/qstyle.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qstyle.h"
+#include "ntqstyle.h"
 #ifndef QT_NO_STYLE
-#include "qapplication.h"
-#include "qpainter.h"
-#include "qbitmap.h"
-#include "qpixmapcache.h"
+#include "ntqapplication.h"
+#include "ntqpainter.h"
+#include "ntqbitmap.h"
+#include "ntqpixmapcache.h"
 
 #include <limits.h>
 
@@ -57,7 +57,7 @@ public:
 };
 
 /*!
-    \class TQStyleOption qstyle.h
+    \class TQStyleOption ntqstyle.h
     \brief The TQStyleOption class specifies optional parameters for TQStyle functions.
     \ingroup appearance
 
@@ -307,7 +307,7 @@ public:
 */
 
 /*!
-    \class TQStyle qstyle.h
+    \class TQStyle ntqstyle.h
     \brief The TQStyle class specifies the look and feel of a GUI.
     \ingroup appearance
 
diff --git a/src/kernel/qstylesheet.cpp b/src/kernel/qstylesheet.cpp
index 333f1059c..e74a9be16 100644
--- a/src/kernel/qstylesheet.cpp
+++ b/src/kernel/qstylesheet.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "qstylesheet.h"
+#include "ntqstylesheet.h"
 
 #ifndef QT_NO_RICHTEXT
 
 #include "private/qrichtext_p.h"
-#include "qlayout.h"
-#include "qpainter.h"
-#include "qcleanuphandler.h"
+#include "ntqlayout.h"
+#include "ntqpainter.h"
+#include "ntqcleanuphandler.h"
 
 #include <stdio.h>
 
@@ -78,7 +78,7 @@ public:
 };
 
 /*!
-    \class TQStyleSheetItem qstylesheet.h
+    \class TQStyleSheetItem ntqstylesheet.h
     \brief The TQStyleSheetItem class provides an encapsulation of a set of text styles.
 
     \ingroup text
@@ -855,7 +855,7 @@ int TQStyleSheetItem::lineSpacing() const
 
 
 /*!
-    \class TQStyleSheet qstylesheet.h
+    \class TQStyleSheet ntqstylesheet.h
     \ingroup text
     \brief The TQStyleSheet class is a collection of styles for rich text
     rendering and a generator of tags.
diff --git a/src/kernel/qt.h b/src/kernel/qt.h
deleted file mode 100644
index 01d43d298..000000000
--- a/src/kernel/qt.h
+++ /dev/null
@@ -1,375 +0,0 @@
-/****************************************************************************
-**
-** TQt GUI Toolkit
-**
-** This header file efficiently includes all TQt GUI Toolkit functionality.
-**
-** Generated : Mon Oct 13 13:07:29 CEST 2003
-
-**
-** Copyright (C) 1995-2008 Trolltech ASA.  All rights reserved.
-**
-** This file is part of the TQt GUI Toolkit.
-**
-*****************************************************************************/
-
-#ifndef QT_H
-#define QT_H
-#include "qglobal.h"
-#include "qfeatures.h"
-#include "qshared.h"
-#include "qptrcollection.h"
-#include "qglist.h"
-#include "qobjectdefs.h"
-#include "qnamespace.h"
-#include "qgarray.h"
-#include "qmemarray.h"
-#include "qcstring.h"
-#include "qstring.h"
-#include "qptrlist.h"
-#include "qiodevice.h"
-#include "qkeysequence.h"
-#include "qwindowdefs.h"
-#include "qgdict.h"
-#include "qfont.h"
-#include "qdatastream.h"
-#include "qpair.h"
-#include "qpoint.h"
-#include <stdio.h>
-#include "qtextstream.h"
-#include "qfontinfo.h"
-#include "qsizepolicy.h"
-#include "qtl.h"
-#include "qsize.h"
-#include "qrect.h"
-#include "qbitarray.h"
-#include "qregion.h"
-#include "qsql.h"
-#include "qstrlist.h"
-#include "qvaluelist.h"
-#include "qmap.h"
-#include "qdatetime.h"
-#include "qmime.h"
-#include "qasciidict.h"
-#include "qpaintdevice.h"
-#include "qfontmetrics.h"
-#include "qdict.h"
-#include "qevent.h"
-#include "qhostaddress.h"
-#include "qstringlist.h"
-#include "qcolor.h"
-#include <qdom.h>
-#include "qobject.h"
-#include <qdrawutil.h>
-#include "qbrush.h"
-#include "qpalette.h"
-#include "qwidget.h"
-#include "qjpunicode.h"
-#include "qtextcodec.h"
-#include "qstyle.h"
-#include "qframe.h"
-#include "qfile.h"
-#include "qfileinfo.h"
-#include "qurlinfo.h"
-#include "qwidgetlist.h"
-#include <qcombobox.h>
-#include "qgroupbox.h"
-#include "qdialog.h"
-#include <qdataview.h>
-#include "qdockwindow.h"
-#include "qcommonstyle.h"
-#include "qnetworkprotocol.h"
-#include <qeuckrcodec.h>
-#include <qgb18030codec.h>
-#include "qgcache.h"
-#include "qpixmap.h"
-#include <qgif.h>
-#include <qglcolormap.h>
-#include <qcache.h>
-#include <qdropsite.h>
-#include "qgplugin.h"
-#include <qgrid.h>
-#include "qrangecontrol.h"
-#include "qbuttongroup.h"
-#include <qdatetimeedit.h>
-#include "qgvector.h"
-#include "qhbox.h"
-#include <qhbuttongroup.h>
-#include "qiconset.h"
-#include <qhgroupbox.h>
-#include "qsocketnotifier.h"
-#include <qeventloop.h>
-#include <qhttp.h>
-#include <qaction.h>
-#include "qbuffer.h"
-#include "qimage.h"
-#include <qimageformatplugin.h>
-#include "qlineedit.h"
-#include <qintcache.h>
-#include "qintdict.h"
-#include "qmotifstyle.h"
-#include "qpicture.h"
-#include <qjiscodec.h>
-#include <qeucjpcodec.h>
-#include <qkeycode.h>
-#include <qaccel.h>
-#include "qlabel.h"
-#include "qlayout.h"
-#include <qlcdnumber.h>
-#include <qlibrary.h>
-#include <qinputdialog.h>
-#include "qscrollbar.h"
-#include "qscrollview.h"
-#include "qdir.h"
-#include "qwindowsstyle.h"
-#include "qconnection.h"
-#include "qbitmap.h"
-#include "qvariant.h"
-#include "qsignal.h"
-#include <qmessagebox.h>
-#include "qmetaobject.h"
-#include "qheader.h"
-#include <qmotifplusstyle.h>
-#include <qcdestyle.h>
-#include <qmovie.h>
-#include "qptrvector.h"
-#include "qmutex.h"
-#include "qbutton.h"
-#include <qnetwork.h>
-#include <qftp.h>
-#include "qguardedptr.h"
-#include <qobjectcleanuphandler.h>
-#include "qsqlfield.h"
-#include <qobjectdict.h>
-#include <qobjectlist.h>
-#include <qcolordialog.h>
-#include <qpaintdevicemetrics.h>
-#include "qpointarray.h"
-#include "qmenudata.h"
-#include <qlistview.h>
-#include "qpen.h"
-#include "qdragobject.h"
-#include <qiconview.h>
-#include <qpixmapcache.h>
-#include <qplatinumstyle.h>
-#include <qpngio.h>
-#include <qcursor.h>
-#include <qerrormessage.h>
-#include <qpolygonscanner.h>
-#include "qpopupmenu.h"
-#include <qprintdialog.h>
-#include <qprinter.h>
-#include <qprocess.h>
-#include "qprogressbar.h"
-#include "qsemimodal.h"
-#include <qasciicache.h>
-#include "qptrdict.h"
-#include <qcleanuphandler.h>
-#include <qptrqueue.h>
-#include <qptrstack.h>
-#include "qstylesheet.h"
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qdial.h>
-#include <qdockarea.h>
-#include "qregexp.h"
-#include <qclipboard.h>
-#include <qrtlcodec.h>
-#include <qlistbox.h>
-#include <qgridview.h>
-#include "qsemaphore.h"
-#include <qprogressdialog.h>
-#include "qsocketdevice.h"
-#include <qsessionmanager.h>
-#include <qsettings.h>
-#include <qsgistyle.h>
-#include <qfontdialog.h>
-#include "qtimer.h"
-#include <qsignalmapper.h>
-#include <qsignalslotimp.h>
-#include <qsimplerichtext.h>
-#include "qwmatrix.h"
-#include <qsizegrip.h>
-#include <qabstractlayout.h>
-#include <qsjiscodec.h>
-#include <qslider.h>
-#include <qsocket.h>
-#include <qserversocket.h>
-#include <qdns.h>
-#include <qsortedlist.h>
-#include <qsound.h>
-#include <qspinbox.h>
-#include <qsplashscreen.h>
-#include <qsplitter.h>
-#include "qsqlerror.h"
-#include "qeditorfactory.h"
-#include "qsqlquery.h"
-#include "qsqlrecord.h"
-#include <qsqldriverplugin.h>
-#include "qsqlindex.h"
-#include "qsqlcursor.h"
-#include <qsqldriver.h>
-#include <qsqlform.h>
-#include "qtable.h"
-#include <qsqlpropertymap.h>
-#include <qsqldatabase.h>
-#include <qdatabrowser.h>
-#include <qsqlresult.h>
-#include <qsqlselectcursor.h>
-#include <qstatusbar.h>
-#include <qmenubar.h>
-#include <qcanvas.h>
-#include "qtranslator.h"
-#include <qstrvec.h>
-#include <qinterlacestyle.h>
-#include <qstylefactory.h>
-#include <qstyleplugin.h>
-#include "qtextedit.h"
-#include <qsyntaxhighlighter.h>
-#include <qtabbar.h>
-#include <qtabdialog.h>
-#include "qsqleditorfactory.h"
-#include <qtabwidget.h>
-#include <qtextbrowser.h>
-#include <qbig5codec.h>
-#include <qtextcodecfactory.h>
-#include <qtextcodecplugin.h>
-#include <qmultilineedit.h>
-#include "qtoolbar.h"
-#include <qtextview.h>
-#include "qwaitcondition.h"
-#include <qasyncio.h>
-#include <qfontdatabase.h>
-#include <qmainwindow.h>
-#include <qtoolbox.h>
-#include <qtoolbutton.h>
-#include <qtooltip.h>
-#include "qdesktopwidget.h"
-#include <qtsciicodec.h>
-#include "qurl.h"
-#include "qurloperator.h"
-#include <qfiledialog.h>
-#include <qutfcodec.h>
-#include <quuid.h>
-#include <qvalidator.h>
-#include <qasyncimageio.h>
-#include <qvaluestack.h>
-#include <qvaluevector.h>
-#include <qdatatable.h>
-#include <qvbox.h>
-#include <qvbuttongroup.h>
-#include <qvfbhdr.h>
-#include <qvgroupbox.h>
-#include <qthread.h>
-#include <qwhatsthis.h>
-#include <qapplication.h>
-#include <qwidgetintdict.h>
-#include <qfocusdata.h>
-#include <qwidgetplugin.h>
-#include <qwidgetstack.h>
-#include <qcheckbox.h>
-#include <qcompactstyle.h>
-#include <qwizard.h>
-#include <qpainter.h>
-#include <qworkspace.h>
-#include <qlocalfs.h>
-#include <qxml.h>
-
-#if defined( QT_MOC_CPP ) || defined( QT_H_CPP ) || defined( Q_OS_MACX )
-#include <private/qcom_p.h>
-#include <private/qucom_p.h>
-#include "private/qgfxdriverinterface_p.h"
-#include "private/qcom_p.h"
-#include "private/qimageformatinterface_p.h"
-#include "private/qisciicodec_p.h"
-#include "private/qkbddriverinterface_p.h"
-#include "private/qlayoutengine_p.h"
-#include "private/qcomlibrary_p.h"
-#include "private/qmousedriverinterface_p.h"
-#include "private/qeffects_p.h"
-#include "private/qgpluginmanager_p.h"
-#include "private/qinternal_p.h"
-#include "private/qsqldriverinterface_p.h"
-#include "private/qsqlmanager_p.h"
-#include "private/qlock_p.h"
-#include "private/qcomponentfactory_p.h"
-#include "private/qstyleinterface_p.h"
-#include "private/qrichtext_p.h"
-#include "private/qsvgdevice_p.h"
-#include "private/qfontcodecs_p.h"
-#include "private/qtextcodecinterface_p.h"
-#include "private/qpsprinter_p.h"
-#include "private/qtitlebar_p.h"
-#include "private/qucom_p.h"
-#include "private/qucomextra_p.h"
-#include "private/qpluginmanager_p.h"
-#include "private/qdir_p.h"
-#include "private/qsettings_p.h"
-#include "private/qsqlextension_p.h"
-#include "private/qdialogbuttons_p.h"
-#include "private/qwidgetinterface_p.h"
-#include "private/qwidgetresizehandler_p.h"
-#include "private/qlibrary_p.h"
-#endif // Private headers
-
-
-#ifdef Q_WS_X11
-#include "private/qtkdeintegration_x11_p.h"
-#endif
-
-#ifdef Q_WS_MAC
-#include <qaquastyle.h>
-#include <qmacstyle_mac.h>
-#endif // Q_WS_MAC
-
-#ifdef Q_WS_WIN
-#include <qwindowsxpstyle.h>
-#endif
-
-#ifdef Q_WS_QWS
-#include <private/qtextengine_p.h>
-#include "qfontmanager_qws.h"
-#include <qfontfactorybdf_qws.h>
-#include <qgfxvoodoodefs_qws.h>
-#include <qgfxmatroxdefs_qws.h>
-#include <qgfxdriverplugin_qws.h>
-#include <qkbddriverfactory_qws.h>
-#include <qkbddriverplugin_qws.h>
-#include <qmousedriverfactory_qws.h>
-#include <qmousedriverplugin_qws.h>
-#include <qcopchannel_qws.h>
-#include <qdirectpainter_qws.h>
-#include "qmemorymanager_qws.h"
-#include <qmouse_qws.h>
-#include <qfontfactoryttf_qws.h>
-#ifndef Q_OS_MAC
-# include <qsoundqss_qws.h>
-#endif
-#include "qgfx_qws.h"
-#include <qgfxdriverfactory_qws.h>
-#include "qwsdisplay_qws.h"
-#include "qwssocket_qws.h"
-#include "qwsdecoration_qws.h"
-#include "qwsutils_qws.h"
-#include <qwscursor_qws.h>
-#include "qwsmanager_qws.h"
-#include "qwsdefaultdecoration_qws.h"
-#include <qgfxraster_qws.h>
-#include "qwscommand_qws.h"
-#include <qwshydrodecoration_qws.h>
-#include <qwskde2decoration_qws.h>
-#include <qwskdedecoration_qws.h>
-#include <qwsbeosdecoration_qws.h>
-#include "qwsproperty_qws.h"
-#include <qwsregionmanager_qws.h>
-#include "qwsevent_qws.h"
-#include <qwindowsystem_qws.h>
-#include <qwswindowsdecoration_qws.h>
-#endif // Q_WS_QWS
-
-
-#ifdef Q_WS_WCE
-#include <qpocketpcstyle_wce.h>
-#endif // Q_WS_WCE
-
-#endif // QT_H
diff --git a/src/kernel/qt_gfx.pri b/src/kernel/qt_gfx.pri
index e27523c12..9c5b4c234 100644
--- a/src/kernel/qt_gfx.pri
+++ b/src/kernel/qt_gfx.pri
@@ -1,7 +1,7 @@
 # Qt graphics 
 
 #mng support
-HEADERS += $$KERNEL_H/qmngio.h
+HEADERS += $$KERNEL_H/ntqmngio.h
 SOURCES += $$KERNEL_CPP/qmngio.cpp
 mng {
         system-mng {
@@ -39,7 +39,7 @@ mng {
 else:DEFINES += QT_NO_IMAGEIO_MNG
 
 #jpeg support..
-HEADERS += $$KERNEL_H/qjpegio.h 
+HEADERS += $$KERNEL_H/ntqjpegio.h 
 SOURCES += $$KERNEL_CPP/qjpegio.cpp
 jpeg {
         system-jpeg {
@@ -98,7 +98,7 @@ jpeg {
 else:DEFINES += QT_NO_IMAGEIO_JPEG
 
 #png support
-HEADERS+=$$KERNEL_H/qpngio.h
+HEADERS+=$$KERNEL_H/ntqpngio.h
 SOURCES+=$$KERNEL_CPP/qpngio.cpp
 png {
         system-png {
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index 5a89e08fb..0c3b867c7 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -2,104 +2,104 @@
 
 kernel {
 	KERNEL_P	= kernel
-	HEADERS += $$KERNEL_H/qabstractlayout.h \
-		  $$KERNEL_H/qaccel.h \
+	HEADERS += $$KERNEL_H/ntqabstractlayout.h \
+		  $$KERNEL_H/ntqaccel.h \
 		  $$KERNEL_P/qucomextra_p.h \
-		  $$KERNEL_H/qapplication.h \
+		  $$KERNEL_H/ntqapplication.h \
 		  $$KERNEL_P/qapplication_p.h \
-		  $$KERNEL_H/qasyncimageio.h \
-		  $$KERNEL_H/qasyncio.h \
-		  $$KERNEL_H/qbitmap.h \
-		  $$KERNEL_H/qbrush.h \
-		  $$KERNEL_H/qclipboard.h \
-		  $$KERNEL_H/qcolor.h \
+		  $$KERNEL_H/ntqasyncimageio.h \
+		  $$KERNEL_H/ntqasyncio.h \
+		  $$KERNEL_H/ntqbitmap.h \
+		  $$KERNEL_H/ntqbrush.h \
+		  $$KERNEL_H/ntqclipboard.h \
+		  $$KERNEL_H/ntqcolor.h \
 		  $$KERNEL_P/qcolor_p.h \
-		  $$KERNEL_H/qconnection.h \
-		  $$KERNEL_H/qcursor.h \
-		  $$KERNEL_H/qdesktopwidget.h \
-		  $$KERNEL_H/qdragobject.h \
-		  $$KERNEL_H/qdrawutil.h \
-		  $$KERNEL_H/qdropsite.h \
-		  $$KERNEL_H/qevent.h \
-		  $$KERNEL_H/qeventloop.h\
+		  $$KERNEL_H/ntqconnection.h \
+		  $$KERNEL_H/ntqcursor.h \
+		  $$KERNEL_H/ntqdesktopwidget.h \
+		  $$KERNEL_H/ntqdragobject.h \
+		  $$KERNEL_H/ntqdrawutil.h \
+		  $$KERNEL_H/ntqdropsite.h \
+		  $$KERNEL_H/ntqevent.h \
+		  $$KERNEL_H/ntqeventloop.h\
 		  $$KERNEL_P/qeventloop_p.h \
-		  $$KERNEL_H/qfocusdata.h \
-		  $$KERNEL_H/qfont.h \
+		  $$KERNEL_H/ntqfocusdata.h \
+		  $$KERNEL_H/ntqfont.h \
 		  $$KERNEL_P/qfontdata_p.h \
-		  $$KERNEL_H/qfontinfo.h \
-		  $$KERNEL_H/qfontmetrics.h \
-		  $$KERNEL_H/qguardedptr.h \
-		  $$KERNEL_H/qgif.h \
-		  $$KERNEL_H/qiconset.h \
-		  $$KERNEL_H/qimage.h \
+		  $$KERNEL_H/ntqfontinfo.h \
+		  $$KERNEL_H/ntqfontmetrics.h \
+		  $$KERNEL_H/ntqguardedptr.h \
+		  $$KERNEL_H/ntqgif.h \
+		  $$KERNEL_H/ntqiconset.h \
+		  $$KERNEL_H/ntqimage.h \
 		  $$KERNEL_P/qimageformatinterface_p.h \
-		  $$KERNEL_H/qimageformatplugin.h \
-		  $$KERNEL_H/qkeycode.h \
-		  $$KERNEL_H/qkeysequence.h \
-		  $$KERNEL_H/qlayout.h \
+		  $$KERNEL_H/ntqimageformatplugin.h \
+		  $$KERNEL_H/ntqkeycode.h \
+		  $$KERNEL_H/ntqkeysequence.h \
+		  $$KERNEL_H/ntqlayout.h \
 		  $$KERNEL_P/qlayoutengine_p.h \
-		  $$KERNEL_H/qtranslator.h \
-		  $$KERNEL_H/qmetaobject.h \
-		  $$KERNEL_H/qmime.h \
-		  $$KERNEL_H/qmovie.h \
-		  $$KERNEL_H/qnamespace.h \
-		  $$KERNEL_H/qnetworkprotocol.h \
-		  $$KERNEL_H/qobject.h \
- 		  $$KERNEL_H/qobjectcleanuphandler.h \
-		  $$KERNEL_H/qobjectdefs.h \
-		  $$KERNEL_H/qobjectdict.h \
-		  $$KERNEL_H/qobjectlist.h \
-		  $$KERNEL_H/qpaintdevice.h \
-		  $$KERNEL_H/qpaintdevicedefs.h \
-		  $$KERNEL_H/qpainter.h \
+		  $$KERNEL_H/ntqtranslator.h \
+		  $$KERNEL_H/ntqmetaobject.h \
+		  $$KERNEL_H/ntqmime.h \
+		  $$KERNEL_H/ntqmovie.h \
+		  $$KERNEL_H/ntqnamespace.h \
+		  $$KERNEL_H/ntqnetworkprotocol.h \
+		  $$KERNEL_H/ntqobject.h \
+ 		  $$KERNEL_H/ntqobjectcleanuphandler.h \
+		  $$KERNEL_H/ntqobjectdefs.h \
+		  $$KERNEL_H/ntqobjectdict.h \
+		  $$KERNEL_H/ntqobjectlist.h \
+		  $$KERNEL_H/ntqpaintdevice.h \
+		  $$KERNEL_H/ntqpaintdevicedefs.h \
+		  $$KERNEL_H/ntqpainter.h \
 		  $$KERNEL_P/qpainter_p.h \
-		  $$KERNEL_H/qpalette.h \
-		  $$KERNEL_H/qpaintdevicemetrics.h \
-		  $$KERNEL_H/qpen.h \
-		  $$KERNEL_H/qpicture.h \
-		  $$KERNEL_H/qpixmap.h \
-		  $$KERNEL_H/qpixmapcache.h \
-		  $$KERNEL_H/qpointarray.h \
-		  $$KERNEL_H/qpoint.h \
-		  $$KERNEL_H/qpolygonscanner.h \
-		  $$KERNEL_H/qprinter.h \
-		  $$KERNEL_H/qprocess.h \
-		  $$KERNEL_H/qrect.h \
-		  $$KERNEL_H/qregion.h \
-		  $$KERNEL_H/qsessionmanager.h \
-		  $$KERNEL_H/qsignal.h \
-		  $$KERNEL_H/qsignalmapper.h \
-		  $$KERNEL_H/qsignalslotimp.h \
-		  $$KERNEL_H/qsize.h \
-		  $$KERNEL_H/qsizegrip.h \
-		  $$KERNEL_H/qsizepolicy.h \
-		  $$KERNEL_H/qsocketnotifier.h \
-		  $$KERNEL_H/qsound.h \
-		  $$KERNEL_H/qstyle.h \
-		  $$KERNEL_H/qstylesheet.h \
-		  $$KERNEL_H/qthread.h \
-		  $$KERNEL_H/qtimer.h \
-		  $$KERNEL_H/qurl.h \
-		  $$KERNEL_H/qlocalfs.h \
-		  $$KERNEL_H/qurloperator.h \
-		  $$KERNEL_H/qurlinfo.h \
-		  $$KERNEL_H/qwidget.h \
-		  $$KERNEL_H/qwidgetintdict.h \
-		  $$KERNEL_H/qwidgetlist.h \
-		  $$KERNEL_H/qwindowdefs.h \
-		  $$KERNEL_H/qwmatrix.h \
-		  $$KERNEL_H/qvariant.h \
+		  $$KERNEL_H/ntqpalette.h \
+		  $$KERNEL_H/ntqpaintdevicemetrics.h \
+		  $$KERNEL_H/ntqpen.h \
+		  $$KERNEL_H/ntqpicture.h \
+		  $$KERNEL_H/ntqpixmap.h \
+		  $$KERNEL_H/ntqpixmapcache.h \
+		  $$KERNEL_H/ntqpointarray.h \
+		  $$KERNEL_H/ntqpoint.h \
+		  $$KERNEL_H/ntqpolygonscanner.h \
+		  $$KERNEL_H/ntqprinter.h \
+		  $$KERNEL_H/ntqprocess.h \
+		  $$KERNEL_H/ntqrect.h \
+		  $$KERNEL_H/ntqregion.h \
+		  $$KERNEL_H/ntqsessionmanager.h \
+		  $$KERNEL_H/ntqsignal.h \
+		  $$KERNEL_H/ntqsignalmapper.h \
+		  $$KERNEL_H/ntqsignalslotimp.h \
+		  $$KERNEL_H/ntqsize.h \
+		  $$KERNEL_H/ntqsizegrip.h \
+		  $$KERNEL_H/ntqsizepolicy.h \
+		  $$KERNEL_H/ntqsocketnotifier.h \
+		  $$KERNEL_H/ntqsound.h \
+		  $$KERNEL_H/ntqstyle.h \
+		  $$KERNEL_H/ntqstylesheet.h \
+		  $$KERNEL_H/ntqthread.h \
+		  $$KERNEL_H/ntqtimer.h \
+		  $$KERNEL_H/ntqurl.h \
+		  $$KERNEL_H/ntqlocalfs.h \
+		  $$KERNEL_H/ntqurloperator.h \
+		  $$KERNEL_H/ntqurlinfo.h \
+		  $$KERNEL_H/ntqwidget.h \
+		  $$KERNEL_H/ntqwidgetintdict.h \
+		  $$KERNEL_H/ntqwidgetlist.h \
+		  $$KERNEL_H/ntqwindowdefs.h \
+		  $$KERNEL_H/ntqwmatrix.h \
+		  $$KERNEL_H/ntqvariant.h \
 		  $$KERNEL_P/qrichtext_p.h \
 		  $$KERNEL_P/qinternal_p.h \
-		  $$KERNEL_H/qgplugin.h \
-		  $$KERNEL_H/qsimplerichtext.h \
+		  $$KERNEL_H/ntqgplugin.h \
+		  $$KERNEL_H/ntqsimplerichtext.h \
 		  $$KERNEL_CPP/qscriptengine_p.h \
 		  $$KERNEL_CPP/qtextengine_p.h \
 		  $$KERNEL_CPP/qfontengine_p.h \
 		  $$KERNEL_CPP/qtextlayout_p.h
 
 	unix:x11 {
-		HEADERS += $$KERNEL_H/qinputcontext.h
+		HEADERS += $$KERNEL_H/ntqinputcontext.h
 	} else {
 		HEADERS += $$KERNEL_P/qinputcontext_p.h
 	}
@@ -252,13 +252,13 @@ kernel {
 		  $$KERNEL_CPP/qtextengine.cpp
 
 	unix:HEADERS   += $$KERNEL_P/qpsprinter_p.h \
-			  $$KERNEL_H/qfontdatabase.h
+			  $$KERNEL_H/ntqfontdatabase.h
 
 	embedded:SOURCES += $$KERNEL_CPP/qsharedmemory_p.cpp \
 		  	    $$KERNEL_CPP/qfontengine_qws.cpp
 
 	accessibility {
-	      HEADERS += $$KERNEL_H/qaccessible.h
+	      HEADERS += $$KERNEL_H/ntqaccessible.h
 	      SOURCES += $$KERNEL_CPP/qaccessible.cpp
 
 	      !embedded:!x11:mac:SOURCES += $$KERNEL_CPP/qaccessible_mac.cpp
diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h
index 566a49087..e80d7bd6f 100644
--- a/src/kernel/qt_pch.h
+++ b/src/kernel/qt_pch.h
@@ -21,25 +21,25 @@
 #      undef _GLIBCPP_FULLY_COMPLIANT_HEADERS  // Makes qlocale.cpp compile
 #    endif
 #  endif
-#include <qmap.h>		    // I must be first!
+#include <ntqmap.h>		    // I must be first!
 #include <private/qucomextra_p.h>  // All moc genereated code has this include
-#include <qapplication.h>
-#include <qbitmap.h>
-#include <qcursor.h>
-#include <qdatetime.h>
-#include <qglobal.h>
-#include <qimage.h>
-#include <qmetaobject.h>  // All moc genereated code has this include
-#include <qobject.h>
-#include <qpainter.h>
-#include <qpixmap.h>
+#include <ntqapplication.h>
+#include <ntqbitmap.h>
+#include <ntqcursor.h>
+#include <ntqdatetime.h>
+#include <ntqglobal.h>
+#include <ntqimage.h>
+#include <ntqmetaobject.h>  // All moc genereated code has this include
+#include <ntqobject.h>
+#include <ntqpainter.h>
+#include <ntqpixmap.h>
 #include <qplatformdefs.h>
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qstyle.h>
-#include <qtimer.h>
-#include <qwidget.h>
+#include <ntqptrlist.h>
+#include <ntqstring.h>
+#include <ntqstringlist.h>
+#include <ntqstyle.h>
+#include <ntqtimer.h>
+#include <ntqwidget.h>
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/src/kernel/qt_x11_p.h b/src/kernel/qt_x11_p.h
index 4eb8b9a64..af13262f2 100644
--- a/src/kernel/qt_x11_p.h
+++ b/src/kernel/qt_x11_p.h
@@ -54,7 +54,7 @@
 
 
 #ifndef QT_H
-#include "qwindowdefs.h"
+#include "ntqwindowdefs.h"
 #endif // QT_H
 
 // the following is necessary to work around breakage in many versions
diff --git a/src/kernel/qtextengine.cpp b/src/kernel/qtextengine.cpp
index 0d7c57560..c299e61a0 100644
--- a/src/kernel/qtextengine.cpp
+++ b/src/kernel/qtextengine.cpp
@@ -39,10 +39,10 @@
 #include "qtextengine_p.h"
 
 #include "qscriptengine_p.h"
-#include <qfont.h>
+#include <ntqfont.h>
 #include "qfontdata_p.h"
 #include "qfontengine_p.h"
-#include <qstring.h>
+#include <ntqstring.h>
 #include <private/qunicodetables_p.h>
 #include <stdlib.h>
 
diff --git a/src/kernel/qtextengine_p.h b/src/kernel/qtextengine_p.h
index 4858672c5..d9619e290 100644
--- a/src/kernel/qtextengine_p.h
+++ b/src/kernel/qtextengine_p.h
@@ -38,9 +38,9 @@
 #define TQTEXTENGINE_P_H
 
 #ifndef QT_H
-#include "qglobal.h"
-#include "qstring.h"
-#include "qnamespace.h"
+#include "ntqglobal.h"
+#include "ntqstring.h"
+#include "ntqnamespace.h"
 #include <private/qfontdata_p.h>
 #endif // QT_H
 
diff --git a/src/kernel/qtextlayout.cpp b/src/kernel/qtextlayout.cpp
index 76f2420f5..edbd910ed 100644
--- a/src/kernel/qtextlayout.cpp
+++ b/src/kernel/qtextlayout.cpp
@@ -39,9 +39,9 @@
 #include "qtextlayout_p.h"
 #include "qtextengine_p.h"
 
-#include <qfont.h>
-#include <qapplication.h>
-#include <qpainter.h>
+#include <ntqfont.h>
+#include <ntqapplication.h>
+#include <ntqpainter.h>
 
 
 TQRect TQTextItem::rect() const
diff --git a/src/kernel/qtextlayout_p.h b/src/kernel/qtextlayout_p.h
index 275288580..b4763c8e5 100644
--- a/src/kernel/qtextlayout_p.h
+++ b/src/kernel/qtextlayout_p.h
@@ -38,9 +38,9 @@
 #define TQTEXTLAYOUT_P_H
 
 #ifndef QT_H
-#include "qstring.h"
-#include "qnamespace.h"
-#include "qrect.h"
+#include "ntqstring.h"
+#include "ntqnamespace.h"
+#include "ntqrect.h"
 #endif // QT_H
 
 class TQTextEngine;
diff --git a/src/kernel/qthread.cpp b/src/kernel/qthread.cpp
index 75291ff41..24239dbd9 100644
--- a/src/kernel/qthread.cpp
+++ b/src/kernel/qthread.cpp
@@ -40,11 +40,11 @@
 
 #include "qplatformdefs.h"
 
-#include "qthread.h"
+#include "ntqthread.h"
 #include <private/qthreadinstance_p.h>
 
 #ifndef QT_H
-#  include "qapplication.h"
+#  include "ntqapplication.h"
 #endif // QT_H
 
 #if QT_VERSION >= 0x040000
@@ -53,7 +53,7 @@
 
 
 /*!
-    \class TQThread qthread.h
+    \class TQThread ntqthread.h
     \threadsafe
     \brief The TQThread class provides platform-independent threads.
 
diff --git a/src/kernel/qthread_unix.cpp b/src/kernel/qthread_unix.cpp
index 9776beccd..35de76021 100644
--- a/src/kernel/qthread_unix.cpp
+++ b/src/kernel/qthread_unix.cpp
@@ -42,11 +42,11 @@
 
 typedef pthread_mutex_t Q_MUTEX_T;
 
-#include "qthread.h"
+#include "ntqthread.h"
 #include <private/qthreadinstance_p.h>
 #include <private/qmutex_p.h>
 #include <private/qmutexpool_p.h>
-#include <qthreadstorage.h>
+#include <ntqthreadstorage.h>
 
 #include <errno.h>
 #include <sched.h>
diff --git a/src/kernel/qtimer.cpp b/src/kernel/qtimer.cpp
index 33bb662cc..13bd9bba7 100644
--- a/src/kernel/qtimer.cpp
+++ b/src/kernel/qtimer.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qtimer.h"
-#include "qsignal.h"
-#include "qobjectlist.h"
+#include "ntqtimer.h"
+#include "ntqsignal.h"
+#include "ntqobjectlist.h"
 
 /*!
-    \class TQTimer qtimer.h
+    \class TQTimer ntqtimer.h
     \brief The TQTimer class provides timer signals and single-shot timers.
 
     \ingroup time
@@ -302,8 +302,8 @@ bool TQSingleShotTimer::event( TQEvent * )
 
     Example:
     \code
-	#include <qapplication.h>
-	#include <qtimer.h>
+	#include <ntqapplication.h>
+	#include <ntqtimer.h>
 
 	int main( int argc, char **argv )
 	{
diff --git a/src/kernel/qtkdeintegration_x11.cpp b/src/kernel/qtkdeintegration_x11.cpp
index 14d45a564..b61920fcf 100644
--- a/src/kernel/qtkdeintegration_x11.cpp
+++ b/src/kernel/qtkdeintegration_x11.cpp
@@ -4,12 +4,12 @@
 #define QT_CLEAN_NAMESPACE
 #include "qtkdeintegration_x11_p.h"
 
-#include <qcolordialog.h>
-#include <qfiledialog.h>
-#include <qfontdialog.h>
-#include <qlibrary.h>
-#include <qregexp.h>
-#include <qmessagebox.h>
+#include <ntqcolordialog.h>
+#include <ntqfiledialog.h>
+#include <ntqfontdialog.h>
+#include <ntqlibrary.h>
+#include <ntqregexp.h>
+#include <ntqmessagebox.h>
 #include <stdlib.h>
 
 bool TQKDEIntegration::inited = false;
diff --git a/src/kernel/qtkdeintegration_x11_p.h b/src/kernel/qtkdeintegration_x11_p.h
index bf247b3e7..10ee4443b 100644
--- a/src/kernel/qtkdeintegration_x11_p.h
+++ b/src/kernel/qtkdeintegration_x11_p.h
@@ -4,7 +4,7 @@
 #ifndef TQKDEINTEGRATION_H
 #define TQKDEINTEGRATION_H
 
-#include <qstringlist.h>
+#include <ntqstringlist.h>
 
 class TQLibrary;
 class TQWidget;
diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp
index a862de079..015b6cdb8 100644
--- a/src/kernel/qtranslator.cpp
+++ b/src/kernel/qtranslator.cpp
@@ -52,20 +52,20 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
 # undef truncate
 #endif
 
-#include "qtranslator.h"
+#include "ntqtranslator.h"
 
 #ifndef QT_NO_TRANSLATION
 
-#include "qfileinfo.h"
-#include "qwidgetlist.h"
-#include "qintdict.h"
-#include "qstring.h"
-#include "qapplication.h"
-#include "qfile.h"
-#include "qbuffer.h"
-#include "qdatastream.h"
-#include "qmap.h"
-#include "qtl.h"
+#include "ntqfileinfo.h"
+#include "ntqwidgetlist.h"
+#include "ntqintdict.h"
+#include "ntqstring.h"
+#include "ntqapplication.h"
+#include "ntqfile.h"
+#include "ntqbuffer.h"
+#include "ntqdatastream.h"
+#include "ntqmap.h"
+#include "ntqtl.h"
 
 #if defined(Q_OS_UNIX)
 #define QT_USE_MMAP
diff --git a/src/kernel/qucomextra.cpp b/src/kernel/qucomextra.cpp
index df1508140..a705784ba 100644
--- a/src/kernel/qucomextra.cpp
+++ b/src/kernel/qucomextra.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "qucomextra_p.h"
-#include <qvariant.h>
+#include <ntqvariant.h>
 
 
 #ifndef QT_NO_VARIANT
diff --git a/src/kernel/qurl.cpp b/src/kernel/qurl.cpp
index 6e2c10b5c..0a680e0d9 100644
--- a/src/kernel/qurl.cpp
+++ b/src/kernel/qurl.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qurl.h"
+#include "ntqurl.h"
 
 #ifndef QT_NO_URL
 
-#include "qdir.h"
+#include "ntqdir.h"
 
 #include <stdlib.h>
 
@@ -92,7 +92,7 @@ static void slashify( TQString& s, bool allowMultiple = TRUE )
 
 
 /*!
-    \class TQUrl qurl.h
+    \class TQUrl ntqurl.h
 
     \brief The TQUrl class provides a URL parser and simplifies working with URLs.
 \if defined(commercial)
@@ -126,13 +126,13 @@ static void slashify( TQString& s, bool allowMultiple = TRUE )
 
     Example:
 
-    <tt>http://doc.trolltech.com/qdockarea.html#lines</tt>
+    <tt>http://doc.trolltech.com/ntqdockarea.html#lines</tt>
 
     \table
     \header \i Function	    \i Returns
     \row \i \l protocol()   \i "http"
     \row \i \l host()	    \i "doc.trolltech.com"
-    \row \i \l fileName()   \i "qdockarea.html"
+    \row \i \l fileName()   \i "ntqdockarea.html"
     \row \i \l ref()	    \i "lines"
     \endtable
 
diff --git a/src/kernel/qurlinfo.cpp b/src/kernel/qurlinfo.cpp
index 95b224cf7..aafea2a3e 100644
--- a/src/kernel/qurlinfo.cpp
+++ b/src/kernel/qurlinfo.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qurlinfo.h"
+#include "ntqurlinfo.h"
 
 #ifndef QT_NO_NETWORKPROTOCOL
 
-#include "qurloperator.h"
-#include "qdir.h"
+#include "ntqurloperator.h"
+#include "ntqdir.h"
 #include <limits.h>
 
 class TQUrlInfoPrivate
@@ -81,7 +81,7 @@ public:
 
 
 /*!
-    \class TQUrlInfo qurlinfo.h
+    \class TQUrlInfo ntqurlinfo.h
     \brief The TQUrlInfo class stores information about URLs.
 
     \ingroup io
@@ -257,7 +257,7 @@ TQUrlInfo::TQUrlInfo( const TQUrl &url, int permissions, const TQString &owner,
 
 /*!
     Sets the name of the URL to \a name. The name is the full text,
-    for example, "http://doc.trolltech.com/qurlinfo.html".
+    for example, "http://doc.trolltech.com/ntqurlinfo.html".
 
     If you call this function for an invalid URL info, this function
     turns it into a valid one.
diff --git a/src/kernel/qurloperator.cpp b/src/kernel/qurloperator.cpp
index ecec21620..e4cb185f4 100644
--- a/src/kernel/qurloperator.cpp
+++ b/src/kernel/qurloperator.cpp
@@ -38,16 +38,16 @@
 **
 **********************************************************************/
 
-#include "qurloperator.h"
+#include "ntqurloperator.h"
 
 #ifndef QT_NO_NETWORKPROTOCOL
 
-#include "qurlinfo.h"
-#include "qnetworkprotocol.h"
-#include "qmap.h"
-#include "qdir.h"
-#include "qptrdict.h"
-#include "qguardedptr.h"
+#include "ntqurlinfo.h"
+#include "ntqnetworkprotocol.h"
+#include "ntqmap.h"
+#include "ntqdir.h"
+#include "ntqptrdict.h"
+#include "ntqguardedptr.h"
 
 //#define TQURLOPERATOR_DEBUG
 
@@ -89,7 +89,7 @@ public:
 };
 
 /*!
-    \class TQUrlOperator qurloperator.h
+    \class TQUrlOperator ntqurloperator.h
 
     \brief The TQUrlOperator class provides common operations on URLs.
 \if defined(commercial)
diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp
index 417c74dd6..6d4b5d1d1 100644
--- a/src/kernel/qvariant.cpp
+++ b/src/kernel/qvariant.cpp
@@ -40,31 +40,31 @@
 
 #include <float.h>
 
-#include "qvariant.h"
+#include "ntqvariant.h"
 #ifndef QT_NO_VARIANT
-#include "qstring.h"
-#include "qcstring.h"
-#include "qfont.h"
-#include "qpixmap.h"
-#include "qimage.h"
-#include "qbrush.h"
-#include "qpoint.h"
-#include "qrect.h"
-#include "qsize.h"
-#include "qcolor.h"
-#include "qpalette.h"
-#include "qiconset.h"
-#include "qdatastream.h"
-#include "qregion.h"
-#include "qpointarray.h"
-#include "qbitmap.h"
-#include "qcursor.h"
-#include "qdatetime.h"
-#include "qsizepolicy.h"
-#include "qshared.h"
-#include "qbitarray.h"
-#include "qkeysequence.h"
-#include "qpen.h"
+#include "ntqstring.h"
+#include "ntqcstring.h"
+#include "ntqfont.h"
+#include "ntqpixmap.h"
+#include "ntqimage.h"
+#include "ntqbrush.h"
+#include "ntqpoint.h"
+#include "ntqrect.h"
+#include "ntqsize.h"
+#include "ntqcolor.h"
+#include "ntqpalette.h"
+#include "ntqiconset.h"
+#include "ntqdatastream.h"
+#include "ntqregion.h"
+#include "ntqpointarray.h"
+#include "ntqbitmap.h"
+#include "ntqcursor.h"
+#include "ntqdatetime.h"
+#include "ntqsizepolicy.h"
+#include "ntqshared.h"
+#include "ntqbitarray.h"
+#include "ntqkeysequence.h"
+#include "ntqpen.h"
 
 #ifndef DBL_DIG
 #define DBL_DIG 10
@@ -354,7 +354,7 @@ void TQVariant::Private::clear()
 }
 
 /*!
-    \class TQVariant qvariant.h
+    \class TQVariant ntqvariant.h
     \brief The TQVariant class acts like a union for the most common TQt data types.
 
     \ingroup objectmodel
@@ -475,7 +475,7 @@ void TQVariant::Private::clear()
     \value UInt  an unsigned int
 
     Note that TQt's definition of bool depends on the compiler.
-    \c qglobal.h has the system-dependent definition of bool.
+    \c ntqglobal.h has the system-dependent definition of bool.
 */
 
 /*!
diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp
index a4daa5c09..7833f14f6 100644
--- a/src/kernel/qwidget.cpp
+++ b/src/kernel/qwidget.cpp
@@ -39,25 +39,25 @@
 **********************************************************************/
 
 
-#include "qobjectlist.h"
-#include "qwidget.h"
-#include "qwidgetlist.h"
-#include "qwidgetintdict.h"
-#include "qptrdict.h"
-#include "qfocusdata.h"
-#include "qcursor.h"
-#include "qpixmap.h"
-#include "qapplication.h"
+#include "ntqobjectlist.h"
+#include "ntqwidget.h"
+#include "ntqwidgetlist.h"
+#include "ntqwidgetintdict.h"
+#include "ntqptrdict.h"
+#include "ntqfocusdata.h"
+#include "ntqcursor.h"
+#include "ntqpixmap.h"
+#include "ntqapplication.h"
 #include "qapplication_p.h"
-#include "qbrush.h"
-#include "qlayout.h"
-#include "qstylefactory.h"
-#include "qcleanuphandler.h"
-#include "qstyle.h"
-#include "qmetaobject.h"
-#include "qguardedptr.h"
+#include "ntqbrush.h"
+#include "ntqlayout.h"
+#include "ntqstylefactory.h"
+#include "ntqcleanuphandler.h"
+#include "ntqstyle.h"
+#include "ntqmetaobject.h"
+#include "ntqguardedptr.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
-#include "qaccessible.h"
+#include "ntqaccessible.h"
 #endif
 #if defined(Q_WS_WIN)
 #include "qt_windows.h"
@@ -70,7 +70,7 @@
 
 
 /*!
-    \class TQWidget qwidget.h
+    \class TQWidget ntqwidget.h
     \brief The TQWidget class is the base class of all user interface objects.
 
     \ingroup abstractwidgets
@@ -410,7 +410,7 @@
     \endlist
 
     There are also some rather obscure events. They are listed in
-    \c qevent.h and you need to reimplement event() to handle them.
+    \c ntqevent.h and you need to reimplement event() to handle them.
     The default implementation of event() handles Tab and Shift+Tab
     (to move the keyboard focus), and passes on most other events to
     one of the more specialized handlers above.
@@ -1248,7 +1248,7 @@ void TQWidget::deactivateWidgetCleanup()
     id.
 
     The window identifier type depends on the underlying window
-    system, see \c qwindowdefs.h for the actual definition. If there
+    system, see \c ntqwindowdefs.h for the actual definition. If there
     is no widget with this identifier, 0 is returned.
 */
 
diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp
index 2d77cf658..9fc3e7d05 100644
--- a/src/kernel/qwidget_x11.cpp
+++ b/src/kernel/qwidget_x11.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qapplication.h"
+#include "ntqapplication.h"
 #include "qapplication_p.h"
-#include "qnamespace.h"
-#include "qpaintdevicemetrics.h"
-#include "qpainter.h"
-#include "qbitmap.h"
-#include "qobjectlist.h"
-#include "qlayout.h"
-#include "qtextcodec.h"
-#include "qdatetime.h"
-#include "qcursor.h"
+#include "ntqnamespace.h"
+#include "ntqpaintdevicemetrics.h"
+#include "ntqpainter.h"
+#include "ntqbitmap.h"
+#include "ntqobjectlist.h"
+#include "ntqlayout.h"
+#include "ntqtextcodec.h"
+#include "ntqdatetime.h"
+#include "ntqcursor.h"
 #include "qt_x11_p.h"
 #include <stdlib.h>
 
@@ -65,8 +65,8 @@ bool qt_wstate_iconified( WId );
 void qt_updated_rootinfo();
 
 #ifndef QT_NO_IM
-#include "qinputcontext.h"
-#include "qinputcontextfactory.h"
+#include "ntqinputcontext.h"
+#include "ntqinputcontextfactory.h"
 #endif
 
 // Paint event clipping magic
diff --git a/src/kernel/qwidgetcreate_x11.cpp b/src/kernel/qwidgetcreate_x11.cpp
index 05144cd99..25a17ccb1 100644
--- a/src/kernel/qwidgetcreate_x11.cpp
+++ b/src/kernel/qwidgetcreate_x11.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qwidget.h"
+#include "ntqwidget.h"
 #include "qt_x11_p.h"
 
 
diff --git a/src/kernel/qwmatrix.cpp b/src/kernel/qwmatrix.cpp
index 9b49dbae0..e85cb00cf 100644
--- a/src/kernel/qwmatrix.cpp
+++ b/src/kernel/qwmatrix.cpp
@@ -38,9 +38,9 @@
 **
 **********************************************************************/
 
-#include "qwmatrix.h"
-#include "qdatastream.h"
-#include "qregion.h"
+#include "ntqwmatrix.h"
+#include "ntqdatastream.h"
+#include "ntqregion.h"
 #if defined(Q_WS_X11)
 double qsincos( double, bool calcCos );		// defined in qpainter_x11.cpp
 #else
@@ -52,7 +52,7 @@ double qsincos( double, bool calcCos );		// defined in qpainter_x11.cpp
 #ifndef QT_NO_WMATRIX
 
 /*!
-    \class TQWMatrix qwmatrix.h
+    \class TQWMatrix ntqwmatrix.h
     \brief The TQWMatrix class specifies 2D transformations of a
     coordinate system.
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2012-01-26 23:32:43 -0600
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2012-01-26 23:32:43 -0600
commit	ea318d1431c89e647598c510c4245c6571aa5f46 (patch)
tree	996d29b80c30d453dda86d1a23162d441628f169 /src/kernel
parent	aaf89d4b48f69c9293feb187db26362e550b5561 (diff)
download	tqt3-ea318d1431c89e647598c510c4245c6571aa5f46.tar.gz tqt3-ea318d1431c89e647598c510c4245c6571aa5f46.zip