Rename main window nt* related files to equivalent tq*. The file

"ntqsession.h" was totally unnecessary and has been removed.

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

84 files changed, 213 insertions, 213 deletions

diff --git a/examples/README b/examples/README
index c8907e72..23d82162 100644
--- a/examples/README
+++ b/examples/README
@@ -19,9 +19,9 @@ action
     A single document interface application example with a menu bar,
     tool bar and status bar that provides simple text editing.
     It shows how to implement a typical modern application, how to
-    create a QMainWindow subclass, and how to create actions that can
-    be assigned to menus (QPopupMenu) and toolbars (QToolBar) using
-    QAction. It also shows how to print using QSimpleRichText.
+    create a TQMainWindow subclass, and how to create actions that can
+    be assigned to menus (TQPopupMenu) and toolbars (TQToolBar) using
+    TQAction. It also shows how to print using QSimpleRichText.
 
 addressbook [obsolete]
 
@@ -35,7 +35,7 @@ buttongroups
     This examples shows different types of group boxes (QButtonGroup,
     and QGroupBox), and different kinds of buttons (QCheckBox,
     QRadioButton, and QPushButton). It also shows how to add a
-    QPopupMenu to a button.
+    TQPopupMenu to a button.
 
 canvas
     This examples demonstrates many of TQCanvasView's facilities, but
@@ -113,8 +113,8 @@ fileiconview
     a widget derived from TQIconView to display the current directory.
     It uses the DirectoryView widget from the dirview example to
     display the directory tree.
-    It also shows how to add a QComboBox to a QToolBar and how to
-    implement a context menu using QPopupMenu.
+    It also shows how to add a QComboBox to a TQToolBar and how to
+    implement a context menu using TQPopupMenu.
 
 fonts [obsolete; see the qfd example instead]
 
@@ -136,7 +136,7 @@ helpdemo
 
 helpsystem
     This example shows how to implement context-sensitive help in
-    various ways in a TQt application using QToolTip, QWhatsThis, and
+    various ways in a TQt application using TQToolTip, QWhatsThis, and
     QAssistantClient to control TQt Assistant.
 
 helpviewer
@@ -182,8 +182,8 @@ listviews
 
 mdi
     Similar to the action example, but this time using MDI (Multiple
-    Document Interface). It subclasses QMainWindow and uses the
-    QWorkspace class to provide MDI and shows how to implement an MDI
+    Document Interface). It subclasses TQMainWindow and uses the
+    TQWorkspace class to provide MDI and shows how to implement an MDI
     Window menu.
 
 menu
@@ -299,8 +299,8 @@ scribble
     with different pen colors and widths and save the result as a
     pixmap in various formats. It shows how to do drawing using a
     TQWidget subclass (rather than a TQCanvas for example). It also
-    shows how to add a QSpinBox to a QToolBar and how to implement a
-    button that pops up a menu (using QPushButton and QPopupMenu), and
+    shows how to add a QSpinBox to a TQToolBar and how to implement a
+    button that pops up a menu (using QPushButton and TQPopupMenu), and
     also how to use the QColorDialog.
 
 scrollview
@@ -373,7 +373,7 @@ tictac
 
 tooltip
     This example widget demonstrates how to use tool tips for static
-    and dynamic regions within a widget using a QToolTip subclass.
+    and dynamic regions within a widget using a TQToolTip subclass.
 
 toplevel
     This program allows you to set all the flags for a widget and then
diff --git a/examples/action/application.cpp b/examples/action/application.cpp
index 25822a3c..9bd995da 100644
--- a/examples/action/application.cpp
+++ b/examples/action/application.cpp
@@ -11,14 +11,14 @@
 
 #include <tqimage.h>
 #include <ntqpixmap.h>
-#include <ntqtoolbar.h>
-#include <ntqtoolbutton.h>
-#include <ntqpopupmenu.h>
-#include <ntqmenubar.h>
+#include <tqtoolbar.h>
+#include <tqtoolbutton.h>
+#include <tqpopupmenu.h>
+#include <tqmenubar.h>
 #include <tqtextedit.h>
 #include <ntqfile.h>
 #include <ntqfiledialog.h>
-#include <ntqstatusbar.h>
+#include <tqstatusbar.h>
 #include <ntqmessagebox.h>
 #include <ntqprinter.h>
 #include <ntqapplication.h>
@@ -27,7 +27,7 @@
 #include <ntqpainter.h>
 #include <ntqpaintdevicemetrics.h>
 #include <ntqwhatsthis.h>
-#include <ntqaction.h>
+#include <tqaction.h>
 #include <ntqsimplerichtext.h>
 
 #include "filesave.xpm"
diff --git a/examples/action/application.doc b/examples/action/application.doc
index f4eaaae4..8368a3d3 100644
--- a/examples/action/application.doc
+++ b/examples/action/application.doc
@@ -1,20 +1,20 @@
 /*
 */
      
-/*! \page qaction-application-example.html
+/*! \page tqaction-application-example.html
 
-  \ingroup qaction-examples
+  \ingroup tqaction-examples
 
 
   \title A Complete Application Window with Actions
 
-  The QAction class provides a way of associating user input from different
+  The TQAction class provides a way of associating user input from different
   user interface elements with abstract high level actions. This approach makes
   it easy to customize applications for different types of users.
 
   This example program is just like the
   <a href="simple-application-example.html">application example</a>,
-  but uses QAction to build the menu and the toolbar.
+  but uses TQAction to build the menu and the toolbar.
 
   <hr>
 
diff --git a/examples/action/application.h b/examples/action/application.h
index b3e864ea..0a3cf9ad 100644
--- a/examples/action/application.h
+++ b/examples/action/application.h
@@ -10,7 +10,7 @@
 #ifndef APPLICATION_H
 #define APPLICATION_H
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 
 class TQTextEdit;
 
diff --git a/examples/action/toggleaction/toggleaction.cpp b/examples/action/toggleaction/toggleaction.cpp
index 5da1a685..79c838d6 100644
--- a/examples/action/toggleaction/toggleaction.cpp
+++ b/examples/action/toggleaction/toggleaction.cpp
@@ -1,7 +1,7 @@
 #include <ntqapplication.h>
-#include <ntqmainwindow.h>
-#include <ntqtoolbar.h>
-#include <ntqaction.h>
+#include <tqmainwindow.h>
+#include <tqtoolbar.h>
+#include <tqaction.h>
 
 #include "labelonoff.xpm"
 
diff --git a/examples/action/toggleaction/toggleaction.doc b/examples/action/toggleaction/toggleaction.doc
index 7924a263..c4e4a368 100644
--- a/examples/action/toggleaction/toggleaction.doc
+++ b/examples/action/toggleaction/toggleaction.doc
@@ -1,10 +1,10 @@
 /*! \page toggleaction-example.html
 
-  \ingroup qaction-examples
+  \ingroup tqaction-examples
  
   \title A Tiny Example Featuring a Toggle Action
  
-  This example program demonstrates the use of QAction
+  This example program demonstrates the use of TQAction
   in its incarnation as a toggle action.
 
   <hr>
diff --git a/examples/addressbook/mainwindow.cpp b/examples/addressbook/mainwindow.cpp
index 09176d31..ab4305e3 100644
--- a/examples/addressbook/mainwindow.cpp
+++ b/examples/addressbook/mainwindow.cpp
@@ -10,11 +10,11 @@
 #include "mainwindow.h"
 #include "centralwidget.h"
 
-#include <ntqtoolbar.h>
-#include <ntqtoolbutton.h>
-#include <ntqpopupmenu.h>
-#include <ntqmenubar.h>
-#include <ntqstatusbar.h>
+#include <tqtoolbar.h>
+#include <tqtoolbutton.h>
+#include <tqpopupmenu.h>
+#include <tqmenubar.h>
+#include <tqstatusbar.h>
 #include <ntqapplication.h>
 #include <ntqfiledialog.h>
 
diff --git a/examples/addressbook/mainwindow.h b/examples/addressbook/mainwindow.h
index ac498b94..cb807630 100644
--- a/examples/addressbook/mainwindow.h
+++ b/examples/addressbook/mainwindow.h
@@ -10,7 +10,7 @@
 #ifndef AB_MAINWINDOW_H
 #define AB_MAINWINDOW_H
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 #include <tqstring.h>
 
 class TQToolBar;
diff --git a/examples/application/application.cpp b/examples/application/application.cpp
index e92bdddb..0e1a3f60 100644
--- a/examples/application/application.cpp
+++ b/examples/application/application.cpp
@@ -11,14 +11,14 @@
 
 #include <tqimage.h>
 #include <ntqpixmap.h>
-#include <ntqtoolbar.h>
-#include <ntqtoolbutton.h>
-#include <ntqpopupmenu.h>
-#include <ntqmenubar.h>
+#include <tqtoolbar.h>
+#include <tqtoolbutton.h>
+#include <tqpopupmenu.h>
+#include <tqmenubar.h>
 #include <tqtextedit.h>
 #include <ntqfile.h>
 #include <ntqfiledialog.h>
-#include <ntqstatusbar.h>
+#include <tqstatusbar.h>
 #include <ntqmessagebox.h>
 #include <ntqprinter.h>
 #include <ntqapplication.h>
diff --git a/examples/application/application.h b/examples/application/application.h
index b3e864ea..0a3cf9ad 100644
--- a/examples/application/application.h
+++ b/examples/application/application.h
@@ -10,7 +10,7 @@
 #ifndef APPLICATION_H
 #define APPLICATION_H
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 
 class TQTextEdit;
 
diff --git a/examples/buttongroups/buttongroups.cpp b/examples/buttongroups/buttongroups.cpp
index 2ae71486..4af70a84 100644
--- a/examples/buttongroups/buttongroups.cpp
+++ b/examples/buttongroups/buttongroups.cpp
@@ -9,7 +9,7 @@
 
 #include "buttongroups.h"
 
-#include <ntqpopupmenu.h>
+#include <tqpopupmenu.h>
 #include <ntqbuttongroup.h>
 #include <ntqlayout.h>
 #include <ntqradiobutton.h>
diff --git a/examples/canvas/canvas.cpp b/examples/canvas/canvas.cpp
index ccb94dac..75ef7a56 100644
--- a/examples/canvas/canvas.cpp
+++ b/examples/canvas/canvas.cpp
@@ -1,8 +1,8 @@
 #include <tqdatetime.h>
-#include <ntqmainwindow.h>
-#include <ntqstatusbar.h>
+#include <tqmainwindow.h>
+#include <tqstatusbar.h>
 #include <ntqmessagebox.h>
-#include <ntqmenubar.h>
+#include <tqmenubar.h>
 #include <ntqapplication.h>
 #include <ntqpainter.h>
 #include <ntqprinter.h>
diff --git a/examples/canvas/canvas.h b/examples/canvas/canvas.h
index 60ff9da2..b695bfdc 100644
--- a/examples/canvas/canvas.h
+++ b/examples/canvas/canvas.h
@@ -1,8 +1,8 @@
 #ifndef EXAMPLE_H
 #define EXAMPLE_H
 
-#include <ntqpopupmenu.h>
-#include <ntqmainwindow.h>
+#include <tqpopupmenu.h>
+#include <tqmainwindow.h>
 #include <ntqintdict.h>
 #include <tqcanvas.h>
 
diff --git a/examples/canvas/main.cpp b/examples/canvas/main.cpp
index 45b7a050..24b1b250 100644
--- a/examples/canvas/main.cpp
+++ b/examples/canvas/main.cpp
@@ -1,6 +1,6 @@
-#include <ntqstatusbar.h>
+#include <tqstatusbar.h>
 #include <ntqmessagebox.h>
-#include <ntqmenubar.h>
+#include <tqmenubar.h>
 #include <ntqapplication.h>
 #include <tqimage.h>
 
diff --git a/examples/chart/canvasview.cpp b/examples/chart/canvasview.cpp
index 7fe852de..6640a19a 100644
--- a/examples/chart/canvasview.cpp
+++ b/examples/chart/canvasview.cpp
@@ -3,8 +3,8 @@
 
 #include <ntqcursor.h>
 #include <ntqpoint.h>
-#include <ntqpopupmenu.h>
-#include <ntqstatusbar.h>
+#include <tqpopupmenu.h>
+#include <tqstatusbar.h>
 
 
 void CanvasView::contentsContextMenuEvent( TQContextMenuEvent * )
diff --git a/examples/chart/chartform.cpp b/examples/chart/chartform.cpp
index 48300375..86421be2 100644
--- a/examples/chart/chartform.cpp
+++ b/examples/chart/chartform.cpp
@@ -3,24 +3,24 @@
 #include "optionsform.h"
 #include "setdataform.h"
 
-#include <ntqaction.h>
+#include <tqaction.h>
 #include <ntqapplication.h>
 #include <ntqcombobox.h>
 #include <ntqfile.h>
 #include <ntqfiledialog.h>
 #include <ntqfont.h>
 #include <ntqfontdialog.h>
-#include <ntqmenubar.h>
+#include <tqmenubar.h>
 #include <ntqmessagebox.h>
 #include <ntqpixmap.h>
-#include <ntqpopupmenu.h>
+#include <tqpopupmenu.h>
 #include <ntqprinter.h>
 #include <ntqradiobutton.h>
 #include <ntqsettings.h>
 #include <ntqspinbox.h>
-#include <ntqstatusbar.h>
-#include <ntqtoolbar.h>
-#include <ntqtoolbutton.h>
+#include <tqstatusbar.h>
+#include <tqtoolbar.h>
+#include <tqtoolbutton.h>
 
 #include "images/file_new.xpm"
 #include "images/file_open.xpm"
diff --git a/examples/chart/chartform.h b/examples/chart/chartform.h
index e3b5422c..dde411bd 100644
--- a/examples/chart/chartform.h
+++ b/examples/chart/chartform.h
@@ -3,7 +3,7 @@
 
 #include "element.h"
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 #include <tqstringlist.h>
 
 
diff --git a/examples/chart/chartform_files.cpp b/examples/chart/chartform_files.cpp
index b9a5c4f1..27f18e78 100644
--- a/examples/chart/chartform_files.cpp
+++ b/examples/chart/chartform_files.cpp
@@ -5,7 +5,7 @@
 #include <ntqfiledialog.h>
 #include <ntqpainter.h>
 #include <ntqprinter.h>
-#include <ntqstatusbar.h>
+#include <tqstatusbar.h>
 
 
 void ChartForm::load( const TQString& filename )
diff --git a/examples/demo/frame.cpp b/examples/demo/frame.cpp
index c45f3a59..c291c4b9 100644
--- a/examples/demo/frame.cpp
+++ b/examples/demo/frame.cpp
@@ -10,21 +10,21 @@
 #include "frame.h"
 
 #include <ntqapplication.h>
-#include <ntqpopupmenu.h>
-#include <ntqmenubar.h>
+#include <tqpopupmenu.h>
+#include <tqmenubar.h>
 #include <ntqaccel.h>
-#include <ntqtoolbox.h>
+#include <tqtoolbox.h>
 #include <ntqpainter.h>
 #include <tqwidgetstack.h>
 #include <tqstylefactory.h>
-#include <ntqaction.h>
+#include <tqaction.h>
 #include <ntqsignalmapper.h>
 #include <ntqdict.h>
 #include <ntqdir.h>
 #include <tqtextcodec.h>
 #include <stdlib.h>
 #include <ntqbuttongroup.h>
-#include <ntqtoolbutton.h>
+#include <tqtoolbutton.h>
 
 static TQTranslator *translator = 0;
 static TQTranslator *qt_translator = 0;
diff --git a/examples/demo/frame.h b/examples/demo/frame.h
index 6a2ede5c..6dd9c1ae 100644
--- a/examples/demo/frame.h
+++ b/examples/demo/frame.h
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 #include <ntqintdict.h>
 #include "categoryinterface.h"
 
diff --git a/examples/demo/i18n/i18n.cpp b/examples/demo/i18n/i18n.cpp
index 6c4d8be5..a089e6cc 100644
--- a/examples/demo/i18n/i18n.cpp
+++ b/examples/demo/i18n/i18n.cpp
@@ -2,14 +2,14 @@
 #include "wrapper.h"
 #include "../textdrawing/textedit.h"
 
-#include <ntqaction.h>
+#include <tqaction.h>
 #include <ntqlayout.h>
 #include <ntqvbox.h>
-#include <ntqworkspace.h>
-#include <ntqpopupmenu.h>
-#include <ntqmenubar.h>
-#include <ntqtoolbar.h>
-#include <ntqtoolbutton.h>
+#include <tqworkspace.h>
+#include <tqpopupmenu.h>
+#include <tqmenubar.h>
+#include <tqtoolbar.h>
+#include <tqtoolbutton.h>
 #include <ntqpixmap.h>
 #include <tqiconset.h>
 #include <ntqapplication.h>
diff --git a/examples/demo/i18n/i18n.h b/examples/demo/i18n/i18n.h
index b716fc04..da325f62 100644
--- a/examples/demo/i18n/i18n.h
+++ b/examples/demo/i18n/i18n.h
@@ -1,7 +1,7 @@
 #ifndef I18N_H
 #define I18N_H
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 
 class TQWorkspace;
 class TQAction;
diff --git a/examples/demo/main.cpp b/examples/demo/main.cpp
index 275dc27b..e02a375d 100644
--- a/examples/demo/main.cpp
+++ b/examples/demo/main.cpp
@@ -42,7 +42,7 @@
 
 #include <ntqtabwidget.h>
 #include <ntqfont.h>
-#include <ntqworkspace.h>
+#include <tqworkspace.h>
 #include <tqwidgetstack.h>
 
 #if defined(TQT_MODULE_SQL)
diff --git a/examples/demo/opengl/glworkspace.cpp b/examples/demo/opengl/glworkspace.cpp
index ef90a03a..80d37b46 100644
--- a/examples/demo/opengl/glworkspace.cpp
+++ b/examples/demo/opengl/glworkspace.cpp
@@ -3,12 +3,12 @@
 #include "glgear.h"
 #include "gltexobj.h"
 
-#include <ntqworkspace.h>
+#include <tqworkspace.h>
 #include <ntqdialog.h>
-#include <ntqtoolbar.h>
-#include <ntqpopupmenu.h>
-#include <ntqmenubar.h>
-#include <ntqaction.h>
+#include <tqtoolbar.h>
+#include <tqpopupmenu.h>
+#include <tqmenubar.h>
+#include <tqaction.h>
 #include <ntqprinter.h>
 #include <ntqpainter.h>
 #include <ntqcheckbox.h>
diff --git a/examples/demo/opengl/glworkspace.h b/examples/demo/opengl/glworkspace.h
index 6ad1ecb5..d83f2b60 100644
--- a/examples/demo/opengl/glworkspace.h
+++ b/examples/demo/opengl/glworkspace.h
@@ -1,7 +1,7 @@
 #ifndef GLWORKSPACE_H
 #define GLWORKSPACE_H
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 
 class TQWorkspace;
 class TQPrinter;
diff --git a/examples/demo/qasteroids/toplevel.h b/examples/demo/qasteroids/toplevel.h
index 87af4c8b..6209c5f8 100644
--- a/examples/demo/qasteroids/toplevel.h
+++ b/examples/demo/qasteroids/toplevel.h
@@ -7,7 +7,7 @@
 #ifndef __KAST_TOPLEVEL_H__
 #define __KAST_TOPLEVEL_H__
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 #include <ntqdict.h>
 #include <tqmap.h>
 
diff --git a/examples/demo/textdrawing/example.html b/examples/demo/textdrawing/example.html
index dd62518b..639b7470 100644
--- a/examples/demo/textdrawing/example.html
+++ b/examples/demo/textdrawing/example.html
@@ -168,7 +168,7 @@ available space.
 <h3 class="fn">int <a name="e3c907"></a>TQLabel::indent () const</h3>
 <p>Returns the indent of the label.
 <p>See also  <a href="#ed9b8b">setIndent</a>().
-<h3 class="fn"><a href="ntqsize.html">TQSize</a> <a name="53c8c7"></a>TQLabel::minimumSizeHint () const <code>[virtual]</code></h3>
+<h3 class="fn"><a href="tqsize.html">TQSize</a> <a name="53c8c7"></a>TQLabel::minimumSizeHint () const <code>[virtual]</code></h3>
 <p>Reimplemented for internal reasons; the API is not affected.
 <p>Reimplemented from <a href="tqwidget.html#3f0fc2">TQWidget.</a>
 <h3 class="fn"><a href="ntqmovie.html">TQMovie</a>* <a name="7dcdfe"></a>TQLabel::movie () const</h3>
@@ -308,12 +308,12 @@ less on resize and can also provide a scrollbar if necessary.
 an explanation of the possible options.
 <p>The default format is <code>AutoText.</code>
 <p>See also  <a href="#0b92ed">textFormat</a>() and <a href="#dffb43">setText</a>().
-<h3 class="fn"><a href="ntqsize.html">TQSize</a> <a name="614dd5"></a>TQLabel::sizeHint () const <code>[virtual]</code></h3>
+<h3 class="fn"><a href="tqsize.html">TQSize</a> <a name="614dd5"></a>TQLabel::sizeHint () const <code>[virtual]</code></h3>
 <p>Reimplemented for internal reasons; the API is not affected.
 <p>Examples:
  <a href="layout-layout-cpp.html#sizeHint">layout/layout.cpp</a>
 <p>Reimplemented from <a href="tqwidget.html#290bcd">TQWidget.</a>
-<h3 class="fn"><a href="ntqsizepolicy.html">TQSizePolicy</a> <a name="26e1d9"></a>TQLabel::sizePolicy () const <code>[virtual]</code></h3>
+<h3 class="fn"><a href="tqsizepolicy.html">TQSizePolicy</a> <a name="26e1d9"></a>TQLabel::sizePolicy () const <code>[virtual]</code></h3>
 <p>Reimplemented for internal reasons; the API is not affected.
 <p>Reimplemented from <a href="tqwidget.html#2d5d13">TQWidget.</a>
 <h3 class="fn"><a href="tqstring.html">TQString</a> <a name="72cf09"></a>TQLabel::text () const</h3>
diff --git a/examples/demo/textdrawing/helpwindow.cpp b/examples/demo/textdrawing/helpwindow.cpp
index 3795d5cb..79821ec1 100644
--- a/examples/demo/textdrawing/helpwindow.cpp
+++ b/examples/demo/textdrawing/helpwindow.cpp
@@ -8,12 +8,12 @@
 *****************************************************************************/
 
 #include "helpwindow.h"
-#include <ntqstatusbar.h>
+#include <tqstatusbar.h>
 #include <ntqpixmap.h>
-#include <ntqpopupmenu.h>
-#include <ntqmenubar.h>
-#include <ntqtoolbar.h>
-#include <ntqtoolbutton.h>
+#include <tqpopupmenu.h>
+#include <tqmenubar.h>
+#include <tqtoolbar.h>
+#include <tqtoolbutton.h>
 #include <tqiconset.h>
 #include <ntqfile.h>
 #include <tqtextstream.h>
diff --git a/examples/demo/textdrawing/helpwindow.h b/examples/demo/textdrawing/helpwindow.h
index 998cc17a..e07fb95e 100644
--- a/examples/demo/textdrawing/helpwindow.h
+++ b/examples/demo/textdrawing/helpwindow.h
@@ -10,7 +10,7 @@
 #ifndef HELPWINDOW_H
 #define HELPWINDOW_H
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 #include <tqtextbrowser.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
diff --git a/examples/demo/textdrawing/textedit.cpp b/examples/demo/textdrawing/textedit.cpp
index b287fad4..56f2e45e 100644
--- a/examples/demo/textdrawing/textedit.cpp
+++ b/examples/demo/textdrawing/textedit.cpp
@@ -10,10 +10,10 @@
 #include "textedit.h"
 
 #include <tqtextedit.h>
-#include <ntqaction.h>
-#include <ntqmenubar.h>
-#include <ntqpopupmenu.h>
-#include <ntqtoolbar.h>
+#include <tqaction.h>
+#include <tqmenubar.h>
+#include <tqpopupmenu.h>
+#include <tqtoolbar.h>
 #include <ntqtabwidget.h>
 #include <ntqapplication.h>
 #include <ntqfontdatabase.h>
diff --git a/examples/demo/textdrawing/textedit.h b/examples/demo/textdrawing/textedit.h
index eef95c32..ef03f0a0 100644
--- a/examples/demo/textdrawing/textedit.h
+++ b/examples/demo/textdrawing/textedit.h
@@ -10,7 +10,7 @@
 #ifndef TEXTEDIT_H
 #define TEXTEDIT_H
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 #include <tqmap.h>
 
 class TQAction;
diff --git a/examples/fileiconview/mainwindow.cpp b/examples/fileiconview/mainwindow.cpp
index d2d6f2ed..032e95ab 100644
--- a/examples/fileiconview/mainwindow.cpp
+++ b/examples/fileiconview/mainwindow.cpp
@@ -14,11 +14,11 @@
 #include <ntqsplitter.h>
 #include <ntqprogressbar.h>
 #include <ntqlabel.h>
-#include <ntqstatusbar.h>
-#include <ntqtoolbar.h>
+#include <tqstatusbar.h>
+#include <tqtoolbar.h>
 #include <ntqcombobox.h>
 #include <ntqpixmap.h>
-#include <ntqtoolbutton.h>
+#include <tqtoolbutton.h>
 #include <ntqdir.h>
 #include <ntqfileinfo.h>
 
diff --git a/examples/fileiconview/mainwindow.h b/examples/fileiconview/mainwindow.h
index 38feec78..db6b09db 100644
--- a/examples/fileiconview/mainwindow.h
+++ b/examples/fileiconview/mainwindow.h
@@ -10,7 +10,7 @@
 #ifndef MAINWIN_H
 #define MAINWIN_H
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 
 class TQtFileIconView;
 class DirectoryView;
diff --git a/examples/fileiconview/qfileiconview.cpp b/examples/fileiconview/qfileiconview.cpp
index e87e465a..5a800ff5 100644
--- a/examples/fileiconview/qfileiconview.cpp
+++ b/examples/fileiconview/qfileiconview.cpp
@@ -16,7 +16,7 @@
 #include <ntqdragobject.h>
 #include <ntqmessagebox.h>
 #include <ntqevent.h>
-#include <ntqpopupmenu.h>
+#include <tqpopupmenu.h>
 #include <ntqcursor.h>
 #include <ntqapplication.h>
 #include <ntqwmatrix.h>
diff --git a/examples/helpdemo/helpdemo.cpp b/examples/helpdemo/helpdemo.cpp
index 88ed7cb9..4a3cd1ab 100644
--- a/examples/helpdemo/helpdemo.cpp
+++ b/examples/helpdemo/helpdemo.cpp
@@ -1,8 +1,8 @@
 #include <ntqassistantclient.h>
 #include <ntqmessagebox.h>
 #include <ntqlineedit.h>
-#include <ntqaction.h>
-#include <ntqpopupmenu.h>
+#include <tqaction.h>
+#include <tqpopupmenu.h>
 #include <ntqcheckbox.h>
 #include <ntqprocess.h>
 #include <ntqpushbutton.h>
diff --git a/examples/helpsystem/helpsystem.doc b/examples/helpsystem/helpsystem.doc
index 80e96c7c..89107b08 100644
--- a/examples/helpsystem/helpsystem.doc
+++ b/examples/helpsystem/helpsystem.doc
@@ -8,26 +8,26 @@
   that can be used to provide context sensitive help
   in an application.
 
-  It uses QToolTip and QWhatsThis to provide both static and 
+  It uses TQToolTip and QWhatsThis to provide both static and 
   dynamic balloon help for the widgets in the application, and 
-  QToolTipGroup to display extended information for each tooltip
+  TQToolTipGroup to display extended information for each tooltip
   in the statusbar. QAssistantClient is used to display help 
   pages using TQt Assistant. 
 
   The application has a user interface based on a 
-  QMainWindow with a menubar, statusbar and a toolbar, and uses 
+  TQMainWindow with a menubar, statusbar and a toolbar, and uses 
   a QTable as the central widget.
   \quotefile helpsystem/tooltip.h
-  \skipto : public QToolTip
+  \skipto : public TQToolTip
   \printuntil };
 
-  Two QToolTip subclasses implement dynamic tooltips for
+  Two TQToolTip subclasses implement dynamic tooltips for
   QHeader and QTable by reimplementing maybeTip(). The 
-  constructors differ from the QToolTip constructor in having a 
+  constructors differ from the TQToolTip constructor in having a 
   QHeader and a QTable respectively as the first parameter for 
   the constructor instead of a TQWidget. This is because 
   we want to ensure that only headers and tables can be 
-  passed as arguments. A QToolTipGroup can be provided as the
+  passed as arguments. A TQToolTipGroup can be provided as the
   second argument to show tooltips in, for example a statusbar.
 
   \printuntil };
@@ -40,13 +40,13 @@
   \printuntil }
 
   The HeaderToolTip constructor propagates the parameters
-  to the QToolTip constructor.
+  to the TQToolTip constructor.
   \printuntil }
 
   The implementation of maybeTip() uses the QHeader API
   to get the section at the requested position and uses
-  QToolTip::tip() to display the section's label in a
-  tooltip. The second string is used by QToolTipGroup and will
+  TQToolTip::tip() to display the section's label in a
+  tooltip. The second string is used by TQToolTipGroup and will
   show up in the statusbar.
 
   \printuntil }
@@ -54,7 +54,7 @@
   Since QTable is a QScrollView all user interaction 
   happens on QTable's viewport() . The TableToolTip 
   constructor passes the viewport() and the tooltip
-  group to the QToolTip constructor, and initializes the table
+  group to the TQToolTip constructor, and initializes the table
   member with the QTable pointer itself.
   \printto moveTopLeft
 
@@ -69,8 +69,8 @@
 
   We translate the cell's geometry back to viewport coordinates
   so that the tooltip disappears when the mouse cursor leaves 
-  the cell, and use QToolTip::tip() to display the cell's label 
-  in a tooltip and to provide text for the QToolTipGroup as before. 
+  the cell, and use TQToolTip::tip() to display the cell's label 
+  in a tooltip and to provide text for the TQToolTipGroup as before. 
   \printuntil };
   \quotefile helpsystem/whatsthis.cpp
   \skipto WhatsThis::WhatsThis
@@ -147,7 +147,7 @@
   \skipto class MainWindow
   \printuntil };
 
-  A QMainWindow is used to create a user interface that uses the 
+  A TQMainWindow is used to create a user interface that uses the 
   above classes in addition to TQt Assistant to provide context
   sensitive help in the application.
 
@@ -171,19 +171,19 @@
   and the toolbar are populated.
   \printto // create
   
-  The static function whatsThisButton() creates a QToolButton
+  The static function whatsThisButton() creates a TQToolButton
   which will enter "What's this?" mode when clicked.
   \printto // set up
  
-  A QToolTipGroup is created and will show and remove tooltips
+  A TQToolTipGroup is created and will show and remove tooltips
   in the statusbar as the tooltips are displayed on the widgets.
   \printto // set up whats this
    
   The tooltips are set up. The static function add() sets up a 
   tooltip on the Assistant toolbutton. Tooltip objects are created
-  using the QToolTip subclasses, the constructor's first parameter
+  using the TQToolTip subclasses, the constructor's first parameter
   specifies the widget we want to add dynamic tooltips for and the
-  second argument specifies the QToolTipGroup they should belong 
+  second argument specifies the TQToolTipGroup they should belong 
   to.
   \printto // connections
   
@@ -200,8 +200,8 @@
   \printuntil }
 
   The destructor deletes the tooltips. We need to delete the 
-  tooltips explicitly since QToolTip is, as mentioned above, not 
-  a subclass of TQObject and the instances of QToolTip not will be
+  tooltips explicitly since TQToolTip is, as mentioned above, not 
+  a subclass of TQObject and the instances of TQToolTip not will be
   deleted when the widget is deleted.
   \printuntil }  
 
diff --git a/examples/helpsystem/mainwindow.cpp b/examples/helpsystem/mainwindow.cpp
index 95b2786f..d711a1b3 100644
--- a/examples/helpsystem/mainwindow.cpp
+++ b/examples/helpsystem/mainwindow.cpp
@@ -10,13 +10,13 @@
 #include <ntqapplication.h>
 #include <ntqassistantclient.h>
 #include <ntqfiledialog.h>
-#include <ntqmenubar.h>
-#include <ntqpopupmenu.h>
-#include <ntqstatusbar.h>
+#include <tqmenubar.h>
+#include <tqpopupmenu.h>
+#include <tqstatusbar.h>
 #include <ntqtable.h>
-#include <ntqtoolbar.h>
-#include <ntqtoolbutton.h>
-#include <ntqtooltip.h>
+#include <tqtoolbar.h>
+#include <tqtoolbutton.h>
+#include <tqtooltip.h>
 
 #include "mainwindow.h"
 #include "tooltip.h"
diff --git a/examples/helpsystem/mainwindow.h b/examples/helpsystem/mainwindow.h
index 2566bae1..db40a4d6 100644
--- a/examples/helpsystem/mainwindow.h
+++ b/examples/helpsystem/mainwindow.h
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 
 class HeaderToolTip;
 class TableToolTip;
diff --git a/examples/helpsystem/tooltip.cpp b/examples/helpsystem/tooltip.cpp
index eba54615..45ced566 100644
--- a/examples/helpsystem/tooltip.cpp
+++ b/examples/helpsystem/tooltip.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <ntqtooltip.h>
+#include <tqtooltip.h>
 #include <ntqtable.h>
 
 #include "tooltip.h"
diff --git a/examples/helpsystem/tooltip.h b/examples/helpsystem/tooltip.h
index 336a06fc..ab53a6f4 100644
--- a/examples/helpsystem/tooltip.h
+++ b/examples/helpsystem/tooltip.h
@@ -10,7 +10,7 @@
 #ifndef TOOLTIP_H
 #define TOOLTIP_H
 
-#include <ntqtooltip.h>
+#include <tqtooltip.h>
 
 
 class TQTable;
diff --git a/examples/helpviewer/helpwindow.cpp b/examples/helpviewer/helpwindow.cpp
index aadf0c04..96c26f15 100644
--- a/examples/helpviewer/helpwindow.cpp
+++ b/examples/helpviewer/helpwindow.cpp
@@ -8,12 +8,12 @@
 *****************************************************************************/
 
 #include "helpwindow.h"
-#include <ntqstatusbar.h>
+#include <tqstatusbar.h>
 #include <ntqpixmap.h>
-#include <ntqpopupmenu.h>
-#include <ntqmenubar.h>
-#include <ntqtoolbar.h>
-#include <ntqtoolbutton.h>
+#include <tqpopupmenu.h>
+#include <tqmenubar.h>
+#include <tqtoolbar.h>
+#include <tqtoolbutton.h>
 #include <tqiconset.h>
 #include <ntqfile.h>
 #include <tqtextstream.h>
diff --git a/examples/helpviewer/helpwindow.h b/examples/helpviewer/helpwindow.h
index 311b4ff4..ba54d782 100644
--- a/examples/helpviewer/helpwindow.h
+++ b/examples/helpviewer/helpwindow.h
@@ -10,7 +10,7 @@
 #ifndef HELPWINDOW_H
 #define HELPWINDOW_H
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 #include <tqtextbrowser.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
diff --git a/examples/i18n/mywidget.cpp b/examples/i18n/mywidget.cpp
index 2562e2be..def27cba 100644
--- a/examples/i18n/mywidget.cpp
+++ b/examples/i18n/mywidget.cpp
@@ -16,9 +16,9 @@
 #include <ntqhbox.h>
 #include <ntqvbox.h>
 #include <ntqaccel.h>
-#include <ntqpopupmenu.h>
-#include <ntqmenubar.h>
-#include <ntqstatusbar.h>
+#include <tqpopupmenu.h>
+#include <tqmenubar.h>
+#include <tqstatusbar.h>
 #include <ntqapplication.h>
 
 #include "mywidget.h"
diff --git a/examples/i18n/mywidget.h b/examples/i18n/mywidget.h
index 41367ecc..9e781bf1 100644
--- a/examples/i18n/mywidget.h
+++ b/examples/i18n/mywidget.h
@@ -10,7 +10,7 @@
 #ifndef MYWIDGET_H
 #define MYWIDGET_H
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 #include <tqstring.h>
 
 class MyWidget : public TQMainWindow
diff --git a/examples/layout/layout.cpp b/examples/layout/layout.cpp
index bc2ff269..0989ccb4 100644
--- a/examples/layout/layout.cpp
+++ b/examples/layout/layout.cpp
@@ -14,8 +14,8 @@
 #include <ntqlayout.h>
 #include <ntqlineedit.h>
 #include <ntqmultilineedit.h>
-#include <ntqmenubar.h>
-#include <ntqpopupmenu.h>
+#include <tqmenubar.h>
+#include <tqpopupmenu.h>
 
 class ExampleWidget : public TQWidget
 {
diff --git a/examples/listviews/listviews.cpp b/examples/listviews/listviews.cpp
index b1297c73..24b314c0 100644
--- a/examples/listviews/listviews.cpp
+++ b/examples/listviews/listviews.cpp
@@ -13,7 +13,7 @@
 #include <ntqpainter.h>
 #include <ntqpalette.h>
 #include <tqobjectlist.h>
-#include <ntqpopupmenu.h>
+#include <tqpopupmenu.h>
 #include <ntqheader.h>
 #include <ntqregexp.h>
 
diff --git a/examples/mdi/application.cpp b/examples/mdi/application.cpp
index adf6604c..a1163dba 100644
--- a/examples/mdi/application.cpp
+++ b/examples/mdi/application.cpp
@@ -8,18 +8,18 @@
 *****************************************************************************/
 
 #include "application.h"
-#include <ntqworkspace.h>
+#include <tqworkspace.h>
 #include <tqimage.h>
 #include <ntqpixmap.h>
-#include <ntqtoolbar.h>
-#include <ntqtoolbutton.h>
-#include <ntqpopupmenu.h>
-#include <ntqmenubar.h>
+#include <tqtoolbar.h>
+#include <tqtoolbutton.h>
+#include <tqpopupmenu.h>
+#include <tqmenubar.h>
 #include <ntqmovie.h>
 #include <ntqfile.h>
 #include <ntqfiledialog.h>
 #include <ntqlabel.h>
-#include <ntqstatusbar.h>
+#include <tqstatusbar.h>
 #include <ntqmessagebox.h>
 #include <ntqprinter.h>
 #include <ntqapplication.h>
diff --git a/examples/mdi/application.h b/examples/mdi/application.h
index 15562ac5..3c2c9a7d 100644
--- a/examples/mdi/application.h
+++ b/examples/mdi/application.h
@@ -10,7 +10,7 @@
 #ifndef APPLICATION_H
 #define APPLICATION_H
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 #include <tqptrlist.h>
 
 class TQTextEdit;
diff --git a/examples/menu/menu.cpp b/examples/menu/menu.cpp
index 8997ddaa..70d9e4dc 100644
--- a/examples/menu/menu.cpp
+++ b/examples/menu/menu.cpp
@@ -9,7 +9,7 @@
 
 #include "menu.h"
 #include <ntqcursor.h>
-#include <ntqpopupmenu.h>
+#include <tqpopupmenu.h>
 #include <ntqapplication.h>
 #include <ntqmessagebox.h>
 #include <ntqpixmap.h>
diff --git a/examples/menu/menu.h b/examples/menu/menu.h
index 0b0aea53..3878d72c 100644
--- a/examples/menu/menu.h
+++ b/examples/menu/menu.h
@@ -11,7 +11,7 @@
 #define MENU_H
 
 #include <tqwidget.h>
-#include <ntqmenubar.h>
+#include <tqmenubar.h>
 #include <ntqlabel.h>
 
 
diff --git a/examples/network/ftpclient/ftpmainwindow.ui.h b/examples/network/ftpclient/ftpmainwindow.ui.h
index ded8b260..d29cbab3 100644
--- a/examples/network/ftpclient/ftpmainwindow.ui.h
+++ b/examples/network/ftpclient/ftpmainwindow.ui.h
@@ -21,7 +21,7 @@
 #include <ntqftp.h>
 #include <ntqlineedit.h>
 #include <ntqspinbox.h>
-#include <ntqstatusbar.h>
+#include <tqstatusbar.h>
 #include <ntqmessagebox.h>
 #include <ntqfiledialog.h>
 #include <ntqprogressdialog.h>
diff --git a/examples/network/httpd/httpd.cpp b/examples/network/httpd/httpd.cpp
index 8f89b547..9ae8ff5e 100644
--- a/examples/network/httpd/httpd.cpp
+++ b/examples/network/httpd/httpd.cpp
@@ -11,7 +11,7 @@
 #include <ntqregexp.h>
 #include <ntqserversocket.h>
 #include <ntqapplication.h>
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 #include <tqtextstream.h>
 #include <ntqvbox.h>
 #include <ntqlabel.h>
diff --git a/examples/opengl/box/globjwin.cpp b/examples/opengl/box/globjwin.cpp
index d93c61af..8a8c6204 100644
--- a/examples/opengl/box/globjwin.cpp
+++ b/examples/opengl/box/globjwin.cpp
@@ -11,8 +11,8 @@
 #include <ntqslider.h>
 #include <ntqlayout.h>
 #include <ntqframe.h>
-#include <ntqmenubar.h>
-#include <ntqpopupmenu.h>
+#include <tqmenubar.h>
+#include <tqpopupmenu.h>
 #include <ntqapplication.h>
 #include <ntqkeycode.h>
 #include "globjwin.h"
diff --git a/examples/opengl/glpixmap/globjwin.cpp b/examples/opengl/glpixmap/globjwin.cpp
index bdb22eef..a34dd3cd 100644
--- a/examples/opengl/glpixmap/globjwin.cpp
+++ b/examples/opengl/glpixmap/globjwin.cpp
@@ -19,8 +19,8 @@
 #include <ntqlayout.h>
 #include <ntqframe.h>
 #include <ntqlabel.h>
-#include <ntqmenubar.h>
-#include <ntqpopupmenu.h>
+#include <tqmenubar.h>
+#include <tqpopupmenu.h>
 #include <ntqapplication.h>
 #include <ntqkeycode.h>
 #include <ntqpixmap.h>
diff --git a/examples/opengl/overlay/globjwin.cpp b/examples/opengl/overlay/globjwin.cpp
index 585994a7..8e6640be 100644
--- a/examples/opengl/overlay/globjwin.cpp
+++ b/examples/opengl/overlay/globjwin.cpp
@@ -9,8 +9,8 @@
 
 #include <ntqlayout.h>
 #include <ntqframe.h>
-#include <ntqmenubar.h>
-#include <ntqpopupmenu.h>
+#include <tqmenubar.h>
+#include <tqpopupmenu.h>
 #include <ntqapplication.h>
 #include <ntqmessagebox.h>
 #include "globjwin.h"
diff --git a/examples/opengl/sharedbox/globjwin.cpp b/examples/opengl/sharedbox/globjwin.cpp
index 11878390..576b1771 100644
--- a/examples/opengl/sharedbox/globjwin.cpp
+++ b/examples/opengl/sharedbox/globjwin.cpp
@@ -11,8 +11,8 @@
 #include <ntqslider.h>
 #include <ntqlayout.h>
 #include <ntqframe.h>
-#include <ntqmenubar.h>
-#include <ntqpopupmenu.h>
+#include <tqmenubar.h>
+#include <tqpopupmenu.h>
 #include <ntqapplication.h>
 #include <ntqkeycode.h>
 #include "globjwin.h"
diff --git a/examples/opengl/texture/globjwin.cpp b/examples/opengl/texture/globjwin.cpp
index 3a591c22..65ee4022 100644
--- a/examples/opengl/texture/globjwin.cpp
+++ b/examples/opengl/texture/globjwin.cpp
@@ -11,8 +11,8 @@
 #include <ntqslider.h>
 #include <ntqlayout.h>
 #include <ntqframe.h>
-#include <ntqmenubar.h>
-#include <ntqpopupmenu.h>
+#include <tqmenubar.h>
+#include <tqpopupmenu.h>
 #include <ntqapplication.h>
 #include <ntqkeycode.h>
 #include "globjwin.h"
diff --git a/examples/progress/progress.cpp b/examples/progress/progress.cpp
index 190f50de..f7c29f6a 100644
--- a/examples/progress/progress.cpp
+++ b/examples/progress/progress.cpp
@@ -9,8 +9,8 @@
 
 #include <ntqprogressdialog.h>
 #include <ntqapplication.h>
-#include <ntqmenubar.h>
-#include <ntqpopupmenu.h>
+#include <tqmenubar.h>
+#include <tqpopupmenu.h>
 #include <ntqpainter.h>
 #include <stdlib.h>
 
diff --git a/examples/qdir/qdir.cpp b/examples/qdir/qdir.cpp
index d6236e52..49c242fc 100644
--- a/examples/qdir/qdir.cpp
+++ b/examples/qdir/qdir.cpp
@@ -22,12 +22,12 @@
 #include <ntqheader.h>
 #include <ntqevent.h>
 #include <ntqpainter.h>
-#include <ntqpopupmenu.h>
+#include <tqpopupmenu.h>
 #include <ntqpushbutton.h>
-#include <ntqtoolbutton.h>
+#include <tqtoolbutton.h>
 #include <ntqfile.h>
 #include <tqtextstream.h>
-#include <ntqtooltip.h>
+#include <tqtooltip.h>
 
 #include <stdlib.h>
 
diff --git a/examples/qfd/fontdisplayer.cpp b/examples/qfd/fontdisplayer.cpp
index a580e879..fceff108 100644
--- a/examples/qfd/fontdisplayer.cpp
+++ b/examples/qfd/fontdisplayer.cpp
@@ -12,8 +12,8 @@
 #include <ntqslider.h>
 #include <ntqspinbox.h>
 #include <ntqpainter.h>
-#include <ntqtoolbar.h>
-#include <ntqstatusbar.h>
+#include <tqtoolbar.h>
+#include <tqstatusbar.h>
 #include <ntqlabel.h>
 #include <ntqpushbutton.h>
 #include <ntqfontdialog.h>
diff --git a/examples/qfd/fontdisplayer.h b/examples/qfd/fontdisplayer.h
index 612e5f22..c675c515 100644
--- a/examples/qfd/fontdisplayer.h
+++ b/examples/qfd/fontdisplayer.h
@@ -11,7 +11,7 @@
 #define FontDisplayer_H
 
 #include <ntqframe.h>
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 
 class TQSlider;
 
diff --git a/examples/qfd/qfd.cpp b/examples/qfd/qfd.cpp
index ecfe51f7..c8d397f2 100644
--- a/examples/qfd/qfd.cpp
+++ b/examples/qfd/qfd.cpp
@@ -12,7 +12,7 @@
 #include <ntqapplication.h>
 #include <ntqslider.h>
 #include <ntqpainter.h>
-#include <ntqstatusbar.h>
+#include <tqstatusbar.h>
 
 
 
diff --git a/examples/qwerty/qwerty.cpp b/examples/qwerty/qwerty.cpp
index 74758db2..1c1d6cc8 100644
--- a/examples/qwerty/qwerty.cpp
+++ b/examples/qwerty/qwerty.cpp
@@ -11,7 +11,7 @@
 #include <ntqapplication.h>
 #include <ntqfile.h>
 #include <ntqfiledialog.h>
-#include <ntqpopupmenu.h>
+#include <tqpopupmenu.h>
 #include <tqtextstream.h>
 #include <ntqpainter.h>
 #include <ntqmessagebox.h>
diff --git a/examples/qwerty/qwerty.h b/examples/qwerty/qwerty.h
index 7ed6d7cd..515a7c75 100644
--- a/examples/qwerty/qwerty.h
+++ b/examples/qwerty/qwerty.h
@@ -11,7 +11,7 @@
 #define TQWERTY_H
 
 #include <tqwidget.h>
-#include <ntqmenubar.h>
+#include <tqmenubar.h>
 #include <ntqmultilineedit.h>
 #include <ntqprinter.h>
 
diff --git a/examples/regexptester/regexptester.cpp b/examples/regexptester/regexptester.cpp
index e9743515..a2a62810 100644
--- a/examples/regexptester/regexptester.cpp
+++ b/examples/regexptester/regexptester.cpp
@@ -6,7 +6,7 @@
 #include <ntqlayout.h>
 #include <ntqpushbutton.h>
 #include <ntqregexp.h>
-#include <ntqstatusbar.h>
+#include <tqstatusbar.h>
 #include <ntqtable.h>
 
 #include "regexptester.h"
diff --git a/examples/scribble/scribble.cpp b/examples/scribble/scribble.cpp
index aba486c3..06680256 100644
--- a/examples/scribble/scribble.cpp
+++ b/examples/scribble/scribble.cpp
@@ -12,10 +12,10 @@
 #include <ntqapplication.h>
 #include <ntqevent.h>
 #include <ntqpainter.h>
-#include <ntqtoolbar.h>
-#include <ntqtoolbutton.h>
+#include <tqtoolbar.h>
+#include <tqtoolbutton.h>
 #include <ntqspinbox.h>
-#include <ntqtooltip.h>
+#include <tqtooltip.h>
 #include <ntqrect.h>
 #include <ntqpoint.h>
 #include <ntqcolordialog.h>
@@ -23,7 +23,7 @@
 #include <ntqcursor.h>
 #include <tqimage.h>
 #include <tqstrlist.h>
-#include <ntqpopupmenu.h>
+#include <tqpopupmenu.h>
 #include <ntqintdict.h>
 
 const bool no_writing = FALSE;
diff --git a/examples/scribble/scribble.h b/examples/scribble/scribble.h
index 4f5ca3bb..ad622dfa 100644
--- a/examples/scribble/scribble.h
+++ b/examples/scribble/scribble.h
@@ -10,7 +10,7 @@
 #ifndef SCRIBBLE_H
 #define SCRIBBLE_H
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 #include <ntqpen.h>
 #include <ntqpoint.h>
 #include <ntqpixmap.h>
diff --git a/examples/scrollview/scrollview.cpp b/examples/scrollview/scrollview.cpp
index 29d6e1b5..60088add 100644
--- a/examples/scrollview/scrollview.cpp
+++ b/examples/scrollview/scrollview.cpp
@@ -9,8 +9,8 @@
 
 #include <ntqscrollview.h>
 #include <ntqapplication.h>
-#include <ntqmenubar.h>
-#include <ntqpopupmenu.h>
+#include <tqmenubar.h>
+#include <tqpopupmenu.h>
 #include <ntqpushbutton.h>
 #include <ntqpainter.h>
 #include <ntqpixmap.h>
@@ -18,7 +18,7 @@
 #include <ntqlayout.h>
 #include <ntqlabel.h>
 #include <ntqmultilineedit.h>
-#include <ntqsizegrip.h>
+#include <tqsizegrip.h>
 #include <stdlib.h>
 
 
diff --git a/examples/showimg/showimg.cpp b/examples/showimg/showimg.cpp
index 4ef1a1d9..f72c62aa 100644
--- a/examples/showimg/showimg.cpp
+++ b/examples/showimg/showimg.cpp
@@ -9,10 +9,10 @@
 
 #include "showimg.h"
 #include "imagetexteditor.h"
-#include <ntqmenubar.h>
+#include <tqmenubar.h>
 #include <ntqfiledialog.h>
 #include <ntqmessagebox.h>
-#include <ntqpopupmenu.h>
+#include <tqpopupmenu.h>
 #include <ntqlabel.h>
 #include <ntqpainter.h>
 #include <ntqapplication.h>
diff --git a/examples/sound/sound.cpp b/examples/sound/sound.cpp
index fd508ca1..9c79d576 100644
--- a/examples/sound/sound.cpp
+++ b/examples/sound/sound.cpp
@@ -16,7 +16,7 @@
 #include "sound.h"
 #include <ntqapplication.h>
 #include <ntqmessagebox.h>
-#include <ntqmenubar.h>
+#include <tqmenubar.h>
 
 SoundPlayer::SoundPlayer() :
     TQMainWindow(),
diff --git a/examples/sound/sound.h b/examples/sound/sound.h
index ee4bc585..416927b2 100644
--- a/examples/sound/sound.h
+++ b/examples/sound/sound.h
@@ -10,7 +10,7 @@
 #define PLAY_H
 
 #include "ntqsound.h"
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 
 class SoundPlayer : public TQMainWindow {
     TQ_OBJECT
diff --git a/examples/tablet/scribble.cpp b/examples/tablet/scribble.cpp
index 57d858d6..ee8089c0 100644
--- a/examples/tablet/scribble.cpp
+++ b/examples/tablet/scribble.cpp
@@ -13,10 +13,10 @@
 #include <ntqapplication.h>
 #include <ntqevent.h>
 #include <ntqpainter.h>
-#include <ntqtoolbar.h>
-#include <ntqtoolbutton.h>
+#include <tqtoolbar.h>
+#include <tqtoolbutton.h>
 #include <ntqspinbox.h>
-#include <ntqtooltip.h>
+#include <tqtooltip.h>
 #include <ntqrect.h>
 #include <ntqpoint.h>
 #include <ntqcolordialog.h>
@@ -24,7 +24,7 @@
 #include <ntqcursor.h>
 #include <tqimage.h>
 #include <tqstrlist.h>
-#include <ntqpopupmenu.h>
+#include <tqpopupmenu.h>
 #include <ntqintdict.h>
 
 
diff --git a/examples/tablet/scribble.h b/examples/tablet/scribble.h
index 00be8ef1..3bb94284 100644
--- a/examples/tablet/scribble.h
+++ b/examples/tablet/scribble.h
@@ -10,7 +10,7 @@
 #ifndef SCRIBBLE_H
 #define SCRIBBLE_H
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 #include <ntqpen.h>
 #include <ntqpoint.h>
 #include <ntqpixmap.h>
diff --git a/examples/tetrix/qdragapp.cpp b/examples/tetrix/qdragapp.cpp
index 7004f478..b11a5450 100644
--- a/examples/tetrix/qdragapp.cpp
+++ b/examples/tetrix/qdragapp.cpp
@@ -10,7 +10,7 @@
 #include "qdragapp.h"
 #include "tqptrlist.h"
 #include "ntqintdict.h"
-#include "ntqpopupmenu.h"
+#include "tqpopupmenu.h"
 #include "ntqguardedptr.h"
 #include "ntqcolor.h"
 #include "tqwidget.h"
diff --git a/examples/textedit/textedit.cpp b/examples/textedit/textedit.cpp
index a814e6cc..53e4b110 100644
--- a/examples/textedit/textedit.cpp
+++ b/examples/textedit/textedit.cpp
@@ -10,10 +10,10 @@
 #include "textedit.h"
 
 #include <tqtextedit.h>
-#include <ntqaction.h>
-#include <ntqmenubar.h>
-#include <ntqpopupmenu.h>
-#include <ntqtoolbar.h>
+#include <tqaction.h>
+#include <tqmenubar.h>
+#include <tqpopupmenu.h>
+#include <tqtoolbar.h>
 #include <ntqtabwidget.h>
 #include <ntqapplication.h>
 #include <ntqfontdatabase.h>
diff --git a/examples/textedit/textedit.h b/examples/textedit/textedit.h
index 440b2a6d..bfe0e956 100644
--- a/examples/textedit/textedit.h
+++ b/examples/textedit/textedit.h
@@ -10,7 +10,7 @@
 #ifndef TEXTEDIT_H
 #define TEXTEDIT_H
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 #include <tqmap.h>
 
 class TQAction;
diff --git a/examples/themes/themes.cpp b/examples/themes/themes.cpp
index 984297b2..1ac0e0a5 100644
--- a/examples/themes/themes.cpp
+++ b/examples/themes/themes.cpp
@@ -21,12 +21,12 @@
 
 #include <ntqtabwidget.h>
 #include <ntqapplication.h>
-#include <ntqpopupmenu.h>
-#include <ntqmenubar.h>
+#include <tqpopupmenu.h>
+#include <tqmenubar.h>
 #include <ntqmessagebox.h>
 #include <ntqfont.h>
 #include <tqstylefactory.h>
-#include <ntqaction.h>
+#include <tqaction.h>
 #include <ntqsignalmapper.h>
 #include <ntqdict.h>
 
diff --git a/examples/themes/themes.h b/examples/themes/themes.h
index a11b6c79..c36e404f 100644
--- a/examples/themes/themes.h
+++ b/examples/themes/themes.h
@@ -10,7 +10,7 @@
 #ifndef THEMES_H
 #define THEMES_H
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 #include <ntqfont.h>
 
 class TQTabWidget;
diff --git a/examples/tooltip/README b/examples/tooltip/README
index cdfe50cd..6f7e27d7 100644
--- a/examples/tooltip/README
+++ b/examples/tooltip/README
@@ -1,6 +1,6 @@
 The tooltip example demonstrates advanced use of tool tips.
 
-There are dynamic tool tips on the blue rectanges - QToolTip asks
+There are dynamic tool tips on the blue rectanges - TQToolTip asks
 tooltip whether to display anything, and if so, what.  The Right Thing
 happens when you click on the rectangles.
 
diff --git a/examples/tooltip/tooltip.h b/examples/tooltip/tooltip.h
index 1a0a486d..40b738c5 100644
--- a/examples/tooltip/tooltip.h
+++ b/examples/tooltip/tooltip.h
@@ -8,7 +8,7 @@
 *****************************************************************************/
 
 #include <tqwidget.h>
-#include <ntqtooltip.h>
+#include <tqtooltip.h>
 
 
 class DynamicTip : public TQToolTip
diff --git a/examples/widgets/widgets.cpp b/examples/widgets/widgets.cpp
index 40f4056d..6c81e751 100644
--- a/examples/widgets/widgets.cpp
+++ b/examples/widgets/widgets.cpp
@@ -14,9 +14,9 @@
 
 // Standard TQt widgets
 
-#include <ntqtoolbar.h>
-#include <ntqmenubar.h>
-#include <ntqpopupmenu.h>
+#include <tqtoolbar.h>
+#include <tqmenubar.h>
+#include <tqpopupmenu.h>
 #include <ntqbuttongroup.h>
 #include <ntqcheckbox.h>
 #include <ntqcombobox.h>
@@ -30,11 +30,11 @@
 #include <ntqpushbutton.h>
 #include <ntqradiobutton.h>
 #include <ntqslider.h>
-#include <ntqtooltip.h>
+#include <tqtooltip.h>
 #include <ntqspinbox.h>
-#include <ntqstatusbar.h>
+#include <tqstatusbar.h>
 #include <ntqwhatsthis.h>
-#include <ntqtoolbutton.h>
+#include <tqtoolbutton.h>
 #include <ntqvbox.h>
 #include <ntqtabbar.h>
 #include <ntqtabwidget.h>
diff --git a/examples/widgets/widgets.h b/examples/widgets/widgets.h
index 12e814a6..0452879e 100644
--- a/examples/widgets/widgets.h
+++ b/examples/widgets/widgets.h
@@ -14,7 +14,7 @@
 #ifndef WIDGETS_H
 #define WIDGETS_H
 
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 #include <ntqmovie.h>
 #include <ntqlistview.h>
 class TQLabel;
diff --git a/examples/xform/xform.cpp b/examples/xform/xform.cpp
index d9fab771..16eff319 100644
--- a/examples/xform/xform.cpp
+++ b/examples/xform/xform.cpp
@@ -18,7 +18,7 @@
 #include <ntqbuttongroup.h>
 #include <ntqlcdnumber.h>
 #include <ntqslider.h>
-#include <ntqmenubar.h>
+#include <tqmenubar.h>
 #include <ntqfontdialog.h>
 #include <ntqlayout.h>
 #include <ntqvbox.h>
diff --git a/examples/xml/tagreader-with-features/tagreader.cpp b/examples/xml/tagreader-with-features/tagreader.cpp
index 6a9dbe6e..694ecf71 100644
--- a/examples/xml/tagreader-with-features/tagreader.cpp
+++ b/examples/xml/tagreader-with-features/tagreader.cpp
@@ -13,7 +13,7 @@
 #include <tqxml.h>
 #include <ntqlistview.h>
 #include <ntqgrid.h>
-#include <ntqmainwindow.h>
+#include <tqmainwindow.h>
 #include <ntqlabel.h>
 
 int main( int argc, char **argv )