83 files changed, 200 insertions, 247 deletions
diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp
index 4678494d..b46702fe 100644
--- a/src/dialogs/qcolordialog.cpp
+++ b/src/dialogs/qcolordialog.cpp
@@ -56,7 +56,7 @@
 #include "ntqapplication.h"
 #include "tqstyle.h"
 #include "ntqsettings.h"
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 
 #ifdef TQ_WS_MAC
 TQRgb macGetRgba( TQRgb initial, bool *ok, TQWidget *parent, const char* name );
diff --git a/src/dialogs/qdialog.cpp b/src/dialogs/qdialog.cpp
index 6175cc05..46844a56 100644
--- a/src/dialogs/qdialog.cpp
+++ b/src/dialogs/qdialog.cpp
@@ -48,9 +48,9 @@
 #include "tqobjectlist.h"
 #include "tqwidgetlist.h"
 #include "ntqlayout.h"
-#include "ntqsizegrip.h"
+#include "tqsizegrip.h"
 #include "ntqwhatsthis.h"
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 #include "ntqcursor.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
 #include "ntqaccessible.h"
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp
index 983c817d..a51077df 100644
--- a/src/dialogs/qfiledialog.cpp
+++ b/src/dialogs/qfiledialog.cpp
@@ -80,7 +80,7 @@
 #include "ntqnetworkprotocol.h"
 #include "tqobjectlist.h"
 #include "ntqpainter.h"
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 #include "ntqprogressbar.h"
 #include "tqptrvector.h"
 #include "ntqpushbutton.h"
@@ -89,8 +89,8 @@
 #include "tqstrlist.h"
 #include "tqstyle.h"
 #include "tqtimer.h"
-#include "ntqtoolbutton.h"
-#include "ntqtooltip.h"
+#include "tqtoolbutton.h"
+#include "tqtooltip.h"
 #include "ntqvbox.h"
 #include "tqwidgetstack.h"
 
diff --git a/src/kernel/ntqlayout.h b/src/kernel/ntqlayout.h
index 9465e278..c900c352 100644
--- a/src/kernel/ntqlayout.h
+++ b/src/kernel/ntqlayout.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqobject.h"
-#include "ntqsizepolicy.h"
+#include "tqsizepolicy.h"
 #include "tqwidget.h"
 #endif // QT_H
 
diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h
index 587b8720..6feb7578 100644
--- a/src/kernel/ntqnamespace.h
+++ b/src/kernel/ntqnamespace.h
@@ -925,7 +925,7 @@ public:
 	AnchorHref
     };
 
-    // Documented in qmainwindow.cpp
+    // Documented in tqmainwindow.cpp
     enum Dock {
 	DockUnmanaged,
 	DockTornOff,
diff --git a/src/kernel/ntqrect.h b/src/kernel/ntqrect.h
index aa1c1ce3..d7dd2886 100644
--- a/src/kernel/ntqrect.h
+++ b/src/kernel/ntqrect.h
@@ -42,7 +42,7 @@
 #define TQRECT_H
 
 #ifndef QT_H
-#include "ntqsize.h"
+#include "tqsize.h"
 #endif // QT_H
 
 #if defined(topLeft)
diff --git a/src/kernel/ntqsession.h b/src/kernel/ntqsession.h
deleted file mode 100644
index 36fd657b..00000000
--- a/src/kernel/ntqsession.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Definition of TQSession class
-**
-** Created : 990510
-**
-** Copyright (C) 1992-2008 Trolltech ASA.  All rights reserved.
-**
-** This file is part of the kernel module of the TQt GUI Toolkit.
-**
-** This file may be used under the terms of the GNU General
-** Public License versions 2.0 or 3.0 as published by the Free
-** Software Foundation and appearing in the files LICENSE.GPL2
-** and LICENSE.GPL3 included in the packaging of this file.
-** Alternatively you may (at your option) use any later version
-** of the GNU General Public License if such license has been
-** publicly approved by Trolltech ASA (or its successors, if any)
-** and the KDE Free TQt Foundation.
-**
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/.
-** If you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
-**
-** This file may be used under the terms of the Q Public License as
-** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
-** included in the packaging of this file.  Licensees holding valid TQt
-** Commercial licenses may use this file in accordance with the TQt
-** Commercial License Agreement provided with the Software.
-**
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
-** herein.
-**
-**********************************************************************/
-
-#ifndef TQSESSION_H
-#define TQSESSION_H
-
-#ifndef QT_H
-#endif // QT_H
-
-#endif
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index fefc761e..c5430b8f 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -38,9 +38,9 @@
 #include <stdio.h>
 #include "tqtextstream.h"
 #include "ntqfontinfo.h"
-#include "ntqsizepolicy.h"
+#include "tqsizepolicy.h"
 #include "ntqtl.h"
-#include "ntqsize.h"
+#include "tqsize.h"
 #include "ntqrect.h"
 #include "ntqbitarray.h"
 #include "ntqregion.h"
@@ -70,7 +70,7 @@
 #include <ntqtabbar.h>
 #include "tqiconset.h"
 #include "ntqbutton.h"
-#include <ntqtoolbutton.h>
+#include <tqtoolbutton.h>
 #include "tqstyle.h"
 #include "ntqframe.h"
 #include "ntqfile.h"
@@ -103,7 +103,7 @@
 #include "ntqsocketnotifier.h"
 #include <ntqeventloop.h>
 #include <ntqhttp.h>
-#include <ntqaction.h>
+#include <tqaction.h>
 #include "ntqbuffer.h"
 #include "tqimage.h"
 #include <tqimageformatplugin.h>
@@ -147,7 +147,7 @@
 #include <ntqcolordialog.h>
 #include <ntqpaintdevicemetrics.h>
 #include "ntqpointarray.h"
-#include "ntqmenudata.h"
+#include "tqmenudata.h"
 #include <ntqlistview.h>
 #include "ntqpen.h"
 #include "ntqdragobject.h"
@@ -158,7 +158,7 @@
 #include <ntqcursor.h>
 #include <ntqerrormessage.h>
 #include <ntqpolygonscanner.h>
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 #include <ntqprintdialog.h>
 #include <ntqprinter.h>
 #include <ntqprocess.h>
@@ -181,7 +181,7 @@
 #include "tqsemaphore.h"
 #include <ntqprogressdialog.h>
 #include "ntqsocketdevice.h"
-#include <ntqsessionmanager.h>
+#include <tqsessionmanager.h>
 #include <ntqsettings.h>
 #include <ntqsgistyle.h>
 #include <ntqfontdialog.h>
@@ -190,7 +190,7 @@
 #include <ntqsignalslotimp.h>
 #include <ntqsimplerichtext.h>
 #include "ntqwmatrix.h"
-#include <ntqsizegrip.h>
+#include <tqsizegrip.h>
 #include <ntqabstractlayout.h>
 #include <tqsjiscodec.h>
 #include <ntqslider.h>
@@ -216,8 +216,8 @@
 #include <tqdatabrowser.h>
 #include <tqsqlresult.h>
 #include <tqsqlselectcursor.h>
-#include <ntqstatusbar.h>
-#include <ntqmenubar.h>
+#include <tqstatusbar.h>
+#include <tqmenubar.h>
 #include <tqcanvas.h>
 #include "ntqtranslator.h"
 #include <tqstrvec.h>
@@ -234,14 +234,14 @@
 #include <tqtextcodecfactory.h>
 #include <tqtextcodecplugin.h>
 #include <ntqmultilineedit.h>
-#include "ntqtoolbar.h"
+#include "tqtoolbar.h"
 #include <tqtextview.h>
 #include "tqwaitcondition.h"
 #include <ntqasyncio.h>
 #include <ntqfontdatabase.h>
-#include <ntqmainwindow.h>
-#include <ntqtoolbox.h>
-#include <ntqtooltip.h>
+#include <tqmainwindow.h>
+#include <tqtoolbox.h>
+#include <tqtooltip.h>
 #include "ntqdesktopwidget.h"
 #include <tqtsciicodec.h>
 #include "ntqurl.h"
@@ -268,7 +268,7 @@
 #include <ntqcompactstyle.h>
 #include <ntqwizard.h>
 #include <ntqpainter.h>
-#include <ntqworkspace.h>
+#include <tqworkspace.h>
 #include <ntqlocalfs.h>
 #include <tqxml.h>
 
diff --git a/src/kernel/qabstractlayout.cpp b/src/kernel/qabstractlayout.cpp
index f11611f9..98ffcd6c 100644
--- a/src/kernel/qabstractlayout.cpp
+++ b/src/kernel/qabstractlayout.cpp
@@ -43,8 +43,8 @@
 #ifndef TQT_NO_LAYOUT
 #include "ntqapplication.h"
 #include "qlayoutengine_p.h"
-#include "ntqmenubar.h"
-#include "ntqtoolbar.h"
+#include "tqmenubar.h"
+#include "tqtoolbar.h"
 
 static int menuBarHeightForWidth( TQMenuBar *menubar, int w )
 {
diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp
index 8b37b92e..00d9c3f0 100644
--- a/src/kernel/qaccel.cpp
+++ b/src/kernel/qaccel.cpp
@@ -48,7 +48,7 @@
 #include "tqptrlist.h"
 #include "ntqwhatsthis.h"
 #include "ntqguardedptr.h"
-#include "ntqstatusbar.h"
+#include "tqstatusbar.h"
 #include "ntqdockwindow.h"
 #include "ntqsignalslotimp.h"
 /*!
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 5297837c..c1387f78 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -50,7 +50,7 @@
 
 #include "ntqtranslator.h"
 #include "tqtextcodec.h"
-#include "ntqsessionmanager.h"
+#include "tqsessionmanager.h"
 #include "ntqdragobject.h"
 #include "ntqclipboard.h"
 #include "ntqcursor.h"
@@ -4480,7 +4480,7 @@ bool TQApplication::reverseLayout()
 
 
 /*!
-  \class TQSessionManager ntqsessionmanager.h
+  \class TQSessionManager tqsessionmanager.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 cd65da67..c2b64a63 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -78,7 +78,7 @@
 #include "ntqdatastream.h"
 #include "ntqbuffer.h"
 #include "ntqsocketnotifier.h"
-#include "ntqsessionmanager.h"
+#include "tqsessionmanager.h"
 #include "tqvaluelist.h"
 #include "ntqdict.h"
 #include "ntqguardedptr.h"
diff --git a/src/kernel/qcolor_p.h b/src/kernel/qcolor_p.h
index 32665988..d85cbf36 100644
--- a/src/kernel/qcolor_p.h
+++ b/src/kernel/qcolor_p.h
@@ -48,7 +48,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qmenudata.cpp, qmenubar.cpp, qmenubar.cpp, qpopupmenu.cpp,
+// of tqmenudata.cpp, tqmenubar.cpp, tqmenubar.cpp, tqpopupmenu.cpp,
 // qmotifstyle.cpp and qwindowssstyle.cpp.  This header file may change
 // from version to version without notice, or even be removed.
 //
diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp
index d9621b99..8693da96 100644
--- a/src/kernel/qinputcontext.cpp
+++ b/src/kernel/qinputcontext.cpp
@@ -43,7 +43,7 @@
 
 #include "ntqapplication.h"
 #include "tqwidget.h"
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 
 #include <stdlib.h>
 #include <limits.h>
diff --git a/src/kernel/qlayout.cpp b/src/kernel/qlayout.cpp
index 6fd85c40..5697f20e 100644
--- a/src/kernel/qlayout.cpp
+++ b/src/kernel/qlayout.cpp
@@ -45,7 +45,7 @@
 #include "ntqapplication.h"
 #include "tqwidget.h"
 #include "tqptrlist.h"
-#include "ntqsizepolicy.h"
+#include "tqsizepolicy.h"
 
 #include "qlayoutengine_p.h"
 
diff --git a/src/kernel/qlayoutengine_p.h b/src/kernel/qlayoutengine_p.h
index 560c0a9e..ed0e950b 100644
--- a/src/kernel/qlayoutengine_p.h
+++ b/src/kernel/qlayoutengine_p.h
@@ -50,7 +50,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qlayout.cpp, qlayoutengine.cpp, qmainwindow.cpp and qsplitter.cpp.
+// of qlayout.cpp, qlayoutengine.cpp, tqmainwindow.cpp and qsplitter.cpp.
 // This header file may change from version to version without notice,
 // or even be removed.
 //
diff --git a/src/kernel/qprinter_p.h b/src/kernel/qprinter_p.h
index 0c75668a..3b01895d 100644
--- a/src/kernel/qprinter_p.h
+++ b/src/kernel/qprinter_p.h
@@ -46,7 +46,7 @@
 #include <ntqprinter.h>
 #include <ntqshared.h>
 #include <tqstring.h>
-#include <ntqsize.h>
+#include <tqsize.h>
 #endif // QT_H
 
 class TQPrinterPrivate
diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h
index f30c2914..c8c68360 100644
--- a/src/kernel/qrichtext_p.h
+++ b/src/kernel/qrichtext_p.h
@@ -63,7 +63,7 @@
 #include "tqstringlist.h"
 #include "ntqfont.h"
 #include "ntqcolor.h"
-#include "ntqsize.h"
+#include "tqsize.h"
 #include "tqvaluelist.h"
 #include "tqvaluestack.h"
 #include "tqobject.h"
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index c4690a3f..daa778a1 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -66,13 +66,13 @@ kernel {
 		  $$KERNEL_H/ntqprocess.h \
 		  $$KERNEL_H/ntqrect.h \
 		  $$KERNEL_H/ntqregion.h \
-		  $$KERNEL_H/ntqsessionmanager.h \
+		  $$KERNEL_H/tqsessionmanager.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/tqsize.h \
+		  $$KERNEL_H/tqsizegrip.h \
+		  $$KERNEL_H/tqsizepolicy.h \
 		  $$KERNEL_H/ntqsocketnotifier.h \
 		  $$KERNEL_H/ntqsound.h \
 		  $$KERNEL_H/tqstyle.h \
@@ -242,8 +242,8 @@ kernel {
 		  $$KERNEL_CPP/qregion.cpp \
 		  $$KERNEL_CPP/qsignal.cpp \
 		  $$KERNEL_CPP/qsignalmapper.cpp \
-		  $$KERNEL_CPP/qsize.cpp \
-		  $$KERNEL_CPP/qsizegrip.cpp \
+		  $$KERNEL_CPP/tqsize.cpp \
+		  $$KERNEL_CPP/tqsizegrip.cpp \
 		  $$KERNEL_CPP/tqstyle.cpp \
 		  $$KERNEL_CPP/qsocketnotifier.cpp \
 		  $$KERNEL_CPP/qsound.cpp \
diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp
index 7e9b659a..0b2cd0f3 100644
--- a/src/kernel/qvariant.cpp
+++ b/src/kernel/qvariant.cpp
@@ -50,7 +50,7 @@
 #include "ntqbrush.h"
 #include "ntqpoint.h"
 #include "ntqrect.h"
-#include "ntqsize.h"
+#include "tqsize.h"
 #include "ntqcolor.h"
 #include "ntqpalette.h"
 #include "tqiconset.h"
@@ -60,7 +60,7 @@
 #include "ntqbitmap.h"
 #include "ntqcursor.h"
 #include "tqdatetime.h"
-#include "ntqsizepolicy.h"
+#include "tqsizepolicy.h"
 #include "ntqshared.h"
 #include "ntqbitarray.h"
 #include "ntqkeysequence.h"
diff --git a/src/kernel/ntqsessionmanager.h b/src/kernel/tqsessionmanager.h
index ae79dd30..ae79dd30 100644
--- a/src/kernel/ntqsessionmanager.h
+++ b/src/kernel/tqsessionmanager.h
diff --git a/src/kernel/qsize.cpp b/src/kernel/tqsize.cpp
index 988d54fe..ba9c3df6 100644
--- a/src/kernel/qsize.cpp
+++ b/src/kernel/tqsize.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqsize.h"
+#include "tqsize.h"
 #include "ntqdatastream.h"
 
 
diff --git a/src/kernel/ntqsize.h b/src/kernel/tqsize.h
index 5ac36482..5ac36482 100644
--- a/src/kernel/ntqsize.h
+++ b/src/kernel/tqsize.h
diff --git a/src/kernel/qsizegrip.cpp b/src/kernel/tqsizegrip.cpp
index f4528c3b..00c994a3 100644
--- a/src/kernel/qsizegrip.cpp
+++ b/src/kernel/tqsizegrip.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqsizegrip.h"
+#include "tqsizegrip.h"
 
 #ifndef TQT_NO_SIZEGRIP
 
@@ -79,7 +79,7 @@ static TQWidget* qt_sizegrip_workspace( TQWidget* w )
 
 
 /*!
-    \class TQSizeGrip ntqsizegrip.h
+    \class TQSizeGrip tqsizegrip.h
 
     \brief The TQSizeGrip class provides a corner-grip for resizing a top-level window.
 
@@ -98,7 +98,7 @@ static TQWidget* qt_sizegrip_workspace( TQWidget* w )
     widget, so if you have a status bar (e.g. you are using
     TQMainWindow), then you don't need to use this widget explicitly.
 
-    <img src=qsizegrip-m.png> <img src=qsizegrip-w.png>
+    <img src=tqsizegrip-m.png> <img src=tqsizegrip-w.png>
 
     \sa TQStatusBar
 */
diff --git a/src/kernel/ntqsizegrip.h b/src/kernel/tqsizegrip.h
index 624fb649..624fb649 100644
--- a/src/kernel/ntqsizegrip.h
+++ b/src/kernel/tqsizegrip.h
diff --git a/src/kernel/ntqsizepolicy.h b/src/kernel/tqsizepolicy.h
index 2c764d33..2c764d33 100644
--- a/src/kernel/ntqsizepolicy.h
+++ b/src/kernel/tqsizepolicy.h
diff --git a/src/kernel/tqstyle.cpp b/src/kernel/tqstyle.cpp
index f0c0524d..b3c496da 100644
--- a/src/kernel/tqstyle.cpp
+++ b/src/kernel/tqstyle.cpp
@@ -47,7 +47,7 @@
 #include "ntqframe.h"
 #include "ntqlayout.h"
 #include "ntqlistview.h"
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 #include "ntqpushbutton.h"
 #include "tqobjectlist.h"
 #include "tqwidgetlist.h"
diff --git a/src/kernel/tqstyle.h b/src/kernel/tqstyle.h
index 6fc61b45..bd5987d3 100644
--- a/src/kernel/tqstyle.h
+++ b/src/kernel/tqstyle.h
@@ -46,7 +46,7 @@
 #include "ntqcolor.h"
 #include "tqiconset.h"
 #include "ntqtabbar.h"
-#include "ntqtoolbutton.h"
+#include "tqtoolbutton.h"
 #endif // QT_H
 
 
diff --git a/src/kernel/tqwidget.h b/src/kernel/tqwidget.h
index a83c90a9..8d9faf00 100644
--- a/src/kernel/tqwidget.h
+++ b/src/kernel/tqwidget.h
@@ -49,7 +49,7 @@
 #include "ntqfont.h"
 #include "ntqfontmetrics.h"
 #include "ntqfontinfo.h"
-#include "ntqsizepolicy.h"
+#include "tqsizepolicy.h"
 #endif // QT_H
 
 #if defined(TQ_WS_X11)
diff --git a/src/libqt.map b/src/libqt.map
index 3b9bae5b..05875f9b 100644
--- a/src/libqt.map
+++ b/src/libqt.map
@@ -18,7 +18,7 @@
 	QHttpNormalRequest::*;
 	QHttpRequest::*;
 	QHttpResponseHeader::*;
-	QMainWindowLayout::*;
+	TQMainWindowLayout::*;
 	Q*Private::*;    # collides with QGuardedPtrPrivate
 	QPSPrinter*;
 	Q*RegExpEngine::*;
@@ -39,7 +39,7 @@
 	QUnicodeTables::*;
 	QViewportWidget::*;
 	QWFlagWidget::*;
-	QWorkspaceChild::*;
+	TQWorkspaceChild::*;
 	QFontDef::*;
 	QFontStruct::*;
 	QFont*Codec::*;
diff --git a/src/qt.pro b/src/qt.pro
index fb76e060..01b74fe9 100644
--- a/src/qt.pro
+++ b/src/qt.pro
@@ -136,7 +136,7 @@ win32:include($$KERNEL_CPP/qt_win.pri)
 include($$KERNEL_CPP/qt_kernel.pri)
 include($$WIDGETS_CPP/qt_widgets.pri)
 include($$DIALOGS_CPP/qt_dialogs.pri)
-include($$WORKSPACE_CPP/qt_workspace.pri)
+include($$WORKSPACE_CPP/tqt_workspace.pri)
 include($$INPUTMETHOD_CPP/qt_inputmethod.pri)
 include($$NETWORK_CPP/qt_network.pri)
 include($$CANVAS_CPP/qt_canvas.pri)
diff --git a/src/qt_professional.pri b/src/qt_professional.pri
index 38375d49..cdcb13a3 100644
--- a/src/qt_professional.pri
+++ b/src/qt_professional.pri
@@ -42,7 +42,7 @@
 		WORKSPACE_H = $$WORKSPACE_CPP
 	}
 	INCLUDEPATH += $$QT_SOURCE_TREE/src/workspace
-	include( $$QT_SOURCE_TREE/src/workspace/qt_workspace.pri )
+	include( $$QT_SOURCE_TREE/src/workspace/tqt_workspace.pri )
 	DEFINES     *= TQT_MODULE_WORKSPACE
 }
 
diff --git a/src/sql/tqdatatable.cpp b/src/sql/tqdatatable.cpp
index c62b607f..9abbc0f9 100644
--- a/src/sql/tqdatatable.cpp
+++ b/src/sql/tqdatatable.cpp
@@ -48,7 +48,7 @@
 #include "ntqapplication.h"
 #include "ntqlayout.h"
 #include "ntqpainter.h"
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 #include "tqvaluelist.h"
 #include "tqsqlmanager_p.h"
 #include "tqdatetime.h"
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index 9f161062..f52acc17 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_STYLE
 
 #include "tqmutex.h"
-#include "ntqmenubar.h"
+#include "tqmenubar.h"
 #include "ntqapplication.h"
 #include "ntqpainter.h"
 #include "ntqdrawutil.h"
@@ -53,8 +53,8 @@
 #include "ntqtabwidget.h"
 #include "ntqlineedit.h"
 #include "ntqscrollbar.h"
-#include "ntqtoolbutton.h"
-#include "ntqtoolbar.h"
+#include "tqtoolbutton.h"
+#include "tqtoolbar.h"
 #include "ntqcombobox.h"
 #include "ntqdockarea.h"
 #include "ntqheader.h"
@@ -72,7 +72,7 @@
 #include <limits.h>
 #include <ntqpixmap.h>
 #include "../widgets/qtitlebar_p.h"
-#include <ntqtoolbox.h>
+#include <tqtoolbox.h>
 
 /*!
     \class TQCommonStyle ntqcommonstyle.h
diff --git a/src/styles/qcompactstyle.cpp b/src/styles/qcompactstyle.cpp
index e6fd64e1..4df2fc10 100644
--- a/src/styles/qcompactstyle.cpp
+++ b/src/styles/qcompactstyle.cpp
@@ -46,8 +46,8 @@
 #include "ntqpalette.h"
 #include "ntqpainter.h"
 #include "ntqdrawutil.h"
-#include "ntqmenudata.h"
-#include "ntqpopupmenu.h"
+#include "tqmenudata.h"
+#include "tqpopupmenu.h"
 
 TQCompactStyle::TQCompactStyle()
 : TQWindowsStyle()
diff --git a/src/styles/qmotifplusstyle.cpp b/src/styles/qmotifplusstyle.cpp
index 84352808..2d081c22 100644
--- a/src/styles/qmotifplusstyle.cpp
+++ b/src/styles/qmotifplusstyle.cpp
@@ -42,7 +42,7 @@
 
 #if !defined(TQT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN)
 
-#include "ntqmenubar.h"
+#include "tqmenubar.h"
 #include "ntqapplication.h"
 #include "ntqpainter.h"
 #include "ntqpalette.h"
@@ -57,7 +57,7 @@
 #include "ntqdrawutil.h"
 #include "ntqscrollbar.h"
 #include "ntqtabbar.h"
-#include "ntqtoolbar.h"
+#include "tqtoolbar.h"
 #include "ntqguardedptr.h"
 #include "ntqlayout.h"
 
diff --git a/src/styles/qmotifstyle.cpp b/src/styles/qmotifstyle.cpp
index a611426e..b412a244 100644
--- a/src/styles/qmotifstyle.cpp
+++ b/src/styles/qmotifstyle.cpp
@@ -42,7 +42,7 @@
 
 #if !defined(TQT_NO_STYLE_MOTIF) || defined(QT_PLUGIN)
 
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 #include "ntqapplication.h"
 #include "ntqpainter.h"
 #include "ntqdrawutil.h"
diff --git a/src/styles/qsgistyle.cpp b/src/styles/qsgistyle.cpp
index 8fd36f70..914c508b 100644
--- a/src/styles/qsgistyle.cpp
+++ b/src/styles/qsgistyle.cpp
@@ -42,7 +42,7 @@
 
 #if !defined(TQT_NO_STYLE_SGI) || defined(QT_PLUGIN)
 
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 #include "ntqapplication.h"
 #include "ntqbutton.h"
 #include "ntqpainter.h"
@@ -55,9 +55,9 @@
 #include "ntqcombobox.h"
 #include "ntqslider.h"
 #include "tqtextedit.h"
-#include "ntqtoolbar.h"
+#include "tqtoolbar.h"
 #include "ntqlineedit.h"
-#include "ntqmenubar.h"
+#include "tqmenubar.h"
 #include <limits.h>
 
 #ifndef TQT_NO_SLIDER
diff --git a/src/styles/qwindowsstyle.cpp b/src/styles/qwindowsstyle.cpp
index b979e9a0..e19903c0 100644
--- a/src/styles/qwindowsstyle.cpp
+++ b/src/styles/qwindowsstyle.cpp
@@ -42,7 +42,7 @@
 
 #if !defined(TQT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN)
 
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 #include "ntqapplication.h"
 #include "ntqpainter.h"
 #include "ntqdrawutil.h" // for now
@@ -64,7 +64,7 @@
 #include "ntqcleanuphandler.h"
 #include "ntqdockwindow.h"
 #include "tqobjectlist.h"
-#include "ntqmenubar.h"
+#include "tqmenubar.h"
 
 #include <limits.h>
 
diff --git a/src/tools/qfeatures.txt b/src/tools/qfeatures.txt
index 765061ff..6bf19b12 100644
--- a/src/tools/qfeatures.txt
+++ b/src/tools/qfeatures.txt
@@ -1,7 +1,7 @@
 Feature: WORKSPACE
 Section: Widgets
 Requires: SCROLLBAR VBOX TITLEBAR RESIZEHANDLER POPUPMENU LABEL TOOLBUTTON MAINWINDOW TOOLBAR MENUBAR
-Name: QWorkSpace
+Name: TQWorkspace
 SeeAlso: ???
 
 Feature: WHEELEVENT
@@ -886,7 +886,7 @@ SeeAlso: ???
 Feature: SIZEGRIP
 Section: Widgets
 Requires: STYLE
-Name: QSizeGrip
+Name: TQSizeGrip
 SeeAlso: ???
 
 Feature: HEADER
@@ -910,7 +910,7 @@ SeeAlso: ???
 Feature: ACTION
 Section: Kernel
 Requires: TOOLBUTTON COMBOBOX
-Name: QAction
+Name: TQAction
 SeeAlso: ???
 
 Feature: COMBOBOX
diff --git a/src/widgets/qcombobox.cpp b/src/widgets/qcombobox.cpp
index 47dfb959..82177c18 100644
--- a/src/widgets/qcombobox.cpp
+++ b/src/widgets/qcombobox.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqcombobox.h"
 #ifndef TQT_NO_COMBOBOX
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 #include "ntqlistbox.h"
 #include "ntqpainter.h"
 #include "ntqdrawutil.h"
diff --git a/src/widgets/qdockarea.cpp b/src/widgets/qdockarea.cpp
index 702de25a..65b2fe8a 100644
--- a/src/widgets/qdockarea.cpp
+++ b/src/widgets/qdockarea.cpp
@@ -48,7 +48,7 @@
 #include "ntqpainter.h"
 #include "tqwidgetlist.h"
 #include "tqmap.h"
-#include "ntqmainwindow.h"
+#include "tqmainwindow.h"
 
 //#define TQDOCKAREA_DEBUG
 
@@ -474,7 +474,7 @@ int TQDockAreaLayout::widthForHeight( int h ) const
     that you create a subclass of TQWidget and add your TQDockAreas to
     your subclass.
 
-    \img qmainwindow-qdockareas.png TQMainWindow's TQDockAreas
+    \img tqmainwindow-qdockareas.png TQMainWindow's TQDockAreas
 
     \target lines
     \e Lines. TQDockArea uses the concept of lines. A line is a
diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp
index 77155540..df2c2cd7 100644
--- a/src/widgets/qdockwindow.cpp
+++ b/src/widgets/qdockwindow.cpp
@@ -47,12 +47,12 @@
 #include "qtitlebar_p.h"
 #include "ntqpainter.h"
 #include "ntqapplication.h"
-#include "ntqtoolbutton.h"
-#include "ntqtoolbar.h"
+#include "tqtoolbutton.h"
+#include "tqtoolbar.h"
 #include "ntqlayout.h"
-#include "ntqmainwindow.h"
+#include "tqmainwindow.h"
 #include "tqtimer.h"
-#include "ntqtooltip.h"
+#include "tqtooltip.h"
 #include "ntqguardedptr.h"
 #include "ntqcursor.h"
 #include "tqstyle.h"
@@ -715,7 +715,7 @@ void TQDockWindowTitleBar::mouseDoubleClickEvent( TQMouseEvent * )
     functionality provided for dock windows is available with the same
     API for toolbars.
 
-    \img qmainwindow-qdockareas.png TQDockWindows in a TQDockArea
+    \img tqmainwindow-qdockareas.png TQDockWindows in a TQDockArea
     \caption Two TQDockWindows (\l{TQToolBar}s) in a \l TQDockArea
 
     \img qdockwindow.png A TQDockWindow
diff --git a/src/widgets/qeffects_p.h b/src/widgets/qeffects_p.h
index 4f5cecd2..dad8fce9 100644
--- a/src/widgets/qeffects_p.h
+++ b/src/widgets/qeffects_p.h
@@ -47,7 +47,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qeffects.cpp, qcombobox.cpp, qpopupmenu.cpp and qtooltip.cpp.
+// of qeffects.cpp, qcombobox.cpp, tqpopupmenu.cpp and tqtooltip.cpp.
 // This header file may change from version to version without notice,
 // or even be removed.
 //
diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp
index 87a63e7f..c2236cf1 100644
--- a/src/widgets/qlineedit.cpp
+++ b/src/widgets/qlineedit.cpp
@@ -55,7 +55,7 @@
 #include "ntqvalidator.h"
 #include "ntqdragobject.h"
 #include "tqtimer.h"
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 #include "tqstringlist.h"
 #include "ntqguardedptr.h"
 #include "tqstyle.h"
diff --git a/src/widgets/qlistbox.cpp b/src/widgets/qlistbox.cpp
index d18381f8..1cac29c1 100644
--- a/src/widgets/qlistbox.cpp
+++ b/src/widgets/qlistbox.cpp
@@ -56,7 +56,7 @@
 #include "tqtimer.h"
 #include "tqstringlist.h"
 #include "tqstyle.h"
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 #include "ntqguardedptr.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
 #include "ntqaccessible.h"
diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp
index 14fcb673..6ad78f0f 100644
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/qlistview.cpp
@@ -55,12 +55,12 @@
 #include "tqiconset.h"
 #include "ntqcleanuphandler.h"
 #include "ntqpixmapcache.h"
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 #include "ntqtl.h"
 #include "ntqdragobject.h"
 #include "ntqlineedit.h"
 #include "ntqvbox.h"
-#include "ntqtooltip.h"
+#include "tqtooltip.h"
 #include "tqstyle.h"
 #include "tqstylesheet.h"
 #include "../kernel/qinternal_p.h"
diff --git a/src/widgets/qmultilineedit.cpp b/src/widgets/qmultilineedit.cpp
index 6ce84317..3a5dd652 100644
--- a/src/widgets/qmultilineedit.cpp
+++ b/src/widgets/qmultilineedit.cpp
@@ -48,7 +48,7 @@
 #include "ntqregexp.h"
 #include "ntqapplication.h"
 #include "ntqdragobject.h"
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 #include "tqtimer.h"
 #include "ntqdict.h"
 #include "../kernel/qrichtext_p.h"
diff --git a/src/widgets/qpushbutton.cpp b/src/widgets/qpushbutton.cpp
index 62bac9dc..25a85221 100644
--- a/src/widgets/qpushbutton.cpp
+++ b/src/widgets/qpushbutton.cpp
@@ -46,10 +46,10 @@
 #include "ntqdrawutil.h"
 #include "ntqpixmap.h"
 #include "ntqbitmap.h"
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 #include "ntqguardedptr.h"
 #include "ntqapplication.h"
-#include "ntqtoolbar.h"
+#include "tqtoolbar.h"
 #include "tqstyle.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
 #include "ntqaccessible.h"
diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri
index a74eb748..38ef25ca 100644
--- a/src/widgets/qt_widgets.pri
+++ b/src/widgets/qt_widgets.pri
@@ -26,11 +26,11 @@ widgets {
 		  $$WIDGETS_H/ntqlineedit.h \
 		  $$WIDGETS_H/ntqlistbox.h \
 		  $$WIDGETS_H/ntqlistview.h \
-		  $$WIDGETS_H/ntqmainwindow.h \
-		  $$WIDGETS_H/ntqmenubar.h \
-		  $$WIDGETS_H/ntqmenudata.h \
+		  $$WIDGETS_H/tqmainwindow.h \
+		  $$WIDGETS_H/tqmenubar.h \
+		  $$WIDGETS_H/tqmenudata.h \
 		  $$WIDGETS_H/ntqmultilineedit.h \
-		  $$WIDGETS_H/ntqpopupmenu.h \
+		  $$WIDGETS_H/tqpopupmenu.h \
 		  $$WIDGETS_H/ntqprogressbar.h \
 		  $$WIDGETS_H/ntqpushbutton.h \
 		  $$WIDGETS_H/ntqradiobutton.h \
@@ -41,23 +41,23 @@ widgets {
 		  $$WIDGETS_H/ntqsplashscreen.h \
 		  $$WIDGETS_H/ntqspinbox.h \
 		  $$WIDGETS_H/ntqsplitter.h \
-		  $$WIDGETS_H/ntqstatusbar.h \
+		  $$WIDGETS_H/tqstatusbar.h \
 		  $$WIDGETS_H/ntqtabbar.h \
 		  $$WIDGETS_H/ntqsyntaxhighlighter.h \
 		  $$WIDGETS_P/qsyntaxhighlighter_p.h \
 		  $$WIDGETS_H/ntqtabwidget.h \
 		  $$WIDGETS_P/qtitlebar_p.h \
-		  $$WIDGETS_H/ntqtoolbar.h \
-		  $$WIDGETS_H/ntqtoolbox.h \
-		  $$WIDGETS_H/ntqtoolbutton.h \
-		  $$WIDGETS_H/ntqtooltip.h \
+		  $$WIDGETS_H/tqtoolbar.h \
+		  $$WIDGETS_H/tqtoolbox.h \
+		  $$WIDGETS_H/tqtoolbutton.h \
+		  $$WIDGETS_H/tqtooltip.h \
 		  $$WIDGETS_H/ntqvalidator.h \
 		  $$WIDGETS_H/ntqvbox.h \
 		  $$WIDGETS_H/ntqvbuttongroup.h \
 		  $$WIDGETS_H/ntqvgroupbox.h \
 		  $$WIDGETS_H/ntqwhatsthis.h \
 		  $$WIDGETS_H/tqwidgetstack.h \
-		  $$WIDGETS_H/ntqaction.h \
+		  $$WIDGETS_H/tqaction.h \
 		  $$WIDGETS_H/tqdatetimeedit.h \
 		  $$WIDGETS_H/tqtextview.h \
 		  $$WIDGETS_H/tqtextbrowser.h \
@@ -88,11 +88,11 @@ widgets {
 		  $$WIDGETS_CPP/qlineedit.cpp \
 		  $$WIDGETS_CPP/qlistbox.cpp \
 		  $$WIDGETS_CPP/qlistview.cpp \
-		  $$WIDGETS_CPP/qmainwindow.cpp \
-		  $$WIDGETS_CPP/qmenubar.cpp \
-		  $$WIDGETS_CPP/qmenudata.cpp \
+		  $$WIDGETS_CPP/tqmainwindow.cpp \
+		  $$WIDGETS_CPP/tqmenubar.cpp \
+		  $$WIDGETS_CPP/tqmenudata.cpp \
 		  $$WIDGETS_CPP/qmultilineedit.cpp \
-		  $$WIDGETS_CPP/qpopupmenu.cpp \
+		  $$WIDGETS_CPP/tqpopupmenu.cpp \
 		  $$WIDGETS_CPP/qprogressbar.cpp \
 		  $$WIDGETS_CPP/qpushbutton.cpp \
 		  $$WIDGETS_CPP/qradiobutton.cpp \
@@ -104,29 +104,29 @@ widgets {
 		  $$WIDGETS_CPP/qspinbox.cpp \
 		  $$WIDGETS_CPP/qspinwidget.cpp \
 		  $$WIDGETS_CPP/qsplitter.cpp \
-		  $$WIDGETS_CPP/qstatusbar.cpp \
+		  $$WIDGETS_CPP/tqstatusbar.cpp \
 		  $$WIDGETS_CPP/qsyntaxhighlighter.cpp \
 		  $$WIDGETS_CPP/qtabbar.cpp \
 		  $$WIDGETS_CPP/qtabwidget.cpp \
 		  $$WIDGETS_CPP/qtitlebar.cpp \
-		  $$WIDGETS_CPP/qtoolbar.cpp \
-		  $$WIDGETS_CPP/qtoolbox.cpp \
-		  $$WIDGETS_CPP/qtoolbutton.cpp \
-		  $$WIDGETS_CPP/qtooltip.cpp \
+		  $$WIDGETS_CPP/tqtoolbar.cpp \
+		  $$WIDGETS_CPP/tqtoolbox.cpp \
+		  $$WIDGETS_CPP/tqtoolbutton.cpp \
+		  $$WIDGETS_CPP/tqtooltip.cpp \
 		  $$WIDGETS_CPP/qvalidator.cpp \
 		  $$WIDGETS_CPP/qvbox.cpp \
 		  $$WIDGETS_CPP/qvbuttongroup.cpp \
 		  $$WIDGETS_CPP/qvgroupbox.cpp \
 		  $$WIDGETS_CPP/qwhatsthis.cpp \
 		  $$WIDGETS_CPP/tqwidgetstack.cpp \
-		  $$WIDGETS_CPP/qaction.cpp \
+		  $$WIDGETS_CPP/tqaction.cpp \
 		  $$WIDGETS_CPP/tqdatetimeedit.cpp \
 		  $$WIDGETS_CPP/qeffects.cpp \
 		  $$WIDGETS_CPP/tqtextview.cpp \
 		  $$WIDGETS_CPP/tqtextbrowser.cpp \
 		  $$WIDGETS_CPP/tqtextedit.cpp \
 		  $$WIDGETS_CPP/tqwidgetplugin.cpp
-   !embedded:mac:SOURCES += $$WIDGETS_CPP/qmenubar_mac.cpp
+   !embedded:mac:SOURCES += $$WIDGETS_CPP/tqmenubar_mac.cpp
 }
 
 wince-* {
diff --git a/src/widgets/qtabbar.cpp b/src/widgets/qtabbar.cpp
index ff261837..e88c02e2 100644
--- a/src/widgets/qtabbar.cpp
+++ b/src/widgets/qtabbar.cpp
@@ -40,8 +40,8 @@
 #ifndef TQT_NO_TABBAR
 #include "ntqaccel.h"
 #include "ntqbitmap.h"
-#include "ntqtoolbutton.h"
-#include "ntqtooltip.h"
+#include "tqtoolbutton.h"
+#include "tqtooltip.h"
 #include "ntqapplication.h"
 #include "tqstyle.h"
 #include "ntqpainter.h"
diff --git a/src/widgets/qtabwidget.cpp b/src/widgets/qtabwidget.cpp
index 9e210105..3d44f5cd 100644
--- a/src/widgets/qtabwidget.cpp
+++ b/src/widgets/qtabwidget.cpp
@@ -48,7 +48,7 @@
 #include "ntqaccel.h"
 #include "tqstyle.h"
 #include "ntqpainter.h"
-#include "ntqtoolbutton.h"
+#include "tqtoolbutton.h"
 
 #ifdef Q_OS_MACX
 #include <qmacstyle_mac.h>
diff --git a/src/widgets/qtitlebar.cpp b/src/widgets/qtitlebar.cpp
index 553811d2..444a1211 100644
--- a/src/widgets/qtitlebar.cpp
+++ b/src/widgets/qtitlebar.cpp
@@ -49,14 +49,14 @@
 #include "tqstyle.h"
 #include "tqdatetime.h"
 #include "private/qapplication_p.h"
-#include "ntqtooltip.h"
+#include "tqtooltip.h"
 #include "tqimage.h"
 #include "tqtimer.h"
 #include "ntqpainter.h"
 #include "tqstyle.h"
 #include "private/qinternal_p.h"
 #ifndef TQT_NO_WORKSPACE
-#include "ntqworkspace.h"
+#include "tqworkspace.h"
 #endif
 #if defined(TQ_WS_WIN)
 #include "qt_windows.h"
diff --git a/src/widgets/qtitlebar_p.h b/src/widgets/qtitlebar_p.h
index d19a5c44..b933658d 100644
--- a/src/widgets/qtitlebar_p.h
+++ b/src/widgets/qtitlebar_p.h
@@ -47,7 +47,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qworkspace.cpp and qdockwindow.cpp.  This header file may change
+// of tqworkspace.cpp and qdockwindow.cpp.  This header file may change
 // from version to version without notice, or even be removed.
 //
 // We mean it.
diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/qwhatsthis.cpp
index 64de3654..ca0ed7dd 100644
--- a/src/widgets/qwhatsthis.cpp
+++ b/src/widgets/qwhatsthis.cpp
@@ -44,11 +44,11 @@
 #include "ntqpainter.h"
 #include "tqtimer.h"
 #include "tqptrdict.h"
-#include "ntqtoolbutton.h"
+#include "tqtoolbutton.h"
 #include "ntqshared.h"
 #include "ntqcursor.h"
 #include "ntqbitmap.h"
-#include "ntqtooltip.h"
+#include "tqtooltip.h"
 #include "ntqsimplerichtext.h"
 #include "tqstylesheet.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
diff --git a/src/widgets/qaction.cpp b/src/widgets/tqaction.cpp
index 49f1108c..6bf1a50f 100644
--- a/src/widgets/qaction.cpp
+++ b/src/widgets/tqaction.cpp
@@ -36,24 +36,24 @@
 **
 **********************************************************************/
 
-#include "ntqaction.h"
+#include "tqaction.h"
 
 #ifndef TQT_NO_ACTION
 
-#include "ntqtoolbar.h"
+#include "tqtoolbar.h"
 #include "tqptrlist.h"
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 #include "ntqaccel.h"
-#include "ntqtoolbutton.h"
+#include "tqtoolbutton.h"
 #include "ntqcombobox.h"
-#include "ntqtooltip.h"
+#include "tqtooltip.h"
 #include "ntqwhatsthis.h"
-#include "ntqstatusbar.h"
+#include "tqstatusbar.h"
 #include "tqobjectlist.h"
 
 
 /*!
-    \class TQAction ntqaction.h
+    \class TQAction tqaction.h
     \brief The TQAction class provides an abstract user interface
     action that can appear both in menus and tool bars.
 
@@ -1374,7 +1374,7 @@ void TQActionGroupPrivate::update( const TQActionGroup* that )
 }
 
 /*!
-    \class TQActionGroup ntqaction.h
+    \class TQActionGroup tqaction.h
     \brief The TQActionGroup class groups actions together.
 
     \ingroup basic
diff --git a/src/widgets/ntqaction.h b/src/widgets/tqaction.h
index e4512934..e4512934 100644
--- a/src/widgets/ntqaction.h
+++ b/src/widgets/tqaction.h
diff --git a/src/widgets/tqiconview.cpp b/src/widgets/tqiconview.cpp
index 2a76b53d..b741563b 100644
--- a/src/widgets/tqiconview.cpp
+++ b/src/widgets/tqiconview.cpp
@@ -63,7 +63,7 @@
 #include "ntqmemarray.h"
 #include "tqptrlist.h"
 #include "ntqvbox.h"
-#include "ntqtooltip.h"
+#include "tqtooltip.h"
 #include "ntqbitmap.h"
 #include "ntqpixmapcache.h"
 #include "tqptrdict.h"
diff --git a/src/widgets/tqiconview.h b/src/widgets/tqiconview.h
index 4575afbb..18fafc3b 100644
--- a/src/widgets/tqiconview.h
+++ b/src/widgets/tqiconview.h
@@ -46,7 +46,7 @@
 #include "tqstring.h"
 #include "ntqrect.h"
 #include "ntqpoint.h"
-#include "ntqsize.h"
+#include "tqsize.h"
 #include "ntqfont.h" // TQString->TQFont conversion
 #include "ntqdragobject.h"
 #include "ntqbitmap.h"
diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/tqmainwindow.cpp
index 1f33829f..beeb3ab5 100644
--- a/src/widgets/qmainwindow.cpp
+++ b/src/widgets/tqmainwindow.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqmainwindow.h"
+#include "tqmainwindow.h"
 #ifndef TQT_NO_MAINWINDOW
 
 #include "tqtimer.h"
@@ -50,12 +50,12 @@
 #include "tqmap.h"
 #include "ntqcursor.h"
 #include "ntqpainter.h"
-#include "ntqmenubar.h"
-#include "ntqpopupmenu.h"
-#include "ntqtoolbar.h"
-#include "ntqstatusbar.h"
+#include "tqmenubar.h"
+#include "tqpopupmenu.h"
+#include "tqtoolbar.h"
+#include "tqstatusbar.h"
 #include "ntqscrollview.h"
-#include "ntqtooltip.h"
+#include "tqtooltip.h"
 #include "tqdatetime.h"
 #include "ntqwhatsthis.h"
 #include "ntqbitmap.h"
@@ -507,7 +507,7 @@ void TQHideToolTip::maybeTip( const TQPoint &pos )
 #endif
 
 /*!
-    \class TQMainWindow ntqmainwindow.h
+    \class TQMainWindow tqmainwindow.h
     \brief The TQMainWindow class provides a main application window,
     with a menu bar, dock windows (e.g. for toolbars), and a status
     bar.
@@ -784,7 +784,7 @@ void TQHideToolTip::maybeTip( const TQPoint &pos )
     TQMainWindow provides functionality specific to the standard dock
     areas it provides.
 
-    <img src=qmainwindow-m.png> <img src=qmainwindow-w.png>
+    <img src=tqmainwindow-m.png> <img src=tqmainwindow-w.png>
 
     \sa TQToolBar TQDockWindow TQStatusBar TQAction TQMenuBar TQPopupMenu TQToolTipGroup TQDialog
 */
@@ -2603,6 +2603,6 @@ TQTextStream &operator>>( TQTextStream &ts, TQMainWindow &mainWindow )
 }
 #endif
 
-#include "qmainwindow.moc"
+#include "tqmainwindow.moc"
 
 #endif
diff --git a/src/widgets/ntqmainwindow.h b/src/widgets/tqmainwindow.h
index 548bbae8..7a09f47a 100644
--- a/src/widgets/ntqmainwindow.h
+++ b/src/widgets/tqmainwindow.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqwidget.h"
-#include "ntqtoolbar.h"
+#include "tqtoolbar.h"
 #include "tqptrlist.h"
 #include "tqtextstream.h"
 #endif // QT_H
diff --git a/src/widgets/qmenubar.cpp b/src/widgets/tqmenubar.cpp
index 2a99c223..82734d68 100644
--- a/src/widgets/qmenubar.cpp
+++ b/src/widgets/tqmenubar.cpp
@@ -38,13 +38,13 @@
 **
 **********************************************************************/
 
-// ntqmainwindow.h before ntqmenubar.h because of GCC-2.7.* compatibility
+// tqmainwindow.h before tqmenubar.h because of GCC-2.7.* compatibility
 // ### could be reorganised by discarding INCLUDE_MENUITEM_DEF and put
 // the relevant declarations in a private header?
-#include "ntqmainwindow.h"
+#include "tqmainwindow.h"
 #ifndef TQT_NO_MENUBAR
-#include "ntqmenubar.h"
-#include "ntqpopupmenu.h"
+#include "tqmenubar.h"
+#include "tqpopupmenu.h"
 #include "ntqaccel.h"
 #include "ntqpainter.h"
 #include "ntqdrawutil.h"
@@ -60,7 +60,7 @@
 #endif
 
 class TQMenuDataData {
-    // attention: also defined in qmenudata.cpp
+    // attention: also defined in tqmenudata.cpp
 public:
     TQMenuDataData();
     TQGuardedPtr<TQWidget> aWidget;
@@ -76,7 +76,7 @@ extern int qt_xfocusout_grab_counter; // defined in qapplication_x11.cpp
 #endif
 
 /*!
-    \class TQMenuBar ntqmenubar.h
+    \class TQMenuBar tqmenubar.h
     \brief The TQMenuBar class provides a horizontal menu bar.
 
     \ingroup application
@@ -136,7 +136,7 @@ extern int qt_xfocusout_grab_counter; // defined in qapplication_x11.cpp
     disabled with \link TQMenuData::setItemEnabled()
     setItemEnabled()\endlink.
 
-    <img src=qmenubar-m.png> <img src=qmenubar-w.png>
+    <img src=tqmenubar-m.png> <img src=tqmenubar-w.png>
 
     \section1 TQMenuBar on TQt/Mac
 
diff --git a/src/widgets/ntqmenubar.h b/src/widgets/tqmenubar.h
index 01b5c184..24d42545 100644
--- a/src/widgets/ntqmenubar.h
+++ b/src/widgets/tqmenubar.h
@@ -42,9 +42,9 @@
 #define TQMENUBAR_H
 
 #ifndef QT_H
-#include "ntqpopupmenu.h" // ### remove or keep for users' convenience?
+#include "tqpopupmenu.h" // ### remove or keep for users' convenience?
 #include "ntqframe.h"
-#include "ntqmenudata.h"
+#include "tqmenudata.h"
 #endif // QT_H
 
 #ifndef TQT_NO_MENUBAR
diff --git a/src/widgets/qmenudata.cpp b/src/widgets/tqmenudata.cpp
index 720cba9e..c3e773e2 100644
--- a/src/widgets/qmenudata.cpp
+++ b/src/widgets/tqmenudata.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "ntqmenudata.h"
+#include "tqmenudata.h"
 #ifndef TQT_NO_MENUDATA
-#include "ntqpopupmenu.h"
-#include "ntqmenubar.h"
+#include "tqpopupmenu.h"
+#include "tqmenubar.h"
 #include "ntqapplication.h"
 #include "ntqguardedptr.h"
 
@@ -51,7 +51,7 @@ public:
 };
 
 class TQMenuDataData {
-    // attention: also defined in qmenubar.cpp and qpopupmenu.cpp
+    // attention: also defined in tqmenubar.cpp and tqpopupmenu.cpp
 public:
     TQMenuDataData();
     TQGuardedPtr<TQWidget> aWidget;
@@ -62,7 +62,7 @@ TQMenuDataData::TQMenuDataData()
 {}
 
 /*!
-    \class TQMenuData ntqmenudata.h
+    \class TQMenuData tqmenudata.h
     \brief The TQMenuData class is a base class for TQMenuBar and TQPopupMenu.
 
     \ingroup misc
@@ -1462,7 +1462,7 @@ TQString TQMenuData::whatsThis( int id ) const
 
 
 /*!
-    \class TQCustomMenuItem ntqmenudata.h
+    \class TQCustomMenuItem tqmenudata.h
     \brief The TQCustomMenuItem class is an abstract base class for custom menu items in popup menus.
 
     \ingroup misc
diff --git a/src/widgets/ntqmenudata.h b/src/widgets/tqmenudata.h
index 18fb739e..18fb739e 100644
--- a/src/widgets/ntqmenudata.h
+++ b/src/widgets/tqmenudata.h
diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/tqpopupmenu.cpp
index 6827f1b4..2da9a89d 100644
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/tqpopupmenu.cpp
@@ -38,9 +38,9 @@
 **
 **********************************************************************/
 
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 #ifndef TQT_NO_POPUPMENU
-#include "ntqmenubar.h"
+#include "tqmenubar.h"
 #include "ntqaccel.h"
 #include "ntqpainter.h"
 #include "ntqdrawutil.h"
@@ -129,7 +129,7 @@ static TQMenuItem* whatsThisItem = 0;
 #endif
 
 /*!
-    \class TQPopupMenu ntqpopupmenu.h
+    \class TQPopupMenu tqpopupmenu.h
     \brief The TQPopupMenu class provides a popup menu widget.
 
     \ingroup application
@@ -239,7 +239,7 @@ static TQMenuItem* whatsThisItem = 0;
  *****************************************************************************/
 
 class TQMenuDataData {
-    // attention: also defined in qmenudata.cpp
+    // attention: also defined in tqmenudata.cpp
 public:
     TQMenuDataData();
     TQGuardedPtr<TQWidget> aWidget;
diff --git a/src/widgets/ntqpopupmenu.h b/src/widgets/tqpopupmenu.h
index 5e1a396d..49c3f37e 100644
--- a/src/widgets/ntqpopupmenu.h
+++ b/src/widgets/tqpopupmenu.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "ntqframe.h"
-#include "ntqmenudata.h"
+#include "tqmenudata.h"
 #endif // QT_H
 
 #ifndef TQT_NO_POPUPMENU
diff --git a/src/widgets/qstatusbar.cpp b/src/widgets/tqstatusbar.cpp
index c7f357e3..d4193d93 100644
--- a/src/widgets/qstatusbar.cpp
+++ b/src/widgets/tqstatusbar.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqstatusbar.h"
+#include "tqstatusbar.h"
 #ifndef TQT_NO_STATUSBAR
 
 #include "tqptrlist.h"
@@ -47,10 +47,10 @@
 #include "tqtimer.h"
 #include "ntqdrawutil.h"
 #include "tqstyle.h"
-#include "ntqsizegrip.h"
+#include "tqsizegrip.h"
 
 /*!
-    \class TQStatusBar ntqstatusbar.h
+    \class TQStatusBar tqstatusbar.h
     \brief The TQStatusBar class provides a horizontal bar suitable for
     presenting status information.
 
@@ -101,7 +101,7 @@
     By default TQStatusBar provides a TQSizeGrip in the lower-right
     corner. You can disable it with setSizeGripEnabled(FALSE);
 
-    <img src=qstatusbar-m.png> <img src=qstatusbar-w.png>
+    <img src=tqstatusbar-m.png> <img src=tqstatusbar-w.png>
 
     \sa TQToolBar TQMainWindow TQLabel
     \link guibooks.html#fowler GUI Design Handbook: Status Bar.\endlink
diff --git a/src/widgets/ntqstatusbar.h b/src/widgets/tqstatusbar.h
index b4c84ea1..b4c84ea1 100644
--- a/src/widgets/ntqstatusbar.h
+++ b/src/widgets/tqstatusbar.h
diff --git a/src/widgets/tqtextedit.cpp b/src/widgets/tqtextedit.cpp
index 6d48be52..c3b0cb74 100644
--- a/src/widgets/tqtextedit.cpp
+++ b/src/widgets/tqtextedit.cpp
@@ -55,7 +55,7 @@
 #include "ntqfont.h"
 #include "ntqcolor.h"
 #include "tqstyle.h"
-#include "ntqsize.h"
+#include "tqsize.h"
 #include "ntqevent.h"
 #include "tqtimer.h"
 #include "ntqapplication.h"
@@ -70,7 +70,7 @@
 #include "ntqurl.h"
 #include "ntqcursor.h"
 #include "ntqregexp.h"
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 #include "tqptrstack.h"
 #include "ntqmetaobject.h"
 #include "tqtextbrowser.h"
diff --git a/src/widgets/qtoolbar.cpp b/src/widgets/tqtoolbar.cpp
index 20eba04d..819bc0e5 100644
--- a/src/widgets/qtoolbar.cpp
+++ b/src/widgets/tqtoolbar.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "ntqtoolbar.h"
+#include "tqtoolbar.h"
 #ifndef TQT_NO_TOOLBAR
 
-#include "ntqmainwindow.h"
-#include "ntqtooltip.h"
+#include "tqmainwindow.h"
+#include "tqtooltip.h"
 #include "ntqcursor.h"
 #include "ntqlayout.h"
 #include "ntqframe.h"
 #include "tqobjectlist.h"
 #include "ntqpainter.h"
 #include "ntqdrawutil.h"
-#include "ntqtoolbutton.h"
-#include "ntqpopupmenu.h"
+#include "tqtoolbutton.h"
+#include "tqpopupmenu.h"
 #include "ntqcombobox.h"
 #include "tqtimer.h"
 #include "tqwidgetlist.h"
@@ -207,11 +207,11 @@ void TQToolBarSeparator::paintEvent( TQPaintEvent * )
 			   colorGroup(), flags );
 }
 
-#include "qtoolbar.moc"
+#include "tqtoolbar.moc"
 
 
 /*!
-    \class TQToolBar ntqtoolbar.h
+    \class TQToolBar tqtoolbar.h
     \brief The TQToolBar class provides a movable panel containing
     widgets such as tool buttons.
 
diff --git a/src/widgets/ntqtoolbar.h b/src/widgets/tqtoolbar.h
index 5571d993..5571d993 100644
--- a/src/widgets/ntqtoolbar.h
+++ b/src/widgets/tqtoolbar.h
diff --git a/src/widgets/qtoolbox.cpp b/src/widgets/tqtoolbox.cpp
index c366dfbc..f67486a4 100644
--- a/src/widgets/qtoolbox.cpp
+++ b/src/widgets/tqtoolbox.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqtoolbox.h"
+#include "tqtoolbox.h"
 
 #ifndef TQT_NO_TOOLBOX
 
@@ -52,7 +52,7 @@
 #include <tqwidgetlist.h>
 #include <ntqlayout.h>
 #include <tqvaluelist.h>
-#include <ntqtooltip.h>
+#include <tqtooltip.h>
 #include <ntqeventloop.h>
 #include <tqdatetime.h>
 
diff --git a/src/widgets/ntqtoolbox.h b/src/widgets/tqtoolbox.h
index c5559fc8..c5559fc8 100644
--- a/src/widgets/ntqtoolbox.h
+++ b/src/widgets/tqtoolbox.h
diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/tqtoolbutton.cpp
index bfaaf47f..222c608a 100644
--- a/src/widgets/qtoolbutton.cpp
+++ b/src/widgets/tqtoolbutton.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqtoolbutton.h"
+#include "tqtoolbutton.h"
 #ifndef TQT_NO_TOOLBUTTON
 
 #include "ntqdrawutil.h"
@@ -47,13 +47,13 @@
 #include "ntqwmatrix.h"
 #include "ntqapplication.h"
 #include "tqstyle.h"
-#include "ntqmainwindow.h"
-#include "ntqtooltip.h"
-#include "ntqtoolbar.h"
+#include "tqmainwindow.h"
+#include "tqtooltip.h"
+#include "tqtoolbar.h"
 #include "tqimage.h"
 #include "tqiconset.h"
 #include "tqtimer.h"
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 #include "ntqguardedptr.h"
 
 class TQToolButtonPrivate
@@ -75,7 +75,7 @@ public:
 
 
 /*!
-    \class TQToolButton ntqtoolbutton.h
+    \class TQToolButton tqtoolbutton.h
     \brief The TQToolButton class provides a quick-access button to
     commands or options, usually used inside a TQToolBar.
 
diff --git a/src/widgets/ntqtoolbutton.h b/src/widgets/tqtoolbutton.h
index 98211e25..98211e25 100644
--- a/src/widgets/ntqtoolbutton.h
+++ b/src/widgets/tqtoolbutton.h
diff --git a/src/widgets/qtooltip.cpp b/src/widgets/tqtooltip.cpp
index c897c4a5..6a048f5e 100644
--- a/src/widgets/qtooltip.cpp
+++ b/src/widgets/tqtooltip.cpp
@@ -36,7 +36,7 @@
 **
 **********************************************************************/
 
-#include "ntqtooltip.h"
+#include "tqtooltip.h"
 #ifndef TQT_NO_TOOLTIP
 #include "ntqlabel.h"
 #include "tqptrdict.h"
@@ -650,7 +650,7 @@ void TQTipManager::setWakeUpDelay ( int i )
 }
 
 /*!
-    \class TQToolTip ntqtooltip.h
+    \class TQToolTip tqtooltip.h
     \brief The TQToolTip class provides tool tips (balloon help) for
     any widget or rectangular part of a widget.
 
@@ -1107,7 +1107,7 @@ void TQToolTip::clear()
 
 
 /*!
-    \class TQToolTipGroup ntqtooltip.h
+    \class TQToolTipGroup tqtooltip.h
     \brief The TQToolTipGroup class collects tool tips into related groups.
 
     \ingroup helpsystem
@@ -1271,5 +1271,5 @@ void TQToolTip::setWakeUpDelay ( int i )
 }
 
 
-#include "qtooltip.moc"
+#include "tqtooltip.moc"
 #endif
diff --git a/src/widgets/ntqtooltip.h b/src/widgets/tqtooltip.h
index 3058ed0e..3058ed0e 100644
--- a/src/widgets/ntqtooltip.h
+++ b/src/widgets/tqtooltip.h
diff --git a/src/widgets/tqwidgetresizehandler.cpp b/src/widgets/tqwidgetresizehandler.cpp
index 0f75eb79..eb391961 100644
--- a/src/widgets/tqwidgetresizehandler.cpp
+++ b/src/widgets/tqwidgetresizehandler.cpp
@@ -44,7 +44,7 @@
 #include "ntqframe.h"
 #include "ntqapplication.h"
 #include "ntqcursor.h"
-#include "ntqsizegrip.h"
+#include "tqsizegrip.h"
 #if defined(TQ_WS_WIN)
 #include "qt_windows.h"
 #endif
diff --git a/src/workspace/qt_workspace.pri b/src/workspace/qt_workspace.pri
deleted file mode 100644
index 660d96ec..00000000
--- a/src/workspace/qt_workspace.pri
+++ /dev/null
@@ -1,6 +0,0 @@
-# TQt workspace module
-
-workspace {
-	HEADERS += $$WORKSPACE_H/ntqworkspace.h
-	SOURCES += $$WORKSPACE_CPP/qworkspace.cpp
-}
diff --git a/src/workspace/tqt_workspace.pri b/src/workspace/tqt_workspace.pri
new file mode 100644
index 00000000..9e9b6f2b
--- /dev/null
+++ b/src/workspace/tqt_workspace.pri
@@ -0,0 +1,6 @@
+# TQt workspace module
+
+workspace {
+	HEADERS += $$WORKSPACE_H/tqworkspace.h
+	SOURCES += $$WORKSPACE_CPP/tqworkspace.cpp
+}
diff --git a/src/workspace/qworkspace.cpp b/src/workspace/tqworkspace.cpp
index d267177c..06d4da4f 100644
--- a/src/workspace/qworkspace.cpp
+++ b/src/workspace/tqworkspace.cpp
@@ -38,25 +38,25 @@
 **
 **********************************************************************/
 
-#include "ntqworkspace.h"
+#include "tqworkspace.h"
 #ifndef TQT_NO_WORKSPACE
 #include "ntqapplication.h"
 #include "../widgets/qtitlebar_p.h"
 #include "tqobjectlist.h"
 #include "ntqlayout.h"
-#include "ntqtoolbutton.h"
+#include "tqtoolbutton.h"
 #include "ntqlabel.h"
 #include "ntqvbox.h"
 #include "ntqaccel.h"
 #include "ntqcursor.h"
-#include "ntqpopupmenu.h"
-#include "ntqmenubar.h"
+#include "tqpopupmenu.h"
+#include "tqmenubar.h"
 #include "ntqguardedptr.h"
 #include "tqiconset.h"
 #include "../widgets/tqwidgetresizehandler_p.h"
 #include "ntqfocusdata.h"
 #include "tqdatetime.h"
-#include "ntqtooltip.h"
+#include "tqtooltip.h"
 #include "ntqwmatrix.h"
 #include "tqimage.h"
 #include "ntqscrollbar.h"
@@ -66,16 +66,16 @@
 // magic non-mdi things
 #include "tqtimer.h"
 #include "ntqdockarea.h"
-#include "ntqstatusbar.h"
-#include "ntqmainwindow.h"
+#include "tqstatusbar.h"
+#include "tqmainwindow.h"
 #include "ntqdockwindow.h"
-#include "ntqtoolbar.h"
+#include "tqtoolbar.h"
 
 #define BUTTON_WIDTH	16
 #define BUTTON_HEIGHT	14
 
 /*!
-    \class TQWorkspace ntqworkspace.h
+    \class TQWorkspace tqworkspace.h
     \brief The TQWorkspace widget provides a workspace window that can
     contain decorated windows, e.g. for MDI.
 
@@ -3022,5 +3022,5 @@ void TQWorkspace::styleChange( TQStyle &olds )
 
 
 
-#include "qworkspace.moc"
+#include "tqworkspace.moc"
 #endif // TQT_NO_WORKSPACE
diff --git a/src/workspace/ntqworkspace.h b/src/workspace/tqworkspace.h
index 71227476..71227476 100644
--- a/src/workspace/ntqworkspace.h
+++ b/src/workspace/tqworkspace.h