Rename remaining ntq[m-r]* related files to equivalent tq* (except ntqmodules.h)

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

38 files changed, 55 insertions, 55 deletions

diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index 0a1ffc22b..7032b7383 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -21,7 +21,7 @@
 #include "tqptrcollection.h"
 #include "tqglist.h"
 #include "tqobjectdefs.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
 #include "tqgarray.h"
 #include "tqmemarray.h"
 #include "tqcstring.h"
@@ -93,7 +93,7 @@
 #include <tqdropsite.h>
 #include "tqgplugin.h"
 #include <tqgrid.h>
-#include "ntqrangecontrol.h"
+#include "tqrangecontrol.h"
 #include "tqbuttongroup.h"
 #include <tqdatetimeedit.h>
 #include "tqgvector.h"
@@ -129,8 +129,8 @@
 #include "tqbitmap.h"
 #include "ntqvariant.h"
 #include "tqsignal.h"
-#include <ntqmessagebox.h>
-#include "ntqmetaobject.h"
+#include <tqmessagebox.h>
+#include "tqmetaobject.h"
 #include "tqheader.h"
 #include <tqmotifplusstyle.h>
 #include <tqcdestyle.h>
@@ -157,9 +157,9 @@
 #include <tqpngio.h>
 #include <tqcursor.h>
 #include <tqerrormessage.h>
-#include <ntqpolygonscanner.h>
+#include <tqpolygonscanner.h>
 #include "tqpopupmenu.h"
-#include <ntqprintdialog.h>
+#include <tqprintdialog.h>
 #include <tqprinter.h>
 #include <tqprocess.h>
 #include "tqprogressbar.h"
@@ -312,7 +312,7 @@
 
 #ifdef TQ_WS_MAC
 #include <qaquastyle.h>
-#include <qmacstyle_mac.h>
+#include <tqmacstyle_mac.h>
 #endif // TQ_WS_MAC
 
 #ifdef TQ_WS_WIN
diff --git a/src/kernel/ntqwindowdefs.h b/src/kernel/ntqwindowdefs.h
index 812bf6f6c..166cc0638 100644
--- a/src/kernel/ntqwindowdefs.h
+++ b/src/kernel/ntqwindowdefs.h
@@ -45,7 +45,7 @@
 #ifndef QT_H
 #include "tqobjectdefs.h"
 #include "tqstring.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
 #endif // QT_H
 
 // Class forward definitions
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 8f04514cf..8ad7f5a55 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -57,7 +57,7 @@
 #include "tqstyle.h"
 #include "tqstylefactory.h"
 #include "tqfile.h"
-#include "ntqmessagebox.h"
+#include "tqmessagebox.h"
 #include "tqdir.h"
 #include "tqfileinfo.h"
 #ifdef TQ_WS_WIN
@@ -281,7 +281,7 @@
   TQApplication. This can be useful if you wish to share code between
   a non-GUI server and a GUI client.
 
-  \headerfile ntqnamespace.h
+  \headerfile tqnamespace.h
   \headerfile ntqwindowdefs.h
   \headerfile tqglobal.h
 */
diff --git a/src/kernel/qinternal_p.h b/src/kernel/qinternal_p.h
index 8992497e6..d8c29cc67 100644
--- a/src/kernel/qinternal_p.h
+++ b/src/kernel/qinternal_p.h
@@ -53,7 +53,7 @@
 //
 //
 #ifndef QT_H
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
 #include "tqrect.h"
 #include "tqptrlist.h"
 #include "tqcstring.h"
diff --git a/src/kernel/qt_gfx.pri b/src/kernel/qt_gfx.pri
index fadd1277f..a30d86f17 100644
--- a/src/kernel/qt_gfx.pri
+++ b/src/kernel/qt_gfx.pri
@@ -1,8 +1,8 @@
 # TQt graphics 
 
 #mng support
-HEADERS += $$KERNEL_H/ntqmngio.h
-SOURCES += $$KERNEL_CPP/qmngio.cpp
+HEADERS += $$KERNEL_H/tqmngio.h
+SOURCES += $$KERNEL_CPP/tqmngio.cpp
 mng {
         system-mng {
 	    win32:LIBS += libmng.lib
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index 03904d262..d3e214b06 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -40,10 +40,10 @@ kernel {
 		  $$KERNEL_H/tqlayout.h \
 		  $$KERNEL_P/tqlayoutengine_p.h \
 		  $$KERNEL_H/tqtranslator.h \
-		  $$KERNEL_H/ntqmetaobject.h \
+		  $$KERNEL_H/tqmetaobject.h \
 		  $$KERNEL_H/tqmime.h \
 		  $$KERNEL_H/tqmovie.h \
-		  $$KERNEL_H/ntqnamespace.h \
+		  $$KERNEL_H/tqnamespace.h \
 		  $$KERNEL_H/tqnetworkprotocol.h \
 		  $$KERNEL_H/tqobject.h \
  		  $$KERNEL_H/tqobjectcleanuphandler.h \
@@ -61,7 +61,7 @@ kernel {
 		  $$KERNEL_H/tqpixmapcache.h \
 		  $$KERNEL_H/tqpointarray.h \
 		  $$KERNEL_H/tqpoint.h \
-		  $$KERNEL_H/ntqpolygonscanner.h \
+		  $$KERNEL_H/tqpolygonscanner.h \
 		  $$KERNEL_H/tqprinter.h \
 		  $$KERNEL_H/tqprocess.h \
 		  $$KERNEL_H/tqrect.h \
@@ -221,7 +221,7 @@ kernel {
 		  $$KERNEL_CPP/tqlayout.cpp \
 		  $$KERNEL_CPP/tqlayoutengine.cpp \
 		  $$KERNEL_CPP/tqtranslator.cpp \
-		  $$KERNEL_CPP/qmetaobject.cpp \
+		  $$KERNEL_CPP/tqmetaobject.cpp \
 		  $$KERNEL_CPP/tqmime.cpp \
 		  $$KERNEL_CPP/tqmovie.cpp \
 		  $$KERNEL_CPP/tqnetworkprotocol.cpp \
@@ -235,7 +235,7 @@ kernel {
 		  $$KERNEL_CPP/tqpixmapcache.cpp \
 		  $$KERNEL_CPP/tqpointarray.cpp \
 		  $$KERNEL_CPP/tqpoint.cpp \
-		  $$KERNEL_CPP/qpolygonscanner.cpp \
+		  $$KERNEL_CPP/tqpolygonscanner.cpp \
 		  $$KERNEL_CPP/tqprinter.cpp \
 		  $$KERNEL_CPP/tqprocess.cpp \
 		  $$KERNEL_CPP/tqrect.cpp \
diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h
index 982ea2946..690551eb6 100644
--- a/src/kernel/qt_pch.h
+++ b/src/kernel/qt_pch.h
@@ -29,7 +29,7 @@
 #include <tqdatetime.h>
 #include <tqglobal.h>
 #include <tqimage.h>
-#include <ntqmetaobject.h>  // All moc genereated code has this include
+#include <tqmetaobject.h>  // All moc genereated code has this include
 #include <tqobject.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
diff --git a/src/kernel/tqaccel.cpp b/src/kernel/tqaccel.cpp
index 39e0213f0..ef6b665e6 100644
--- a/src/kernel/tqaccel.cpp
+++ b/src/kernel/tqaccel.cpp
@@ -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
-    ntqnamespace.h. As an alternative, use \c UNICODE_ACCEL with the
+    tqnamespace.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/tqaccessible.cpp b/src/kernel/tqaccessible.cpp
index 243c4384c..6cbe717e6 100644
--- a/src/kernel/tqaccessible.cpp
+++ b/src/kernel/tqaccessible.cpp
@@ -41,7 +41,7 @@
 #if defined(QT_ACCESSIBILITY_SUPPORT)
 
 #include "tqptrdict.h"
-#include "ntqmetaobject.h"
+#include "tqmetaobject.h"
 #include <private/qpluginmanager_p.h>
 #include "ntqapplication.h"
 #include <stdlib.h>
diff --git a/src/kernel/tqcolor.cpp b/src/kernel/tqcolor.cpp
index 59f726694..142fb408a 100644
--- a/src/kernel/tqcolor.cpp
+++ b/src/kernel/tqcolor.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "tqcolor.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
 #include "tqdatastream.h"
 
 #include <stdio.h>
diff --git a/src/kernel/tqcursor_x11.cpp b/src/kernel/tqcursor_x11.cpp
index fd2aea158..9facf093c 100644
--- a/src/kernel/tqcursor_x11.cpp
+++ b/src/kernel/tqcursor_x11.cpp
@@ -43,7 +43,7 @@
 #include "tqimage.h"
 #include "ntqapplication.h"
 #include "tqdatastream.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
 #include "qt_x11_p.h"
 #include <X11/cursorfont.h>
 
diff --git a/src/kernel/tqdrawutil.h b/src/kernel/tqdrawutil.h
index d8e2703d2..113d6095f 100644
--- a/src/kernel/tqdrawutil.h
+++ b/src/kernel/tqdrawutil.h
@@ -42,7 +42,7 @@
 #define TQDRAWUTIL_H
 
 #ifndef QT_H
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
 #include "tqstring.h" // char*->TQString conversion
 #endif // QT_H
 
diff --git a/src/kernel/tqevent.h b/src/kernel/tqevent.h
index f05fc2c94..fc229f9ab 100644
--- a/src/kernel/tqevent.h
+++ b/src/kernel/tqevent.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "ntqwindowdefs.h"
 #include "tqregion.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
 #include "tqmime.h"
 #include "tqpair.h"
 #endif // QT_H
diff --git a/src/kernel/tqfont.cpp b/src/kernel/tqfont.cpp
index fa050a234..a3e21c655 100644
--- a/src/kernel/tqfont.cpp
+++ b/src/kernel/tqfont.cpp
@@ -2435,7 +2435,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 ntqnamespace.h.
+    These flags are defined in \c tqnamespace.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
@@ -2497,7 +2497,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 ntqnamespace.h.
+    These flags are defined in \c tqnamespace.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
diff --git a/src/kernel/tqimage.cpp b/src/kernel/tqimage.cpp
index b71804321..0a2995ede 100644
--- a/src/kernel/tqimage.cpp
+++ b/src/kernel/tqimage.cpp
@@ -47,7 +47,7 @@
 #include "tqptrlist.h"
 #include "tqasyncimageio.h"
 #include "tqpngio.h"
-#include "ntqmngio.h"
+#include "tqmngio.h"
 #include "tqjpegio.h"
 #include "tqmap.h"
 #include <private/qpluginmanager_p.h>
diff --git a/src/kernel/tqkeycode.h b/src/kernel/tqkeycode.h
index bca9305ba..45aec20b6 100644
--- a/src/kernel/tqkeycode.h
+++ b/src/kernel/tqkeycode.h
@@ -42,7 +42,7 @@
 #define TQKEYCODE_H
 
 #ifndef QT_H
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
 #endif // QT_H
 
 // all key codes are now in the TQt namespace class
diff --git a/src/kernel/tqkeysequence.cpp b/src/kernel/tqkeysequence.cpp
index 94ba5cf53..88ea36bd5 100644
--- a/src/kernel/tqkeysequence.cpp
+++ b/src/kernel/tqkeysequence.cpp
@@ -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{ntqnamespace.h}. As an alternative,
+    The key codes are listed in \c{tqnamespace.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.
@@ -246,7 +246,7 @@ TQKeySequence::TQKeySequence( const TQString& key )
 /*!
     Constructs a key sequence that has a single \a key.
 
-    The key codes are listed in \c{ntqnamespace.h} and can be
+    The key codes are listed in \c{tqnamespace.h} and can be
     combined with modifiers, e.g. with \c SHIFT, \c CTRL, \c
     ALT, \c META or \c UNICODE_ACCEL.
 */
@@ -261,7 +261,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{ntqnamespace.h} and can be
+    The key codes are listed in \c{tqnamespace.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/tqkeysequence.h b/src/kernel/tqkeysequence.h
index e4800839d..d4965fd5c 100644
--- a/src/kernel/tqkeysequence.h
+++ b/src/kernel/tqkeysequence.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #ifndef QT_H
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
 #include "tqstring.h"
 #endif // QT_H
 #endif
diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/tqmetaobject.cpp
index ae74503c3..06fd7c86f 100644
--- a/src/kernel/qmetaobject.cpp
+++ b/src/kernel/tqmetaobject.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqmetaobject.h"
+#include "tqmetaobject.h"
 #include "tqasciidict.h"
 
 #ifdef TQT_THREAD_SUPPORT
@@ -46,7 +46,7 @@
 #endif // TQT_THREAD_SUPPORT
 
 /*!
-  \class TQMetaData ntqmetaobject.h
+  \class TQMetaData tqmetaobject.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 ntqmetaobject.h
+  \class TQClassInfo tqmetaobject.h
 
   \brief The TQClassInfo class provides a struct that stores some basic information about a single class.
 
@@ -81,7 +81,7 @@
 
 
 /*!
-    \class TQMetaObject ntqmetaobject.h
+    \class TQMetaObject tqmetaobject.h
     \brief The TQMetaObject class contains meta information about TQt objects.
 
     \ingroup objectmodel
@@ -845,7 +845,7 @@ bool TQMetaObject::tqt_static_property( TQObject* o, int id, int f, TQVariant* v
 
 
 /*!
-    \class TQMetaProperty ntqmetaobject.h
+    \class TQMetaProperty tqmetaobject.h
 
     \brief The TQMetaProperty class stores meta data about a property.
 
diff --git a/src/kernel/ntqmetaobject.h b/src/kernel/tqmetaobject.h
index 9db397f47..9db397f47 100644
--- a/src/kernel/ntqmetaobject.h
+++ b/src/kernel/tqmetaobject.h
diff --git a/src/kernel/qmngio.cpp b/src/kernel/tqmngio.cpp
index 3e1678c4e..0f257ae88 100644
--- a/src/kernel/qmngio.cpp
+++ b/src/kernel/tqmngio.cpp
@@ -45,7 +45,7 @@
 #include "tqimage.h"
 #include "tqasyncimageio.h"
 #include "tqiodevice.h"
-#include "ntqmngio.h"
+#include "tqmngio.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
@@ -205,7 +205,7 @@ class TQMNGFormatType : public TQImageFormatType
 
 
 /*
-  \class TQMNGFormat ntqmngio.h
+  \class TQMNGFormat tqmngio.h
   \brief Incremental image decoder for MNG image format.
 
   \ingroup images
diff --git a/src/kernel/ntqmngio.h b/src/kernel/tqmngio.h
index 530a0aa1d..530a0aa1d 100644
--- a/src/kernel/ntqmngio.h
+++ b/src/kernel/tqmngio.h
diff --git a/src/kernel/ntqnamespace.h b/src/kernel/tqnamespace.h
index f5ec7dd1d..f5ec7dd1d 100644
--- a/src/kernel/ntqnamespace.h
+++ b/src/kernel/tqnamespace.h
diff --git a/src/kernel/tqobject.cpp b/src/kernel/tqobject.cpp
index 756117fff..cb1dfe7ab 100644
--- a/src/kernel/tqobject.cpp
+++ b/src/kernel/tqobject.cpp
@@ -44,7 +44,7 @@
 #include "tqobjectlist.h"
 #include "tqsignalslotimp.h"
 #include "tqregexp.h"
-#include "ntqmetaobject.h"
+#include "tqmetaobject.h"
 #include <private/qucom_p.h>
 #include "qucomextra_p.h"
 #include "tqptrvector.h"
@@ -314,7 +314,7 @@ TQMetaCallEvent::~TQMetaCallEvent()
 { }
 
 /*!
-    \class TQt ntqnamespace.h
+    \class TQt tqnamespace.h
 
     \brief The TQt class is a namespace for miscellaneous identifiers
     that need to be global-like.
diff --git a/src/kernel/tqobject.h b/src/kernel/tqobject.h
index 3ee1c6c19..eb627831d 100644
--- a/src/kernel/tqobject.h
+++ b/src/kernel/tqobject.h
@@ -47,7 +47,7 @@
 #include "tqstring.h"
 #include "tqevent.h"
 #include "tqmutex.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
 #endif // QT_H
 
 #include <tqt.h>
diff --git a/src/kernel/tqobjectdict.h b/src/kernel/tqobjectdict.h
index 8ff8c31f4..c51123054 100644
--- a/src/kernel/tqobjectdict.h
+++ b/src/kernel/tqobjectdict.h
@@ -42,7 +42,7 @@
 #define TQOBJECTDICT_H
 
 #ifndef QT_H
-#include "ntqmetaobject.h"
+#include "tqmetaobject.h"
 #include "tqasciidict.h"
 #endif // QT_H
 
diff --git a/src/kernel/tqpixmap.h b/src/kernel/tqpixmap.h
index 70609d4a7..1ab6dd0b9 100644
--- a/src/kernel/tqpixmap.h
+++ b/src/kernel/tqpixmap.h
@@ -45,7 +45,7 @@
 #include "tqpaintdevice.h"
 #include "tqcolor.h" // char*->TQColor conversion
 #include "tqstring.h" // char*->TQString conversion
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
 #endif // QT_H
 
 class TQPixmapPrivate;
diff --git a/src/kernel/qpolygonscanner.cpp b/src/kernel/tqpolygonscanner.cpp
index 44d59e7b8..2df631730 100644
--- a/src/kernel/qpolygonscanner.cpp
+++ b/src/kernel/tqpolygonscanner.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqpolygonscanner.h"
+#include "tqpolygonscanner.h"
 #include "tqpointarray.h"
 #include <stdlib.h>
 
diff --git a/src/kernel/ntqpolygonscanner.h b/src/kernel/tqpolygonscanner.h
index 2ab2c8e37..2ab2c8e37 100644
--- a/src/kernel/ntqpolygonscanner.h
+++ b/src/kernel/tqpolygonscanner.h
diff --git a/src/kernel/tqprinter_unix.cpp b/src/kernel/tqprinter_unix.cpp
index b5ae63926..06eeabbdd 100644
--- a/src/kernel/tqprinter_unix.cpp
+++ b/src/kernel/tqprinter_unix.cpp
@@ -53,7 +53,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
 
 #include "tqpaintdevicemetrics.h"
 #include "qpsprinter_p.h"
-#include "ntqprintdialog.h"
+#include "tqprintdialog.h"
 #include "ntqapplication.h"
 #include "tqprinter_p.h"
 
diff --git a/src/kernel/tqsignal.cpp b/src/kernel/tqsignal.cpp
index 3be5bb960..073b61949 100644
--- a/src/kernel/tqsignal.cpp
+++ b/src/kernel/tqsignal.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "tqsignal.h"
-#include "ntqmetaobject.h"
+#include "tqmetaobject.h"
 #include "tqguardedptr.h"
 
 /*!
diff --git a/src/kernel/tqsimplerichtext.h b/src/kernel/tqsimplerichtext.h
index 8d3d9ad8b..45ddd6b10 100644
--- a/src/kernel/tqsimplerichtext.h
+++ b/src/kernel/tqsimplerichtext.h
@@ -42,7 +42,7 @@
 #define TQSIMPLERICHTEXT_H
 
 #ifndef QT_H
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
 #include "tqstring.h"
 #include "tqregion.h"
 #endif // QT_H
diff --git a/src/kernel/tqsize.h b/src/kernel/tqsize.h
index 6bfb60865..a49dd25a9 100644
--- a/src/kernel/tqsize.h
+++ b/src/kernel/tqsize.h
@@ -49,7 +49,7 @@ class TQ_EXPORT TQSize
 // ### Make TQSize inherit TQt in TQt 4.0
 {
 public:
-    // ### Move this enum to ntqnamespace.h in TQt 4.0
+    // ### Move this enum to tqnamespace.h in TQt 4.0
     enum ScaleMode {
 	ScaleFree,
 	ScaleMin,
diff --git a/src/kernel/tqtextengine_p.h b/src/kernel/tqtextengine_p.h
index d1a467f2b..d092a3e7d 100644
--- a/src/kernel/tqtextengine_p.h
+++ b/src/kernel/tqtextengine_p.h
@@ -40,7 +40,7 @@
 #ifndef QT_H
 #include "tqglobal.h"
 #include "tqstring.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
 #include <private/tqfontdata_p.h>
 #endif // QT_H
 
diff --git a/src/kernel/tqtextlayout_p.h b/src/kernel/tqtextlayout_p.h
index 58dced19b..a95f28e78 100644
--- a/src/kernel/tqtextlayout_p.h
+++ b/src/kernel/tqtextlayout_p.h
@@ -39,7 +39,7 @@
 
 #ifndef QT_H
 #include "tqstring.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
 #include "tqrect.h"
 #endif // QT_H
 
diff --git a/src/kernel/tqttdeintegration_x11.cpp b/src/kernel/tqttdeintegration_x11.cpp
index 0b8e794c2..48aeb0dc9 100644
--- a/src/kernel/tqttdeintegration_x11.cpp
+++ b/src/kernel/tqttdeintegration_x11.cpp
@@ -8,7 +8,7 @@
 #include <tqfontdialog.h>
 #include <tqlibrary.h>
 #include <tqregexp.h>
-#include <ntqmessagebox.h>
+#include <tqmessagebox.h>
 #include <stdlib.h>
 
 bool TQTDEIntegration::inited = false;
diff --git a/src/kernel/tqwidget.cpp b/src/kernel/tqwidget.cpp
index 4aa4a09ed..e2e6c44f8 100644
--- a/src/kernel/tqwidget.cpp
+++ b/src/kernel/tqwidget.cpp
@@ -54,7 +54,7 @@
 #include "tqstylefactory.h"
 #include "tqcleanuphandler.h"
 #include "tqstyle.h"
-#include "ntqmetaobject.h"
+#include "tqmetaobject.h"
 #include "tqguardedptr.h"
 #if defined(TQT_THREAD_SUPPORT)
 #include "tqthread.h"
diff --git a/src/kernel/tqwidget_x11.cpp b/src/kernel/tqwidget_x11.cpp
index b7136818f..cc16871a7 100644
--- a/src/kernel/tqwidget_x11.cpp
+++ b/src/kernel/tqwidget_x11.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqapplication.h"
 #include "qapplication_p.h"
-#include "ntqnamespace.h"
+#include "tqnamespace.h"
 #include "tqpaintdevicemetrics.h"
 #include "tqpainter.h"
 #include "tqbitmap.h"