Rename ntqwidget* related files to equivalent tqwidget*

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

92 files changed, 132 insertions, 132 deletions

diff --git a/src/dialogs/ntqdialog.h b/src/dialogs/ntqdialog.h
index 37582e557..e1d82c179 100644
--- a/src/dialogs/ntqdialog.h
+++ b/src/dialogs/ntqdialog.h
@@ -42,7 +42,7 @@
 #define TQDIALOG_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #endif // QT_H
 #ifndef TQT_NO_DIALOG
 #if 0
diff --git a/src/dialogs/qdialog.cpp b/src/dialogs/qdialog.cpp
index eb9526387..6175cc051 100644
--- a/src/dialogs/qdialog.cpp
+++ b/src/dialogs/qdialog.cpp
@@ -46,7 +46,7 @@
 #include "ntqfocusdata.h"
 #include "ntqapplication.h"
 #include "tqobjectlist.h"
-#include "ntqwidgetlist.h"
+#include "tqwidgetlist.h"
 #include "ntqlayout.h"
 #include "ntqsizegrip.h"
 #include "ntqwhatsthis.h"
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp
index bb02ad2bd..2b7ce1b0d 100644
--- a/src/dialogs/qfiledialog.cpp
+++ b/src/dialogs/qfiledialog.cpp
@@ -92,7 +92,7 @@
 #include "ntqtoolbutton.h"
 #include "ntqtooltip.h"
 #include "ntqvbox.h"
-#include "ntqwidgetstack.h"
+#include "tqwidgetstack.h"
 
 #ifdef TQ_WS_X11
 #include "private/tqttdeintegration_x11_p.h"
diff --git a/src/dialogs/qinputdialog.cpp b/src/dialogs/qinputdialog.cpp
index ee6c15e75..084039c7a 100644
--- a/src/dialogs/qinputdialog.cpp
+++ b/src/dialogs/qinputdialog.cpp
@@ -48,7 +48,7 @@
 #include "ntqpushbutton.h"
 #include "ntqspinbox.h"
 #include "ntqcombobox.h"
-#include "ntqwidgetstack.h"
+#include "tqwidgetstack.h"
 #include "ntqvalidator.h"
 #include "ntqapplication.h"
 
diff --git a/src/dialogs/qtabdialog.cpp b/src/dialogs/qtabdialog.cpp
index a9ad79d7d..f2601cca2 100644
--- a/src/dialogs/qtabdialog.cpp
+++ b/src/dialogs/qtabdialog.cpp
@@ -50,7 +50,7 @@
 #include "ntqpixmap.h"
 #include "ntqapplication.h"
 #include "ntqtabwidget.h"
-#include "ntqwidgetstack.h"
+#include "tqwidgetstack.h"
 #include "ntqlayout.h"
 
 /*!
diff --git a/src/dialogs/qwizard.cpp b/src/dialogs/qwizard.cpp
index e8a7eeffe..9e1d31a7f 100644
--- a/src/dialogs/qwizard.cpp
+++ b/src/dialogs/qwizard.cpp
@@ -46,7 +46,7 @@
 #include "ntqpushbutton.h"
 #include "ntqcursor.h"
 #include "ntqlabel.h"
-#include "ntqwidgetstack.h"
+#include "tqwidgetstack.h"
 #include "ntqapplication.h"
 #include "ntqptrlist.h"
 #include "ntqpainter.h"
diff --git a/src/kernel/ntqdesktopwidget.h b/src/kernel/ntqdesktopwidget.h
index de199f31e..a017b8aca 100644
--- a/src/kernel/ntqdesktopwidget.h
+++ b/src/kernel/ntqdesktopwidget.h
@@ -40,7 +40,7 @@
 #define TQDESKTOPWIDGET_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #endif // QT_H
 
 class TQApplication;
diff --git a/src/kernel/ntqfocusdata.h b/src/kernel/ntqfocusdata.h
index 29c804c20..f6eb57fe3 100644
--- a/src/kernel/ntqfocusdata.h
+++ b/src/kernel/ntqfocusdata.h
@@ -42,7 +42,7 @@
 #define TQFOCUSDATA_H
 
 #ifndef QT_H
-#include "ntqwidgetlist.h"
+#include "tqwidgetlist.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/ntqlayout.h b/src/kernel/ntqlayout.h
index 9ff6615a9..9465e2788 100644
--- a/src/kernel/ntqlayout.h
+++ b/src/kernel/ntqlayout.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqobject.h"
 #include "ntqsizepolicy.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #endif // QT_H
 
 #include <limits.h>
diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h
index 5ce38f835..abc3bfb8b 100644
--- a/src/kernel/ntqnamespace.h
+++ b/src/kernel/ntqnamespace.h
@@ -139,10 +139,10 @@ public:
 	NoAccel = 0x4000
     };
 
-    // Widget flags; documented in qwidget.cpp
+    // Widget flags; documented in tqwidget.cpp
     typedef uint WState;
 
-    // TQWidget state flags (internal, barely documented in qwidget.cpp)
+    // TQWidget state flags (internal, barely documented in tqwidget.cpp)
     enum WidgetState {
 	WState_Created		= 0x00000001,
 	WState_Disabled		= 0x00000002,
@@ -170,10 +170,10 @@ public:
 	WState_HasMouse		= 0x00800000
     };
 
-    // NetWM flags; documented in qwidget.cpp
+    // NetWM flags; documented in tqwidget.cpp
     typedef uint NFlags;
 
-    // documented in qwidget.cpp
+    // documented in tqwidget.cpp
     enum NETWMFlags {
 #if defined(TQ_WS_X11)
         WX11DisableMove         = 0x00000001,
@@ -192,10 +192,10 @@ public:
 #endif
     };
 
-    // Widget flags2; documented in qwidget.cpp
+    // Widget flags2; documented in tqwidget.cpp
     typedef uint WFlags;
 
-    // documented in qwidget.cpp
+    // documented in tqwidget.cpp
     enum WidgetFlags {
 	WType_TopLevel		= 0x00000001,	// widget type flags
 	WType_Dialog		= 0x00000002,
@@ -962,7 +962,7 @@ public:
 	UTC
     };
 
-    // documented in qwidget.cpp
+    // documented in tqwidget.cpp
     enum BackgroundMode {
 	FixedColor,
 	FixedPixmap,
diff --git a/src/kernel/ntqsizegrip.h b/src/kernel/ntqsizegrip.h
index 93e95aade..624fb6498 100644
--- a/src/kernel/ntqsizegrip.h
+++ b/src/kernel/ntqsizegrip.h
@@ -42,7 +42,7 @@
 #define TQSIZEGRIP_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #endif // QT_H
 
 #ifndef TQT_NO_SIZEGRIP
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index 78ff48a19..d6671bee8 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -63,7 +63,7 @@
 #include <ntqdrawutil.h>
 #include "ntqbrush.h"
 #include "ntqpalette.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqjpunicode.h"
 #include "ntqtextcodec.h"
 #include "ntqpixmap.h"
@@ -76,7 +76,7 @@
 #include "ntqfile.h"
 #include "ntqfileinfo.h"
 #include "ntqurlinfo.h"
-#include "ntqwidgetlist.h"
+#include "tqwidgetlist.h"
 #include <ntqcombobox.h>
 #include "ntqgroupbox.h"
 #include "ntqdialog.h"
@@ -261,10 +261,10 @@
 #include <ntqthread.h>
 #include <ntqwhatsthis.h>
 #include <ntqapplication.h>
-#include <ntqwidgetintdict.h>
+#include <tqwidgetintdict.h>
 #include <ntqfocusdata.h>
-#include <ntqwidgetplugin.h>
-#include <ntqwidgetstack.h>
+#include <tqwidgetplugin.h>
+#include <tqwidgetstack.h>
 #include <ntqcheckbox.h>
 #include <ntqcompactstyle.h>
 #include <ntqwizard.h>
@@ -305,8 +305,8 @@
 #include "private/qsettings_p.h"
 #include "private/tqsqlextension_p.h"
 #include "private/qdialogbuttons_p.h"
-#include "private/qwidgetinterface_p.h"
-#include "private/qwidgetresizehandler_p.h"
+#include "private/tqwidgetinterface_p.h"
+#include "private/tqwidgetresizehandler_p.h"
 #include "private/qlibrary_p.h"
 #endif // Private headers
 
diff --git a/src/kernel/ntqwindowdefs.h b/src/kernel/ntqwindowdefs.h
index ae28caace..17593a715 100644
--- a/src/kernel/ntqwindowdefs.h
+++ b/src/kernel/ntqwindowdefs.h
@@ -84,7 +84,7 @@ class TQTime;
 class TQClipboard;
 
 
-// Widget list (defined in ntqwidgetlist.h)
+// Widget list (defined in tqwidgetlist.h)
 
 class TQWidgetList;
 class TQWidgetListIt;
diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp
index c52f090fd..beb504052 100644
--- a/src/kernel/qaccel.cpp
+++ b/src/kernel/qaccel.cpp
@@ -44,7 +44,7 @@
 
 #include "ntqsignal.h"
 #include "ntqapplication.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqptrlist.h"
 #include "ntqwhatsthis.h"
 #include "ntqguardedptr.h"
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 31bd5ecc4..39f8abc5a 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -42,9 +42,9 @@
 #include "ntqapplication.h"
 #include "ntqeventloop.h"
 #include "qeventloop_p.h"
-#include "ntqwidget.h"
-#include "ntqwidgetlist.h"
-#include "ntqwidgetintdict.h"
+#include "tqwidget.h"
+#include "tqwidgetlist.h"
+#include "tqwidgetintdict.h"
 #include "ntqptrdict.h"
 #include "ntqcleanuphandler.h"
 
@@ -2284,7 +2284,7 @@ TQWidgetList *TQApplication::topLevelWidgets()
     delete list;                      // delete the list, not the widgets
   \endcode
 
-  The TQWidgetList class is defined in the \c ntqwidgetlist.h header
+  The TQWidgetList class is defined in the \c tqwidgetlist.h header
   file.
 
   \warning Delete the list as soon as you have finished using it.
diff --git a/src/kernel/qapplication_p.h b/src/kernel/qapplication_p.h
index 5093dcfc7..7f6fbf9f9 100644
--- a/src/kernel/qapplication_p.h
+++ b/src/kernel/qapplication_p.h
@@ -47,7 +47,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qapplication_*.cpp, qwidget*.cpp, qcolor_x11.cpp, qfiledialog.cpp
+// of qapplication_*.cpp, tqwidget*.cpp, qcolor_x11.cpp, qfiledialog.cpp
 // and many other.  This header file may change from version to version
 // without notice, or even be removed.
 //
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 125f1fa21..56ba9aefa 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -65,11 +65,11 @@
 #include "qapplication_p.h"
 #include "qcolor_p.h"
 #include "ntqcursor.h"
-#include "ntqwidget.h"
-#include "qwidget_p.h"
+#include "tqwidget.h"
+#include "tqwidget_p.h"
 #include "tqobjectlist.h"
-#include "ntqwidgetlist.h"
-#include "ntqwidgetintdict.h"
+#include "tqwidgetlist.h"
+#include "tqwidgetintdict.h"
 #include "ntqbitarray.h"
 #include "ntqpainter.h"
 #include "ntqpixmapcache.h"
@@ -5952,7 +5952,7 @@ static Bool qt_net_wm_sync_request_scanner(Display*, XEvent* event, XPointer arg
 
 bool TQETWidget::translateConfigEvent( const XEvent *event )
 {
-    // config pending is only set on resize, see qwidget_x11.cpp, internalSetGeometry()
+    // config pending is only set on resize, see tqwidget_x11.cpp, internalSetGeometry()
     bool was_resize = testWState( WState_ConfigPending );
 
     clearWState(WState_ConfigPending);
diff --git a/src/kernel/qdesktopwidget_x11.cpp b/src/kernel/qdesktopwidget_x11.cpp
index bb301e522..db3763530 100644
--- a/src/kernel/qdesktopwidget_x11.cpp
+++ b/src/kernel/qdesktopwidget_x11.cpp
@@ -42,7 +42,7 @@
 #include "qt_x11_p.h"
 #include <cstdlib>
 
-// defined in qwidget_x11.cpp
+// defined in tqwidget_x11.cpp
 extern int qt_x11_create_desktop_on_screen;
 
 // defined in qapplication_x11.cpp
diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp
index a50f23319..859a3c1a6 100644
--- a/src/kernel/qdnd_x11.cpp
+++ b/src/kernel/qdnd_x11.cpp
@@ -44,7 +44,7 @@
 
 #ifndef TQT_NO_DRAGANDDROP
 
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqintdict.h"
 #include "ntqdatetime.h"
 #include "ntqdict.h"
diff --git a/src/kernel/qdragobject.cpp b/src/kernel/qdragobject.cpp
index c9d4e8f1b..5e6a0dab9 100644
--- a/src/kernel/qdragobject.cpp
+++ b/src/kernel/qdragobject.cpp
@@ -49,7 +49,7 @@
 #include "ntqtextcodec.h"
 #include "ntqapplication.h"
 #include "ntqpoint.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqbuffer.h"
 #include "ntqgif.h"
 #include "ntqregexp.h"
diff --git a/src/kernel/qdropsite.cpp b/src/kernel/qdropsite.cpp
index 8dd44a2cc..a8d3a8728 100644
--- a/src/kernel/qdropsite.cpp
+++ b/src/kernel/qdropsite.cpp
@@ -40,7 +40,7 @@
 
 #ifndef TQT_NO_DRAGANDDROP
 
-#include "ntqwidget.h"
+#include "tqwidget.h"
 
 
 // NOT REVISED
diff --git a/src/kernel/qfontengine_x11.cpp b/src/kernel/qfontengine_x11.cpp
index 65ab15811..96f011927 100644
--- a/src/kernel/qfontengine_x11.cpp
+++ b/src/kernel/qfontengine_x11.cpp
@@ -40,7 +40,7 @@
 
 // #define FONTENGINE_DEBUG
 
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <ntqcstring.h>
 #include <ntqtextcodec.h>
 
diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp
index 0149304ef..7f9760c46 100644
--- a/src/kernel/qinputcontext.cpp
+++ b/src/kernel/qinputcontext.cpp
@@ -42,7 +42,7 @@
 #include "qplatformdefs.h"
 
 #include "ntqapplication.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqpopupmenu.h"
 
 #include <stdlib.h>
diff --git a/src/kernel/qinputcontext_x11.cpp b/src/kernel/qinputcontext_x11.cpp
index e4d36af6b..0a314dfbb 100644
--- a/src/kernel/qinputcontext_x11.cpp
+++ b/src/kernel/qinputcontext_x11.cpp
@@ -43,7 +43,7 @@
 #include "qplatformdefs.h"
 
 #include "ntqapplication.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 
 #include "qt_x11_p.h"
 
diff --git a/src/kernel/qinternal.cpp b/src/kernel/qinternal.cpp
index e99c95f79..87cf5694e 100644
--- a/src/kernel/qinternal.cpp
+++ b/src/kernel/qinternal.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "private/qinternal_p.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqpixmap.h"
 #include "ntqpainter.h"
 #include "ntqcleanuphandler.h"
diff --git a/src/kernel/qlayout.cpp b/src/kernel/qlayout.cpp
index a23a44a8f..229a9ed7d 100644
--- a/src/kernel/qlayout.cpp
+++ b/src/kernel/qlayout.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_LAYOUT
 
 #include "ntqapplication.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqptrlist.h"
 #include "ntqsizepolicy.h"
 
diff --git a/src/kernel/qmotifdnd_x11.cpp b/src/kernel/qmotifdnd_x11.cpp
index d11065835..548310dab 100644
--- a/src/kernel/qmotifdnd_x11.cpp
+++ b/src/kernel/qmotifdnd_x11.cpp
@@ -72,7 +72,7 @@ in doc/dnd.doc, where the documentation system can see it. */
 
 #ifndef TQT_NO_DRAGANDDROP
 
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "qt_x11_p.h"
 
 #include <stdlib.h>
diff --git a/src/kernel/qpaintdevice_x11.cpp b/src/kernel/qpaintdevice_x11.cpp
index c64b3e90e..1a01803aa 100644
--- a/src/kernel/qpaintdevice_x11.cpp
+++ b/src/kernel/qpaintdevice_x11.cpp
@@ -41,7 +41,7 @@
 #include "ntqpaintdevice.h"
 #include "ntqpaintdevicemetrics.h"
 #include "ntqpainter.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqbitmap.h"
 #include "ntqapplication.h"
 #include "qt_x11_p.h"
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp
index 4868ffb00..3e3574dff 100644
--- a/src/kernel/qpainter.cpp
+++ b/src/kernel/qpainter.cpp
@@ -44,7 +44,7 @@
 #include "ntqptrstack.h"
 #include "ntqptrdict.h"
 #include "ntqdatastream.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqimage.h"
 #include "ntqpaintdevicemetrics.h"
 #include "ntqapplication.h"
diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
index 657965c42..a4f71fc00 100644
--- a/src/kernel/qpainter_x11.cpp
+++ b/src/kernel/qpainter_x11.cpp
@@ -42,7 +42,7 @@
 
 #include "ntqfont.h"
 #include "ntqpainter.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqbitmap.h"
 #include "ntqpixmapcache.h"
 #include "ntqtextcodec.h"
diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp
index 4f05adc02..9c93632c1 100644
--- a/src/kernel/qpixmap.cpp
+++ b/src/kernel/qpixmap.cpp
@@ -42,7 +42,7 @@
 
 #include "ntqbitmap.h"
 #include "ntqimage.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqpainter.h"
 #include "ntqdatastream.h"
 #include "ntqbuffer.h"
diff --git a/src/kernel/qsizegrip.cpp b/src/kernel/qsizegrip.cpp
index d27e0b534..a6629ecf6 100644
--- a/src/kernel/qsizegrip.cpp
+++ b/src/kernel/qsizegrip.cpp
@@ -53,7 +53,7 @@ extern Atom qt_sizegrip;			// defined in qapplication_x11.cpp
 #include "tqobjectlist.h"
 #include "qt_windows.h"
 #elif defined(TQ_WS_MAC)
-bool qt_mac_update_sizer(TQWidget *, int); //qwidget_mac.cpp
+bool qt_mac_update_sizer(TQWidget *, int); //tqwidget_mac.cpp
 #endif
 
 
diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp
index 67b42e70f..d45540bb8 100644
--- a/src/kernel/qstyle.cpp
+++ b/src/kernel/qstyle.cpp
@@ -50,7 +50,7 @@
 #include "ntqpopupmenu.h"
 #include "ntqpushbutton.h"
 #include "tqobjectlist.h"
-#include "ntqwidgetlist.h"
+#include "tqwidgetlist.h"
 
 #include <limits.h>
 
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index 6baa0c732..f21fbfd17 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -83,9 +83,9 @@ kernel {
 		  $$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/tqwidget.h \
+		  $$KERNEL_H/tqwidgetintdict.h \
+		  $$KERNEL_H/tqwidgetlist.h \
 		  $$KERNEL_H/ntqwindowdefs.h \
 		  $$KERNEL_H/ntqwmatrix.h \
 		  $$KERNEL_H/ntqvariant.h \
@@ -128,7 +128,7 @@ kernel {
 		  $$KERNEL_CPP/qregion_win.cpp \
 		  $$KERNEL_CPP/qsound_win.cpp \
 		  $$KERNEL_CPP/qthread_win.cpp \
-		  $$KERNEL_CPP/qwidget_win.cpp \
+		  $$KERNEL_CPP/tqwidget_win.cpp \
 		  $$KERNEL_CPP/qole_win.c \
 		  $$KERNEL_CPP/qfontengine_win.cpp
 
@@ -148,8 +148,8 @@ kernel {
 			  $$KERNEL_CPP/qpainter_x11.cpp \
 			  $$KERNEL_CPP/qregion_x11.cpp \
 			  $$KERNEL_CPP/qsound_x11.cpp \
-			  $$KERNEL_CPP/qwidget_x11.cpp \
-			  $$KERNEL_CPP/qwidgetcreate_x11.cpp \
+			  $$KERNEL_CPP/tqwidget_x11.cpp \
+			  $$KERNEL_CPP/tqwidgetcreate_x11.cpp \
 		          $$KERNEL_CPP/qfontengine_x11.cpp
              glibmainloop {
                   SOURCES += $$KERNEL_CPP/qeventloop_x11_glib.cpp
@@ -176,7 +176,7 @@ kernel {
 			  $$KERNEL_CPP/qpaintdevice_mac.cpp \
 			  $$KERNEL_CPP/qpainter_mac.cpp \
 			  $$KERNEL_CPP/qregion_mac.cpp \
-			  $$KERNEL_CPP/qwidget_mac.cpp \
+			  $$KERNEL_CPP/tqwidget_mac.cpp \
 			  $$KERNEL_CPP/qeventloop_mac.cpp \
 			  $$KERNEL_CPP/qfont_mac.cpp \
 			  $$KERNEL_CPP/qfontengine_mac.cpp
@@ -255,7 +255,7 @@ kernel {
 		  $$KERNEL_CPP/qlocalfs.cpp \
 		  $$KERNEL_CPP/qurloperator.cpp \
 		  $$KERNEL_CPP/qurlinfo.cpp \
-		  $$KERNEL_CPP/qwidget.cpp \
+		  $$KERNEL_CPP/tqwidget.cpp \
 		  $$KERNEL_CPP/qwmatrix.cpp \
 		  $$KERNEL_CPP/qvariant.cpp \
 		  $$KERNEL_CPP/qrichtext.cpp \
diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h
index 1aef6f4a8..5295f8134 100644
--- a/src/kernel/qt_pch.h
+++ b/src/kernel/qt_pch.h
@@ -39,7 +39,7 @@
 #include <ntqstringlist.h>
 #include <ntqstyle.h>
 #include <ntqtimer.h>
-#include <ntqwidget.h>
+#include <tqwidget.h>
 
 #include <limits.h>
 #include <stdlib.h>
diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp
index 99d475859..e3d1c5b98 100644
--- a/src/kernel/qtranslator.cpp
+++ b/src/kernel/qtranslator.cpp
@@ -57,7 +57,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
 #ifndef TQT_NO_TRANSLATION
 
 #include "ntqfileinfo.h"
-#include "ntqwidgetlist.h"
+#include "tqwidgetlist.h"
 #include "ntqintdict.h"
 #include "ntqstring.h"
 #include "ntqapplication.h"
diff --git a/src/kernel/qwidget.cpp b/src/kernel/tqwidget.cpp
index e855e7448..9345c31e4 100644
--- a/src/kernel/qwidget.cpp
+++ b/src/kernel/tqwidget.cpp
@@ -40,9 +40,9 @@
 
 
 #include "tqobjectlist.h"
-#include "ntqwidget.h"
-#include "ntqwidgetlist.h"
-#include "ntqwidgetintdict.h"
+#include "tqwidget.h"
+#include "tqwidgetlist.h"
+#include "tqwidgetintdict.h"
 #include "ntqptrdict.h"
 #include "ntqfocusdata.h"
 #include "ntqcursor.h"
@@ -73,7 +73,7 @@
 
 
 /*!
-    \class TQWidget ntqwidget.h
+    \class TQWidget tqwidget.h
     \brief The TQWidget class is the base class of all user interface objects.
 
     \ingroup abstractwidgets
@@ -1773,7 +1773,7 @@ void TQWidget::setEnabled( bool enable )
 	// enforce the windows behavior of clearing the cursor on
 	// disabled widgets
 
-	extern void tqt_x11_enforce_cursor( TQWidget * w ); // defined in qwidget_x11.cpp
+	extern void tqt_x11_enforce_cursor( TQWidget * w ); // defined in tqwidget_x11.cpp
 	tqt_x11_enforce_cursor( this );
     }
 #endif
diff --git a/src/kernel/ntqwidget.h b/src/kernel/tqwidget.h
index d328dd95d..d328dd95d 100644
--- a/src/kernel/ntqwidget.h
+++ b/src/kernel/tqwidget.h
diff --git a/src/kernel/qwidget_p.h b/src/kernel/tqwidget_p.h
index b56b4960c..3f8d68235 100644
--- a/src/kernel/qwidget_p.h
+++ b/src/kernel/tqwidget_p.h
@@ -47,7 +47,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp.  This header
+// of qapplication_*.cpp, tqwidget*.cpp and qfiledialog.cpp.  This header
 // file may change from version to version without notice, or even be removed.
 //
 // We mean it.
diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/tqwidget_x11.cpp
index db3500cfe..88bed113c 100644
--- a/src/kernel/qwidget_x11.cpp
+++ b/src/kernel/tqwidget_x11.cpp
@@ -192,7 +192,7 @@ const uint stdDesktopEventMask =			// X event mask
 
 
 /*
-  The qt_ functions below are implemented in qwidgetcreate_x11.cpp.
+  The qt_ functions below are implemented in tqwidgetcreate_x11.cpp.
 */
 
 Window qt_XCreateWindow( const TQWidget *creator,
diff --git a/src/kernel/qwidgetcreate_x11.cpp b/src/kernel/tqwidgetcreate_x11.cpp
index 25a17ccb1..b34fe9613 100644
--- a/src/kernel/qwidgetcreate_x11.cpp
+++ b/src/kernel/tqwidgetcreate_x11.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "qt_x11_p.h"
 
 
diff --git a/src/kernel/ntqwidgetintdict.h b/src/kernel/tqwidgetintdict.h
index f5c924b23..8a4694804 100644
--- a/src/kernel/ntqwidgetintdict.h
+++ b/src/kernel/tqwidgetintdict.h
@@ -42,7 +42,7 @@
 #define TQWIDGETINTDICT_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqintdict.h"
 #endif // QT_H
 
diff --git a/src/kernel/ntqwidgetlist.h b/src/kernel/tqwidgetlist.h
index af912f812..bcd7637cf 100644
--- a/src/kernel/ntqwidgetlist.h
+++ b/src/kernel/tqwidgetlist.h
@@ -42,7 +42,7 @@
 #define TQWIDGETLIST_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqptrlist.h"
 #endif // QT_H
 
diff --git a/src/opengl/ntqgl.h b/src/opengl/ntqgl.h
index 858a96494..86eeddf6e 100644
--- a/src/opengl/ntqgl.h
+++ b/src/opengl/ntqgl.h
@@ -42,7 +42,7 @@
 #define TQGL_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqglcolormap.h"
 #endif // QT_H
 
diff --git a/src/qt.pro b/src/qt.pro
index 84482686b..8e6298fb1 100644
--- a/src/qt.pro
+++ b/src/qt.pro
@@ -183,14 +183,14 @@ wince-* {
 		   $$KERNEL_CPP/ntqimageformatplugin.h \
 		   $$STYLES_CPP/ntqstyleplugin.h \
 		   $$CODECS_CPP/ntqtextcodecplugin.h \
-		   $$WIDGETS_CPP/ntqwidgetplugin.h
+		   $$WIDGETS_CPP/tqwidgetplugin.h
 
 	SOURCES -= $$TOOLS_CPP/qcomlibrary.cpp \
 		   $$KERNEL_CPP/qgplugin.cpp \
 		   $$KERNEL_CPP/qimageformatplugin.cpp \
 		   $$STYLES_CPP/qstyleplugin.cpp \
 		   $$CODECS_CPP/qtextcodecplugin.cpp \
-		   $$WIDGETS_CPP/qwidgetplugin.cpp 
+		   $$WIDGETS_CPP/tqwidgetplugin.cpp 
 }
 
 glibmainloop {
diff --git a/src/sql/tqdatabrowser.h b/src/sql/tqdatabrowser.h
index d4b9ac290..fe5b9e623 100644
--- a/src/sql/tqdatabrowser.h
+++ b/src/sql/tqdatabrowser.h
@@ -42,7 +42,7 @@
 #define TQDATABROWSER_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqstring.h"
 #include "ntqstringlist.h"
 #include "tqsql.h"
diff --git a/src/sql/tqdataview.h b/src/sql/tqdataview.h
index 245bb5eab..3763b70da 100644
--- a/src/sql/tqdataview.h
+++ b/src/sql/tqdataview.h
@@ -42,7 +42,7 @@
 #define TQDATAVIEW_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #endif // QT_H
 
 #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/tqsqlform.cpp b/src/sql/tqsqlform.cpp
index 2d72d707b..5977d2033 100644
--- a/src/sql/tqsqlform.cpp
+++ b/src/sql/tqsqlform.cpp
@@ -46,7 +46,7 @@
 #include "tqsqlpropertymap.h"
 #include "tqsqlrecord.h"
 #include "ntqstringlist.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqdict.h"
 
 class TQSqlFormPrivate
diff --git a/src/sql/tqsqlmanager_p.cpp b/src/sql/tqsqlmanager_p.cpp
index cd8ca467e..3e8b9d5bd 100644
--- a/src/sql/tqsqlmanager_p.cpp
+++ b/src/sql/tqsqlmanager_p.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_SQL
 
 #include "ntqapplication.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "tqsqlcursor.h"
 #include "tqsqlform.h"
 #include "tqsqldriver.h"
diff --git a/src/sql/tqsqlpropertymap.cpp b/src/sql/tqsqlpropertymap.cpp
index 1f982e9c2..67451029d 100644
--- a/src/sql/tqsqlpropertymap.cpp
+++ b/src/sql/tqsqlpropertymap.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_SQL_FORM
 
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqcleanuphandler.h"
 #include "ntqmetaobject.h"
 #include "ntqmap.h"
diff --git a/src/styles/ntqsgistyle.h b/src/styles/ntqsgistyle.h
index 29582bf69..df0b5b47b 100644
--- a/src/styles/ntqsgistyle.h
+++ b/src/styles/ntqsgistyle.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "ntqmotifstyle.h"
 #include "ntqguardedptr.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #endif // QT_H
 
 #if !defined(TQT_NO_STYLE_SGI) || defined(QT_PLUGIN)
diff --git a/src/styles/qinterlacestyle.cpp b/src/styles/qinterlacestyle.cpp
index 8a2134544..b506f1243 100644
--- a/src/styles/qinterlacestyle.cpp
+++ b/src/styles/qinterlacestyle.cpp
@@ -48,10 +48,10 @@
 #include "ntqpainter.h"
 #include "ntqdrawutil.h" // for now
 #include "ntqpalette.h" // for now
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqlabel.h"
 #include "ntqpushbutton.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqrangecontrol.h"
 #include "ntqscrollbar.h"
 #include "ntqlistbox.h"
diff --git a/src/styles/qmotifstyle.cpp b/src/styles/qmotifstyle.cpp
index a95018f59..36d85aafc 100644
--- a/src/styles/qmotifstyle.cpp
+++ b/src/styles/qmotifstyle.cpp
@@ -48,7 +48,7 @@
 #include "ntqdrawutil.h"
 #include "ntqpixmap.h"
 #include "ntqpalette.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqpushbutton.h"
 #include "ntqscrollbar.h"
 #include "ntqtabbar.h"
diff --git a/src/styles/qsgistyle.cpp b/src/styles/qsgistyle.cpp
index 3b0db97c2..54b9bfc8c 100644
--- a/src/styles/qsgistyle.cpp
+++ b/src/styles/qsgistyle.cpp
@@ -49,7 +49,7 @@
 #include "ntqdrawutil.h"
 #include "ntqpixmap.h"
 #include "ntqpalette.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqpushbutton.h"
 #include "ntqscrollbar.h"
 #include "ntqcombobox.h"
diff --git a/src/styles/qwindowsstyle.cpp b/src/styles/qwindowsstyle.cpp
index 1bf789d22..b8f3a5410 100644
--- a/src/styles/qwindowsstyle.cpp
+++ b/src/styles/qwindowsstyle.cpp
@@ -47,13 +47,13 @@
 #include "ntqpainter.h"
 #include "ntqdrawutil.h" // for now
 #include "ntqpixmap.h" // for now
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqlabel.h"
 #include "ntqimage.h"
 #include "ntqpushbutton.h"
 #include "ntqcombobox.h"
 #include "ntqlistbox.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqrangecontrol.h"
 #include "ntqscrollbar.h"
 #include "ntqslider.h"
diff --git a/src/tools/qfeatures.txt b/src/tools/qfeatures.txt
index 84a25587b..6a9b92bf3 100644
--- a/src/tools/qfeatures.txt
+++ b/src/tools/qfeatures.txt
@@ -1290,7 +1290,7 @@ SeeAlso: ???
 Feature: WIDGETPLUGIN
 Section: Widgets
 Requires: COMPONENT ICONSET
-Name: QWidgetPlugin
+Name: TQWidgetPlugin
 SeeAlso: ???
 
 
diff --git a/src/tools/qwinexport.cpp b/src/tools/qwinexport.cpp
index bddee65df..1584aa817 100644
--- a/src/tools/qwinexport.cpp
+++ b/src/tools/qwinexport.cpp
@@ -8,7 +8,7 @@
 #include <ntqpoint.h>
 #include <ntqrect.h>
 #include <ntqsignalslotimp.h>
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include <ntqhttp.h>
 #include <private/tqsqlextension_p.h>
 #include <tqsqlindex.h>
diff --git a/src/widgets/ntqbutton.h b/src/widgets/ntqbutton.h
index 0d0aa65ef..5683e44b7 100644
--- a/src/widgets/ntqbutton.h
+++ b/src/widgets/ntqbutton.h
@@ -42,7 +42,7 @@
 #define TQBUTTON_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqkeysequence.h"
 #endif // QT_H
 
diff --git a/src/widgets/ntqcombobox.h b/src/widgets/ntqcombobox.h
index f7bf2e422..296148549 100644
--- a/src/widgets/ntqcombobox.h
+++ b/src/widgets/ntqcombobox.h
@@ -42,7 +42,7 @@
 #define TQCOMBOBOX_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #endif // QT_H
 
 #ifndef TQT_NO_COMBOBOX
diff --git a/src/widgets/ntqdatetimeedit.h b/src/widgets/ntqdatetimeedit.h
index 6ff8f0215..75a0ef4d2 100644
--- a/src/widgets/ntqdatetimeedit.h
+++ b/src/widgets/ntqdatetimeedit.h
@@ -42,7 +42,7 @@
 #define TQDATETIMEEDIT_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqstring.h"
 #include "ntqdatetime.h"
 #endif // QT_H
diff --git a/src/widgets/ntqdial.h b/src/widgets/ntqdial.h
index b4dba6eec..7baf98e53 100644
--- a/src/widgets/ntqdial.h
+++ b/src/widgets/ntqdial.h
@@ -43,7 +43,7 @@
 #define TQDIAL_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqrangecontrol.h"
 #endif // QT_H
 
diff --git a/src/widgets/ntqdockarea.h b/src/widgets/ntqdockarea.h
index e3a767c4d..ee9201597 100644
--- a/src/widgets/ntqdockarea.h
+++ b/src/widgets/ntqdockarea.h
@@ -42,7 +42,7 @@
 #define TQDOCKAREA_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqptrlist.h"
 #include "ntqdockwindow.h"
 #include "ntqlayout.h"
diff --git a/src/widgets/ntqframe.h b/src/widgets/ntqframe.h
index e0afe5923..db565f474 100644
--- a/src/widgets/ntqframe.h
+++ b/src/widgets/ntqframe.h
@@ -42,7 +42,7 @@
 #define TQFRAME_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #endif // QT_H
 
 #ifndef TQT_NO_FRAME
diff --git a/src/widgets/ntqhbox.h b/src/widgets/ntqhbox.h
index 8b45cb751..f92379514 100644
--- a/src/widgets/ntqhbox.h
+++ b/src/widgets/ntqhbox.h
@@ -39,7 +39,7 @@
 #define TQHBOX_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #endif // QT_H
 
 #ifndef TQT_NO_HBOX
diff --git a/src/widgets/ntqheader.h b/src/widgets/ntqheader.h
index 7030fe11d..9fe9917a5 100644
--- a/src/widgets/ntqheader.h
+++ b/src/widgets/ntqheader.h
@@ -42,7 +42,7 @@
 #define TQHEADER_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqstring.h"
 #include "ntqiconset.h" // conversion TQPixmap->TQIconset
 #endif // QT_H
diff --git a/src/widgets/ntqmainwindow.h b/src/widgets/ntqmainwindow.h
index 02e2939a3..647c23206 100644
--- a/src/widgets/ntqmainwindow.h
+++ b/src/widgets/ntqmainwindow.h
@@ -42,7 +42,7 @@
 #define TQMAINWINDOW_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqtoolbar.h"
 #include "ntqptrlist.h"
 #include "ntqtextstream.h"
diff --git a/src/widgets/ntqscrollbar.h b/src/widgets/ntqscrollbar.h
index ab52ff626..6a298c96f 100644
--- a/src/widgets/ntqscrollbar.h
+++ b/src/widgets/ntqscrollbar.h
@@ -44,7 +44,7 @@
 class TQTimer;
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqrangecontrol.h"
 #endif // QT_H
 
diff --git a/src/widgets/ntqslider.h b/src/widgets/ntqslider.h
index 1bf9a6c6b..af60245e3 100644
--- a/src/widgets/ntqslider.h
+++ b/src/widgets/ntqslider.h
@@ -42,7 +42,7 @@
 #define TQSLIDER_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqrangecontrol.h"
 #endif // QT_H
 
diff --git a/src/widgets/ntqspinbox.h b/src/widgets/ntqspinbox.h
index 5b1abd8b0..345857c74 100644
--- a/src/widgets/ntqspinbox.h
+++ b/src/widgets/ntqspinbox.h
@@ -42,7 +42,7 @@
 #define TQSPINBOX_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqrangecontrol.h"
 #endif // QT_H
 
diff --git a/src/widgets/ntqsplashscreen.h b/src/widgets/ntqsplashscreen.h
index 6649923e6..9670a1476 100644
--- a/src/widgets/ntqsplashscreen.h
+++ b/src/widgets/ntqsplashscreen.h
@@ -41,7 +41,7 @@
 
 #ifndef QT_H
 #include "ntqpixmap.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #endif // QT_H
 
 #ifndef TQT_NO_SPLASHSCREEN
diff --git a/src/widgets/ntqstatusbar.h b/src/widgets/ntqstatusbar.h
index 4b3f98f32..b4c84ea17 100644
--- a/src/widgets/ntqstatusbar.h
+++ b/src/widgets/ntqstatusbar.h
@@ -42,7 +42,7 @@
 #define TQSTATUSBAR_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #endif // QT_H
 
 #ifndef TQT_NO_STATUSBAR
diff --git a/src/widgets/ntqtabbar.h b/src/widgets/ntqtabbar.h
index 9e8f71667..c7010ed53 100644
--- a/src/widgets/ntqtabbar.h
+++ b/src/widgets/ntqtabbar.h
@@ -40,7 +40,7 @@
 #define TQTABBAR_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqptrlist.h"
 #endif // QT_H
 
diff --git a/src/widgets/ntqtabwidget.h b/src/widgets/ntqtabwidget.h
index e2ba055c4..c2d3242dd 100644
--- a/src/widgets/ntqtabwidget.h
+++ b/src/widgets/ntqtabwidget.h
@@ -42,7 +42,7 @@
 #define TQTABWIDGET_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "ntqiconset.h"
 #endif // QT_H
 
diff --git a/src/widgets/ntqtooltip.h b/src/widgets/ntqtooltip.h
index e5673511d..3058ed0e0 100644
--- a/src/widgets/ntqtooltip.h
+++ b/src/widgets/ntqtooltip.h
@@ -40,7 +40,7 @@
 #define TQTOOLTIP_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #endif // QT_H
 
 #ifndef TQT_NO_TOOLTIP
diff --git a/src/widgets/qdialogbuttons_p.h b/src/widgets/qdialogbuttons_p.h
index 90e645b80..a5667245f 100644
--- a/src/widgets/qdialogbuttons_p.h
+++ b/src/widgets/qdialogbuttons_p.h
@@ -41,7 +41,7 @@
 
 #ifndef QT_H
 #ifndef QT_H
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #endif // QT_H
 #endif
 
diff --git a/src/widgets/qdockarea.cpp b/src/widgets/qdockarea.cpp
index a763cdc53..3693a036d 100644
--- a/src/widgets/qdockarea.cpp
+++ b/src/widgets/qdockarea.cpp
@@ -46,7 +46,7 @@
 #include "ntqptrvector.h"
 #include "ntqapplication.h"
 #include "ntqpainter.h"
-#include "ntqwidgetlist.h"
+#include "tqwidgetlist.h"
 #include "ntqmap.h"
 #include "ntqmainwindow.h"
 
diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp
index e889e5a4d..4ebe27aca 100644
--- a/src/widgets/qdockwindow.cpp
+++ b/src/widgets/qdockwindow.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_MAINWINDOW
 #include "ntqdesktopwidget.h"
 #include "ntqdockarea.h"
-#include "qwidgetresizehandler_p.h"
+#include "tqwidgetresizehandler_p.h"
 #include "qtitlebar_p.h"
 #include "ntqpainter.h"
 #include "ntqapplication.h"
diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp
index ddf0dd70b..d40cdb868 100644
--- a/src/widgets/qeffects.cpp
+++ b/src/widgets/qeffects.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqapplication.h"
 #ifndef TQT_NO_EFFECTS
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #include "qeffects_p.h"
 #include "ntqpixmap.h"
 #include "ntqimage.h"
diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp
index 4198e3132..8b9981ffa 100644
--- a/src/widgets/qscrollview.cpp
+++ b/src/widgets/qscrollview.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #ifndef TQT_NO_SCROLLVIEW
 #include "ntqscrollbar.h"
 #include "tqobjectlist.h"
diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri
index a678e21de..8be28d1cf 100644
--- a/src/widgets/qt_widgets.pri
+++ b/src/widgets/qt_widgets.pri
@@ -8,7 +8,7 @@ widgets {
 		  $$WIDGETS_P/qdialogbuttons_p.h \
 		  $$WIDGETS_H/ntqcheckbox.h \
 		  $$WIDGETS_H/ntqcombobox.h \
-		  $$WIDGETS_P/qwidgetresizehandler_p.h \
+		  $$WIDGETS_P/tqwidgetresizehandler_p.h \
 		  $$WIDGETS_H/ntqdial.h \
 		  $$WIDGETS_H/ntqdockarea.h \
 		  $$WIDGETS_H/ntqdockwindow.h \
@@ -56,21 +56,21 @@ widgets {
 		  $$WIDGETS_H/ntqvbuttongroup.h \
 		  $$WIDGETS_H/ntqvgroupbox.h \
 		  $$WIDGETS_H/ntqwhatsthis.h \
-		  $$WIDGETS_H/ntqwidgetstack.h \
+		  $$WIDGETS_H/tqwidgetstack.h \
 		  $$WIDGETS_H/ntqaction.h \
 		  $$WIDGETS_H/ntqdatetimeedit.h \
 		  $$WIDGETS_H/ntqtextview.h \
 		  $$WIDGETS_H/ntqtextbrowser.h \
 		  $$WIDGETS_H/ntqtextedit.h \
-		  $$WIDGETS_P/qwidgetinterface_p.h \
-		  $$WIDGETS_H/ntqwidgetplugin.h
+		  $$WIDGETS_P/tqwidgetinterface_p.h \
+		  $$WIDGETS_H/tqwidgetplugin.h
 
 	SOURCES += $$WIDGETS_CPP/qbuttongroup.cpp \
 		  $$WIDGETS_CPP/qbutton.cpp \
 		  $$WIDGETS_CPP/qdialogbuttons.cpp \
 		  $$WIDGETS_CPP/qcheckbox.cpp \
 		  $$WIDGETS_CPP/qcombobox.cpp \
-		  $$WIDGETS_CPP/qwidgetresizehandler.cpp \
+		  $$WIDGETS_CPP/tqwidgetresizehandler.cpp \
 		  $$WIDGETS_CPP/qdial.cpp \
 		  $$WIDGETS_CPP/qdockarea.cpp \
 		  $$WIDGETS_CPP/qdockwindow.cpp \
@@ -118,14 +118,14 @@ widgets {
 		  $$WIDGETS_CPP/qvbuttongroup.cpp \
 		  $$WIDGETS_CPP/qvgroupbox.cpp \
 		  $$WIDGETS_CPP/qwhatsthis.cpp \
-		  $$WIDGETS_CPP/qwidgetstack.cpp \
+		  $$WIDGETS_CPP/tqwidgetstack.cpp \
 		  $$WIDGETS_CPP/qaction.cpp \
 		  $$WIDGETS_CPP/qdatetimeedit.cpp \
 		  $$WIDGETS_CPP/qeffects.cpp \
 		  $$WIDGETS_CPP/qtextview.cpp \
 		  $$WIDGETS_CPP/qtextbrowser.cpp \
 		  $$WIDGETS_CPP/qtextedit.cpp \
-		  $$WIDGETS_CPP/qwidgetplugin.cpp
+		  $$WIDGETS_CPP/tqwidgetplugin.cpp
    !embedded:mac:SOURCES += $$WIDGETS_CPP/qmenubar_mac.cpp
 }
 
diff --git a/src/widgets/qtabwidget.cpp b/src/widgets/qtabwidget.cpp
index f6c54524c..464affb58 100644
--- a/src/widgets/qtabwidget.cpp
+++ b/src/widgets/qtabwidget.cpp
@@ -43,7 +43,7 @@
 #include "tqobjectlist.h"
 #include "ntqtabbar.h"
 #include "ntqapplication.h"
-#include "ntqwidgetstack.h"
+#include "tqwidgetstack.h"
 #include "ntqbitmap.h"
 #include "ntqaccel.h"
 #include "ntqstyle.h"
diff --git a/src/widgets/qtoolbar.cpp b/src/widgets/qtoolbar.cpp
index fd5bf56a2..a3d390e43 100644
--- a/src/widgets/qtoolbar.cpp
+++ b/src/widgets/qtoolbar.cpp
@@ -53,7 +53,7 @@
 #include "ntqpopupmenu.h"
 #include "ntqcombobox.h"
 #include "ntqtimer.h"
-#include "ntqwidgetlist.h"
+#include "tqwidgetlist.h"
 #include "ntqstyle.h"
 
 static const char * const arrow_v_xpm[] = {
diff --git a/src/widgets/qtoolbox.cpp b/src/widgets/qtoolbox.cpp
index a8d2523ac..a04c78dbe 100644
--- a/src/widgets/qtoolbox.cpp
+++ b/src/widgets/qtoolbox.cpp
@@ -49,7 +49,7 @@
 #include <ntqstyle.h>
 #include <tqobjectlist.h>
 #include <ntqapplication.h>
-#include <ntqwidgetlist.h>
+#include <tqwidgetlist.h>
 #include <ntqlayout.h>
 #include <ntqvaluelist.h>
 #include <ntqtooltip.h>
diff --git a/src/widgets/qwidgetinterface_p.h b/src/widgets/tqwidgetinterface_p.h
index 5cfd43e48..5cfd43e48 100644
--- a/src/widgets/qwidgetinterface_p.h
+++ b/src/widgets/tqwidgetinterface_p.h
diff --git a/src/widgets/qwidgetplugin.cpp b/src/widgets/tqwidgetplugin.cpp
index 2d026221c..a12f13418 100644
--- a/src/widgets/qwidgetplugin.cpp
+++ b/src/widgets/tqwidgetplugin.cpp
@@ -38,18 +38,18 @@
 **
 **********************************************************************/
 
-#include "ntqwidgetplugin.h"
+#include "tqwidgetplugin.h"
 
 #ifndef TQT_NO_WIDGETPLUGIN
-#include "qwidgetinterface_p.h"
+#include "tqwidgetinterface_p.h"
 #include "tqobjectcleanuphandler.h"
-#include "ntqwidget.h"
+#include "tqwidget.h"
 #ifdef QT_CONTAINER_CUSTOM_WIDGETS
-#include "ntqwidgetlist.h"
+#include "tqwidgetlist.h"
 #endif
 
 /*!
-    \class TQWidgetPlugin ntqwidgetplugin.h
+    \class TQWidgetPlugin tqwidgetplugin.h
     \brief The TQWidgetPlugin class provides an abstract base for custom TQWidget plugins.
 
     \ingroup plugins
@@ -440,7 +440,7 @@ bool TQWidgetPlugin::isContainer( const TQString & ) const
 #ifdef QT_CONTAINER_CUSTOM_WIDGETS
 
 /*!
-    \class TQWidgetContainerPlugin ntqwidgetplugin.h
+    \class TQWidgetContainerPlugin tqwidgetplugin.h
     \brief The TQWidgetContainerPlugin class provides an abstract base
     for complex custom container TQWidget plugins.
 
diff --git a/src/widgets/ntqwidgetplugin.h b/src/widgets/tqwidgetplugin.h
index cd40860d3..cd40860d3 100644
--- a/src/widgets/ntqwidgetplugin.h
+++ b/src/widgets/tqwidgetplugin.h
diff --git a/src/widgets/qwidgetresizehandler.cpp b/src/widgets/tqwidgetresizehandler.cpp
index bcddde86b..0f75eb797 100644
--- a/src/widgets/qwidgetresizehandler.cpp
+++ b/src/widgets/tqwidgetresizehandler.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "qwidgetresizehandler_p.h"
+#include "tqwidgetresizehandler_p.h"
 
 #ifndef TQT_NO_RESIZEHANDLER
 #include "ntqframe.h"
diff --git a/src/widgets/qwidgetresizehandler_p.h b/src/widgets/tqwidgetresizehandler_p.h
index 30f8e088c..30f8e088c 100644
--- a/src/widgets/qwidgetresizehandler_p.h
+++ b/src/widgets/tqwidgetresizehandler_p.h
diff --git a/src/widgets/qwidgetstack.cpp b/src/widgets/tqwidgetstack.cpp
index b8cb9e76a..b065fc35a 100644
--- a/src/widgets/qwidgetstack.cpp
+++ b/src/widgets/tqwidgetstack.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqwidgetstack.h"
+#include "tqwidgetstack.h"
 #include "ntqlayout.h"
 #include "../kernel/qlayoutengine_p.h"
 #ifndef TQT_NO_WIDGETSTACK
diff --git a/src/widgets/ntqwidgetstack.h b/src/widgets/tqwidgetstack.h
index 4967804c8..4967804c8 100644
--- a/src/widgets/ntqwidgetstack.h
+++ b/src/widgets/tqwidgetstack.h
diff --git a/src/workspace/ntqworkspace.h b/src/workspace/ntqworkspace.h
index eee079d32..71227476e 100644
--- a/src/workspace/ntqworkspace.h
+++ b/src/workspace/ntqworkspace.h
@@ -42,8 +42,8 @@
 #define TQWORKSPACE_H
 
 #ifndef QT_H
-#include "ntqwidget.h"
-#include "ntqwidgetlist.h"
+#include "tqwidget.h"
+#include "tqwidgetlist.h"
 #endif // QT_H
 
 #ifndef TQT_NO_WORKSPACE
diff --git a/src/workspace/qworkspace.cpp b/src/workspace/qworkspace.cpp
index a2cd96faf..4479c0d8a 100644
--- a/src/workspace/qworkspace.cpp
+++ b/src/workspace/qworkspace.cpp
@@ -53,7 +53,7 @@
 #include "ntqmenubar.h"
 #include "ntqguardedptr.h"
 #include "ntqiconset.h"
-#include "../widgets/qwidgetresizehandler_p.h"
+#include "../widgets/tqwidgetresizehandler_p.h"
 #include "ntqfocusdata.h"
 #include "ntqdatetime.h"
 #include "ntqtooltip.h"