From fef846914f8db6dc117e206ef913d519bf6bb33e Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Mon, 29 Jul 2024 12:43:23 +0900
Subject: Rename basic widget nt* related files to equivalent tq*

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 examples/README                                    | 24 +++++++++++-----------
 examples/addressbook/centralwidget.cpp             |  6 +++---
 examples/buttongroups/buttongroups.cpp             |  6 +++---
 examples/chart/chartform.cpp                       |  6 +++---
 examples/chart/optionsform.cpp                     |  8 ++++----
 examples/chart/optionsform.h                       |  2 +-
 examples/chart/setdataform.cpp                     |  4 ++--
 examples/chart/setdataform.h                       |  2 +-
 examples/checklists/checklists.cpp                 |  2 +-
 examples/customlayout/main.cpp                     |  2 +-
 examples/dclock/dclock.h                           |  2 +-
 examples/demo/display.cpp                          |  8 ++++----
 examples/demo/graph.cpp                            |  4 ++--
 examples/demo/opengl/glworkspace.cpp               |  4 ++--
 examples/demo/qasteroids/toplevel.cpp              |  4 ++--
 examples/demo/sql/sqlex.ui.h                       |  6 +++---
 examples/demo/textdrawing/example.html             | 10 ++++-----
 examples/demo/textdrawing/helpwindow.cpp           |  4 ++--
 examples/demo/textdrawing/textedit.cpp             |  4 ++--
 examples/distributor/distributor.ui.h              |  4 ++--
 examples/dragdrop/main.cpp                         |  2 +-
 examples/drawdemo/drawdemo.cpp                     |  4 ++--
 examples/extension/mainform.ui.h                   |  4 ++--
 examples/fileiconview/mainwindow.cpp               |  2 +-
 examples/fonts/simple-tqfont-demo/viewer.cpp       |  2 +-
 examples/hello/hello.cpp                           |  2 +-
 examples/helpdemo/helpdemo.cpp                     |  6 +++---
 examples/helpsystem/helpsystem.doc                 |  2 +-
 examples/helpsystem/whatsthis.cpp                  |  6 +++---
 examples/helpviewer/helpwindow.cpp                 |  4 ++--
 examples/i18n/main.cpp                             |  4 ++--
 examples/i18n/mywidget.cpp                         |  4 ++--
 examples/layout/layout.cpp                         |  4 ++--
 examples/life/life.cpp                             |  2 +-
 examples/life/lifedlg.cpp                          |  6 +++---
 examples/lineedits/lineedits.cpp                   |  4 ++--
 examples/listbox/listbox.cpp                       |  8 ++++----
 examples/listboxcombo/listboxcombo.cpp             |  4 ++--
 examples/mdi/application.cpp                       |  2 +-
 examples/movies/main.cpp                           |  2 +-
 examples/network/clientserver/client/client.cpp    |  4 ++--
 examples/network/clientserver/server/server.cpp    |  2 +-
 examples/network/ftpclient/ftpmainwindow.ui.h      |  4 ++--
 examples/network/httpd/httpd.cpp                   |  2 +-
 .../network/infoprotocol/infoclient/client.cpp     |  4 ++--
 .../network/infoprotocol/infoserver/server.cpp     |  2 +-
 .../network/infoprotocol/infourlclient/client.cpp  |  2 +-
 examples/network/mail/composer.cpp                 |  4 ++--
 examples/network/networkprotocol/view.cpp          |  2 +-
 examples/network/remotecontrol/remotectrlimpl.cpp  |  4 ++--
 examples/opengl/box/globjwin.cpp                   |  4 ++--
 examples/opengl/glpixmap/globjwin.cpp              |  4 ++--
 examples/opengl/overlay_x11/README                 |  2 +-
 examples/opengl/overlay_x11/overlay_x11.doc        |  2 +-
 examples/opengl/sharedbox/globjwin.cpp             |  4 ++--
 examples/opengl/texture/globjwin.cpp               |  4 ++--
 examples/popup/popup.h                             |  4 ++--
 examples/process/process.cpp                       |  2 +-
 examples/progressbar/progressbar.cpp               |  4 ++--
 examples/qfd/fontdisplayer.cpp                     |  6 +++---
 examples/qfd/qfd.cpp                               |  2 +-
 examples/qmag/qmag.cpp                             |  4 ++--
 examples/rangecontrols/rangecontrols.cpp           |  8 ++++----
 examples/regexptester/regexptester.cpp             |  6 +++---
 examples/regexptester/regexptester.h               |  2 +-
 examples/richtext/richtext.cpp                     |  2 +-
 examples/rot13/rot13.cpp                           |  2 +-
 examples/scribble/scribble.cpp                     |  2 +-
 examples/scrollview/README                         |  6 +++---
 examples/scrollview/scrollview.cpp                 |  4 ++--
 examples/showimg/imagetexteditor.cpp               |  6 +++---
 examples/showimg/imagetexteditor.h                 |  2 +-
 examples/sql/overview/custom1/main.h               |  6 +++---
 examples/sql/overview/form1/main.cpp               |  4 ++--
 examples/sql/overview/form2/main.h                 |  6 +++---
 examples/sql/overview/table3/main.h                |  2 +-
 examples/sql/overview/table4/main.h                |  2 +-
 examples/tabdialog/tabdialog.cpp                   |  4 ++--
 examples/table/statistics/statistics.cpp           |  2 +-
 examples/table/statistics/statistics.h             |  2 +-
 examples/tablet/scribble.cpp                       |  2 +-
 examples/tetrix/README                             |  2 +-
 examples/tetrix/qtetrix.h                          |  4 ++--
 examples/textedit/textedit.cpp                     |  4 ++--
 examples/themes/metal.cpp                          |  8 ++++----
 examples/themes/wood.cpp                           |  6 +++---
 examples/thread/prodcons/prodcons.cpp              |  4 ++--
 examples/thread/semaphores/main.cpp                |  2 +-
 examples/tictac/tictac.cpp                         |  4 ++--
 examples/tictac/tictac.h                           |  2 +-
 examples/toplevel/toplevel.doc                     |  2 +-
 examples/tqdir/tqdir.cpp                           |  4 ++--
 examples/tqdir/tqdir.h                             |  2 +-
 examples/widgets/widgets.cpp                       | 16 +++++++--------
 examples/wizard/wizard.cpp                         |  4 ++--
 examples/xform/xform.cpp                           | 14 ++++++-------
 96 files changed, 203 insertions(+), 203 deletions(-)

(limited to 'examples')

diff --git a/examples/README b/examples/README
index decd59dee..e9f4bff04 100644
--- a/examples/README
+++ b/examples/README
@@ -33,8 +33,8 @@ biff [Unix-specific]
 
 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
+    and QGroupBox), and different kinds of buttons (TQCheckBox,
+    TQRadioButton, and TQPushButton). It also shows how to add a
     TQPopupMenu to a button.
 
 canvas
@@ -51,7 +51,7 @@ chart
 checklists
     Shows two list views with check box and radio button items. (These
     kinds of lists are often used with setup programs.)
-    Shows the use of QListView, QListViewItem, QCheckListItem,
+    Shows the use of QListView, QListViewItem, TQCheckListItem,
     QListViewItemIterator, and TQValueList.
 
 cursor
@@ -66,7 +66,7 @@ customlayout
 dclock
     This example displays a digital LCD clock and can switch between
     time and date.
-    It uses the QLCDNumber widget and a couple of TQTimers.
+    It uses the TQLCDNumber widget and a couple of TQTimers.
 
 demo
     Run this to see almost all of Qt's widgets in action, including
@@ -113,7 +113,7 @@ 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 TQToolBar and how to
+    It also shows how to add a TQComboBox to a TQToolBar and how to
     implement a context menu using TQPopupMenu.
 
 fonts [obsolete; see the qfd example instead]
@@ -166,7 +166,7 @@ life
     An implementation of the life game with a Unix-flavor GUI. 
 
 lineedits
-    This example shows how to use various properties of QLineEdit
+    This example shows how to use various properties of TQLineEdit
     including echo modes, input masks, and validators.
 
 listbox
@@ -174,7 +174,7 @@ listbox
 
 listboxcombo
     This example shows how to use QListBox (with single selection and
-    multi selection) and QComboBox (editable and non-editable).
+    multi selection) and TQComboBox (editable and non-editable).
 
 listviews
     This examples shows how to work with QListView (a tree view
@@ -282,7 +282,7 @@ qwerty
     Simple text editor for testing different character encodings.
 
 rangecontrols
-    This examples shows how to use QSpinBox and QSlider.
+    This examples shows how to use TQSpinBox and TQSlider.
 
 regexptester
     This little application is useful for testing regular expressions.
@@ -299,12 +299,12 @@ 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 TQToolBar and how to implement a
-    button that pops up a menu (using QPushButton and TQPopupMenu), and
+    shows how to add a TQSpinBox to a TQToolBar and how to implement a
+    button that pops up a menu (using TQPushButton and TQPopupMenu), and
     also how to use the TQColorDialog.
 
 scrollview
-    This example shows one way of using a QScrollview. This widget is
+    This example shows one way of using a TQScrollview. This widget is
     highly optimized for showing very large contents including child
     widgets.
 
@@ -343,7 +343,7 @@ table/bigtable
 
 table/small-table-demo
     A small, simple QTable example that uses QTableItems to show text
-    and pixmaps, and QComboTableItems and QCheckTableItems to show how
+    and pixmaps, and TQComboTableItems and TQCheckTableItems to show how
     they work.
 
 table/statistics
diff --git a/examples/addressbook/centralwidget.cpp b/examples/addressbook/centralwidget.cpp
index 4a2a3f97c..d993a1565 100644
--- a/examples/addressbook/centralwidget.cpp
+++ b/examples/addressbook/centralwidget.cpp
@@ -14,10 +14,10 @@
 #include <ntqlayout.h>
 #include <tqwidget.h>
 #include <tqlabel.h>
-#include <ntqpushbutton.h>
-#include <ntqlineedit.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
 #include <tqlabel.h>
-#include <ntqcheckbox.h>
+#include <tqcheckbox.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
 
diff --git a/examples/buttongroups/buttongroups.cpp b/examples/buttongroups/buttongroups.cpp
index 4af70a84b..ed2534fc9 100644
--- a/examples/buttongroups/buttongroups.cpp
+++ b/examples/buttongroups/buttongroups.cpp
@@ -12,10 +12,10 @@
 #include <tqpopupmenu.h>
 #include <ntqbuttongroup.h>
 #include <ntqlayout.h>
-#include <ntqradiobutton.h>
-#include <ntqcheckbox.h>
+#include <tqradiobutton.h>
+#include <tqcheckbox.h>
 #include <ntqgroupbox.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 
 /*
  * Constructor
diff --git a/examples/chart/chartform.cpp b/examples/chart/chartform.cpp
index a36676214..9a7abfefd 100644
--- a/examples/chart/chartform.cpp
+++ b/examples/chart/chartform.cpp
@@ -5,7 +5,7 @@
 
 #include <tqaction.h>
 #include <ntqapplication.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
 #include <tqfile.h>
 #include <tqfiledialog.h>
 #include <tqfont.h>
@@ -15,9 +15,9 @@
 #include <tqpixmap.h>
 #include <tqpopupmenu.h>
 #include <tqprinter.h>
-#include <ntqradiobutton.h>
+#include <tqradiobutton.h>
 #include <tqsettings.h>
-#include <ntqspinbox.h>
+#include <tqspinbox.h>
 #include <tqstatusbar.h>
 #include <tqtoolbar.h>
 #include <tqtoolbutton.h>
diff --git a/examples/chart/optionsform.cpp b/examples/chart/optionsform.cpp
index 09c05d4ef..094b549a0 100644
--- a/examples/chart/optionsform.cpp
+++ b/examples/chart/optionsform.cpp
@@ -1,15 +1,15 @@
 #include "optionsform.h"
 
 #include <ntqbuttongroup.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
 #include <tqfontdialog.h>
 #include <ntqframe.h>
 #include <tqimage.h>
 #include <tqlabel.h>
 #include <ntqlayout.h>
-#include <ntqpushbutton.h>
-#include <ntqradiobutton.h>
-#include <ntqspinbox.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqspinbox.h>
 
 #include "images/options_horizontalbarchart.xpm"
 #include "images/options_piechart.xpm"
diff --git a/examples/chart/optionsform.h b/examples/chart/optionsform.h
index 8277ad376..93454721a 100644
--- a/examples/chart/optionsform.h
+++ b/examples/chart/optionsform.h
@@ -1,7 +1,7 @@
 #ifndef OPTIONSFORM_H
 #define OPTIONSFORM_H
 
-#include <ntqdialog.h>
+#include <tqdialog.h>
 
 class TQButtonGroup;
 class TQComboBox;
diff --git a/examples/chart/setdataform.cpp b/examples/chart/setdataform.cpp
index 82bd2cad8..66910d096 100644
--- a/examples/chart/setdataform.cpp
+++ b/examples/chart/setdataform.cpp
@@ -2,10 +2,10 @@
 #include "chartform.h"
 
 #include <tqcolordialog.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
 #include <ntqlayout.h>
 #include <tqpixmap.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <ntqtable.h>
 
 #include "images/pattern01.xpm"
diff --git a/examples/chart/setdataform.h b/examples/chart/setdataform.h
index 7759f6158..49867679e 100644
--- a/examples/chart/setdataform.h
+++ b/examples/chart/setdataform.h
@@ -3,7 +3,7 @@
 
 #include "element.h"
 
-#include <ntqdialog.h>
+#include <tqdialog.h>
 
 class TQHBoxLayout;
 class TQPushButton;
diff --git a/examples/checklists/checklists.cpp b/examples/checklists/checklists.cpp
index f2a1cdbfb..5de580655 100644
--- a/examples/checklists/checklists.cpp
+++ b/examples/checklists/checklists.cpp
@@ -14,7 +14,7 @@
 #include <tqlabel.h>
 #include <tqvaluelist.h>
 #include <tqstring.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <ntqlayout.h>
 
 /*
diff --git a/examples/customlayout/main.cpp b/examples/customlayout/main.cpp
index 33443dc32..af5a7cb31 100644
--- a/examples/customlayout/main.cpp
+++ b/examples/customlayout/main.cpp
@@ -17,7 +17,7 @@
 #include <tqlabel.h>
 #include <tqcolor.h>
 #include <ntqgroupbox.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <ntqmultilineedit.h>
 #include <tqcolor.h>
 
diff --git a/examples/dclock/dclock.h b/examples/dclock/dclock.h
index bffaab21f..4a0aded50 100644
--- a/examples/dclock/dclock.h
+++ b/examples/dclock/dclock.h
@@ -10,7 +10,7 @@
 #ifndef DCLOCK_H
 #define DCLOCK_H
 
-#include <ntqlcdnumber.h>
+#include <tqlcdnumber.h>
 
 
 class DigitalClock : public TQLCDNumber		// digital clock widget
diff --git a/examples/demo/display.cpp b/examples/demo/display.cpp
index 131a69ae2..1b86db32e 100644
--- a/examples/demo/display.cpp
+++ b/examples/demo/display.cpp
@@ -12,12 +12,12 @@
 #include <tqpainter.h>
 #include <ntqlayout.h>
 #include <tqtimer.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <ntqframe.h>
-#include <ntqdial.h>
-#include <ntqlcdnumber.h>
+#include <tqdial.h>
+#include <tqlcdnumber.h>
 #include <ntqprogressbar.h>
-#include <ntqspinbox.h>
+#include <tqspinbox.h>
 
 #include <math.h>
 
diff --git a/examples/demo/graph.cpp b/examples/demo/graph.cpp
index 26b203455..404564401 100644
--- a/examples/demo/graph.cpp
+++ b/examples/demo/graph.cpp
@@ -3,8 +3,8 @@
 #include <stdlib.h>
 #include <tqdatetime.h>
 #include <ntqhbox.h>
-#include <ntqpushbutton.h>
-#include <ntqslider.h>
+#include <tqpushbutton.h>
+#include <tqslider.h>
 #include <tqlabel.h>
 #include <ntqlayout.h>
 
diff --git a/examples/demo/opengl/glworkspace.cpp b/examples/demo/opengl/glworkspace.cpp
index 6a2d7fe89..419ec6deb 100644
--- a/examples/demo/opengl/glworkspace.cpp
+++ b/examples/demo/opengl/glworkspace.cpp
@@ -4,14 +4,14 @@
 #include "gltexobj.h"
 
 #include <tqworkspace.h>
-#include <ntqdialog.h>
+#include <tqdialog.h>
 #include <tqtoolbar.h>
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
 #include <tqaction.h>
 #include <tqprinter.h>
 #include <tqpainter.h>
-#include <ntqcheckbox.h>
+#include <tqcheckbox.h>
 #include <ntqvbox.h>
 #include <tqimage.h>
 #include "printpreview.h"
diff --git a/examples/demo/qasteroids/toplevel.cpp b/examples/demo/qasteroids/toplevel.cpp
index d40ea72a6..ad548127b 100644
--- a/examples/demo/qasteroids/toplevel.cpp
+++ b/examples/demo/qasteroids/toplevel.cpp
@@ -7,8 +7,8 @@
 #include <ntqaccel.h>
 #include <tqlabel.h>
 #include <ntqlayout.h>
-#include <ntqlcdnumber.h>
-#include <ntqpushbutton.h>
+#include <tqlcdnumber.h>
+#include <tqpushbutton.h>
 
 #include <ntqapplication.h>
 
diff --git a/examples/demo/sql/sqlex.ui.h b/examples/demo/sql/sqlex.ui.h
index 870efb40e..a72272955 100644
--- a/examples/demo/sql/sqlex.ui.h
+++ b/examples/demo/sql/sqlex.ui.h
@@ -8,9 +8,9 @@
 #include <tqsqldriver.h>
 #include <ntqmessagebox.h>
 #include <tqsqldatabase.h>
-#include <ntqlineedit.h>
-#include <ntqcombobox.h>
-#include <ntqspinbox.h>
+#include <tqlineedit.h>
+#include <tqcombobox.h>
+#include <tqspinbox.h>
 #include <tqsqlerror.h>
 #include <tqsqlcursor.h>
 #include <tqsqlselectcursor.h>
diff --git a/examples/demo/textdrawing/example.html b/examples/demo/textdrawing/example.html
index a4fe80929..fc48cca7b 100644
--- a/examples/demo/textdrawing/example.html
+++ b/examples/demo/textdrawing/example.html
@@ -96,14 +96,14 @@ corner (both lines being flush with the right side of the label):
 widget. For this use, TQLabel provides a handy mechanism for adding
 an accelerator key (see <a href="ntqaccel.html">TQAccel</a>) that will set the keyboard focus to
 the other widget (called the TQLabel's "buddy"). Example:
-<p><pre>     <a href="ntqlineedit.html">TQLineEdit</a>* phoneEdit = new <a href="ntqlineedit.html">TQLineEdit</a>( this, "phoneEdit" );
+<p><pre>     <a href="tqlineedit.html">TQLineEdit</a>* phoneEdit = new <a href="tqlineedit.html">TQLineEdit</a>( this, "phoneEdit" );
      <a href="tqlabel.html">TQLabel</a>* phoneLabel = new <a href="tqlabel.html">TQLabel</a>( phoneEdit, "&amp;Phone:", this, "phoneLabel" );
 </pre>
 <p>In this example, keyboard focus is transferred to the label's buddy
-(the <a href="ntqlineedit.html">TQLineEdit</a>) when the user presses <dfn>Alt-P.</dfn> You can also
+(the <a href="tqlineedit.html">TQLineEdit</a>) when the user presses <dfn>Alt-P.</dfn> You can also
 use the <a href="#191701">setBuddy</a>() function to accomplish the same.
 <p>
-<p>See also  <a href="ntqlineedit.html">TQLineEdit</a>, <a href="tqtextview.html">TQTextView</a>, <a href="tqpixmap.html">TQPixmap</a>, <a href="tqmovie.html">TQMovie</a> and <a href="guibooks.html#fowler">GUI Design Handbook: Label</a>
+<p>See also  <a href="tqlineedit.html">TQLineEdit</a>, <a href="tqtextview.html">TQTextView</a>, <a href="tqpixmap.html">TQPixmap</a>, <a href="tqmovie.html">TQMovie</a> and <a href="guibooks.html#fowler">GUI Design Handbook: Label</a>
 <p>Examples:
  <a href="cursor-cursor-cpp.html#TQLabel">cursor/cursor.cpp</a>
  <a href="layout-layout-cpp.html#TQLabel">layout/layout.cpp</a>
@@ -223,10 +223,10 @@ alignment flag is turned on; see <a href="#1f406e">setAlignment</a>()).
 <p>In a dialog, you might create two data entry widgets and a label for
 each, and set up the geometry layout so each label is just to the
 left of its data entry widget (its "buddy"), somewhat like this:
-<p><pre>    <a href="ntqlineedit.html">TQLineEdit</a> *nameEd  = new <a href="ntqlineedit.html">TQLineEdit</a>( this );
+<p><pre>    <a href="tqlineedit.html">TQLineEdit</a> *nameEd  = new <a href="tqlineedit.html">TQLineEdit</a>( this );
     <a href="tqlabel.html">TQLabel</a>    *nameLb  = new <a href="tqlabel.html">TQLabel</a>( "&amp;Name:", this );
     nameLb-&gt;<a href="#191701">setBuddy</a>( nameEd );
-    <a href="ntqlineedit.html">TQLineEdit</a> *phoneEd = new <a href="ntqlineedit.html">TQLineEdit</a>( this );
+    <a href="tqlineedit.html">TQLineEdit</a> *phoneEd = new <a href="tqlineedit.html">TQLineEdit</a>( this );
     <a href="tqlabel.html">TQLabel</a>    *phoneLb = new <a href="tqlabel.html">TQLabel</a>( "&amp;Phone:", this );
     phoneLb-&gt;<a href="#191701">setBuddy</a>( phoneEd );
     // ( layout setup not shown )
diff --git a/examples/demo/textdrawing/helpwindow.cpp b/examples/demo/textdrawing/helpwindow.cpp
index 8cab2ddda..099b5dde0 100644
--- a/examples/demo/textdrawing/helpwindow.cpp
+++ b/examples/demo/textdrawing/helpwindow.cpp
@@ -21,9 +21,9 @@
 #include <ntqmessagebox.h>
 #include <tqfiledialog.h>
 #include <ntqapplication.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
 #include <tqevent.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
 #include <tqobjectlist.h>
 #include <tqfileinfo.h>
 #include <tqfile.h>
diff --git a/examples/demo/textdrawing/textedit.cpp b/examples/demo/textdrawing/textedit.cpp
index f2017762f..091fb9eb5 100644
--- a/examples/demo/textdrawing/textedit.cpp
+++ b/examples/demo/textdrawing/textedit.cpp
@@ -17,8 +17,8 @@
 #include <ntqtabwidget.h>
 #include <ntqapplication.h>
 #include <tqfontdatabase.h>
-#include <ntqcombobox.h>
-#include <ntqlineedit.h>
+#include <tqcombobox.h>
+#include <tqlineedit.h>
 #include <tqfileinfo.h>
 #include <tqfile.h>
 #include <tqfiledialog.h>
diff --git a/examples/distributor/distributor.ui.h b/examples/distributor/distributor.ui.h
index 2e853bd22..b4650bd4f 100644
--- a/examples/distributor/distributor.ui.h
+++ b/examples/distributor/distributor.ui.h
@@ -13,9 +13,9 @@
 #include <tqfile.h>
 #include <tqfiledialog.h>
 #include <tqfileinfo.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
 #include <ntqmessagebox.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqtimer.h>
 
 
diff --git a/examples/dragdrop/main.cpp b/examples/dragdrop/main.cpp
index acc721b8f..6d942fef5 100644
--- a/examples/dragdrop/main.cpp
+++ b/examples/dragdrop/main.cpp
@@ -13,7 +13,7 @@
 #include "dropsite.h"
 #include "secret.h"
 #include <ntqlayout.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
 #include <tqlabel.h>
 #include <tqpixmap.h>
 
diff --git a/examples/drawdemo/drawdemo.cpp b/examples/drawdemo/drawdemo.cpp
index d3d0b309d..6d2bed24f 100644
--- a/examples/drawdemo/drawdemo.cpp
+++ b/examples/drawdemo/drawdemo.cpp
@@ -10,8 +10,8 @@
 #include <tqwidget.h>
 #include <tqpainter.h>
 #include <tqprinter.h>
-#include <ntqpushbutton.h>
-#include <ntqradiobutton.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
 #include <ntqbuttongroup.h>
 #include <ntqapplication.h>
 #include <math.h>
diff --git a/examples/extension/mainform.ui.h b/examples/extension/mainform.ui.h
index 1eab636fa..3ea3d5ed8 100644
--- a/examples/extension/mainform.ui.h
+++ b/examples/extension/mainform.ui.h
@@ -8,8 +8,8 @@
 #include "dialogform.h"
 #include "extension.h"
 #include <ntqapplication.h>
-#include <ntqcheckbox.h>
-#include <ntqlineedit.h>
+#include <tqcheckbox.h>
+#include <tqlineedit.h>
 
 void MainForm::init()
 {
diff --git a/examples/fileiconview/mainwindow.cpp b/examples/fileiconview/mainwindow.cpp
index eccf8885a..f714e194e 100644
--- a/examples/fileiconview/mainwindow.cpp
+++ b/examples/fileiconview/mainwindow.cpp
@@ -16,7 +16,7 @@
 #include <tqlabel.h>
 #include <tqstatusbar.h>
 #include <tqtoolbar.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
 #include <tqpixmap.h>
 #include <tqtoolbutton.h>
 #include <tqdir.h>
diff --git a/examples/fonts/simple-tqfont-demo/viewer.cpp b/examples/fonts/simple-tqfont-demo/viewer.cpp
index 88c202e3d..111abdbb7 100644
--- a/examples/fonts/simple-tqfont-demo/viewer.cpp
+++ b/examples/fonts/simple-tqfont-demo/viewer.cpp
@@ -3,7 +3,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqtextview.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <ntqlayout.h>
 
 Viewer::Viewer()
diff --git a/examples/hello/hello.cpp b/examples/hello/hello.cpp
index 815b586ba..084a6d7d4 100644
--- a/examples/hello/hello.cpp
+++ b/examples/hello/hello.cpp
@@ -8,7 +8,7 @@
 *****************************************************************************/
 
 #include "hello.h"
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqtimer.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
diff --git a/examples/helpdemo/helpdemo.cpp b/examples/helpdemo/helpdemo.cpp
index ca96b23d9..f10174d14 100644
--- a/examples/helpdemo/helpdemo.cpp
+++ b/examples/helpdemo/helpdemo.cpp
@@ -1,11 +1,11 @@
 #include <ntqassistantclient.h>
 #include <ntqmessagebox.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
 #include <tqaction.h>
 #include <tqpopupmenu.h>
-#include <ntqcheckbox.h>
+#include <tqcheckbox.h>
 #include <tqprocess.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqdir.h>
 
 #include "helpdemo.h"
diff --git a/examples/helpsystem/helpsystem.doc b/examples/helpsystem/helpsystem.doc
index 8c0906964..97221322e 100644
--- a/examples/helpsystem/helpsystem.doc
+++ b/examples/helpsystem/helpsystem.doc
@@ -51,7 +51,7 @@
 
   \printuntil }
 
-  Since QTable is a QScrollView all user interaction 
+  Since QTable is a TQScrollView all user interaction 
   happens on QTable's viewport() . The TableToolTip 
   constructor passes the viewport() and the tooltip
   group to the TQToolTip constructor, and initializes the table
diff --git a/examples/helpsystem/whatsthis.cpp b/examples/helpsystem/whatsthis.cpp
index 1e0991fcf..418e3a4db 100644
--- a/examples/helpsystem/whatsthis.cpp
+++ b/examples/helpsystem/whatsthis.cpp
@@ -86,12 +86,12 @@ TQString TableWhatsThis::text( const TQPoint &p )
 	return TQString("This is a <a href=%1/html/qtableitem.html>TQTableItem</a>.").
 		       arg(docsPath);
     } else if ( TQComboTableItem::RTTI == i->rtti() ) {
-	return TQString("This is a <a href=%1/html/qcombotableitem.html>TQComboTableItem</a>."
+	return TQString("This is a <a href=%1/html/tqcombotableitem.html>TQComboTableItem</a>."
 		       "<br>It can be used to provide multiple-choice items in a table.").
 		       arg(docsPath);
     } else if ( TQCheckTableItem::RTTI == i->rtti() ) {
-	return TQString("This is a <a href=%1/html/qchecktableitem.html>TQCheckTableItem</a>."
-		       "<br>It provide <a href=%1/html/ntqcheckbox.html>checkboxes</a> in tables.").
+	return TQString("This is a <a href=%1/html/tqchecktableitem.html>TQCheckTableItem</a>."
+		       "<br>It provide <a href=%1/html/tqcheckbox.html>checkboxes</a> in tables.").
 		       arg(docsPath).arg(docsPath);
     }
 
diff --git a/examples/helpviewer/helpwindow.cpp b/examples/helpviewer/helpwindow.cpp
index dcf95de06..5565d5275 100644
--- a/examples/helpviewer/helpwindow.cpp
+++ b/examples/helpviewer/helpwindow.cpp
@@ -21,9 +21,9 @@
 #include <ntqmessagebox.h>
 #include <tqfiledialog.h>
 #include <ntqapplication.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
 #include <tqevent.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
 #include <tqobjectlist.h>
 #include <tqfileinfo.h>
 #include <tqfile.h>
diff --git a/examples/i18n/main.cpp b/examples/i18n/main.cpp
index e33a37281..de0a3bb6c 100644
--- a/examples/i18n/main.cpp
+++ b/examples/i18n/main.cpp
@@ -11,11 +11,11 @@
 #include <tqtranslator.h>
 #include <tqfileinfo.h>
 #include <ntqmessagebox.h>
-#include <ntqcheckbox.h>
+#include <tqcheckbox.h>
 #include <ntqvbox.h>
 #include <ntqlayout.h>
 #include <ntqbuttongroup.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqsignalmapper.h>
 #include <tqtextcodec.h>
 #include <stdlib.h>
diff --git a/examples/i18n/mywidget.cpp b/examples/i18n/mywidget.cpp
index ce9218ce7..74aa506e6 100644
--- a/examples/i18n/mywidget.cpp
+++ b/examples/i18n/mywidget.cpp
@@ -8,10 +8,10 @@
 *****************************************************************************/
 
 #include <ntqbuttongroup.h>
-#include <ntqradiobutton.h>
+#include <tqradiobutton.h>
 #include <tqlabel.h>
 #include <ntqlistbox.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
 #include <tqlabel.h>
 #include <ntqhbox.h>
 #include <ntqvbox.h>
diff --git a/examples/layout/layout.cpp b/examples/layout/layout.cpp
index 3bf6070cc..42642c71e 100644
--- a/examples/layout/layout.cpp
+++ b/examples/layout/layout.cpp
@@ -10,9 +10,9 @@
 #include <ntqapplication.h>
 #include <tqlabel.h>
 #include <tqcolor.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <ntqlayout.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
 #include <ntqmultilineedit.h>
 #include <tqmenubar.h>
 #include <tqpopupmenu.h>
diff --git a/examples/life/life.cpp b/examples/life/life.cpp
index 1da6b3f15..6483ea97b 100644
--- a/examples/life/life.cpp
+++ b/examples/life/life.cpp
@@ -11,7 +11,7 @@
 
 #include <tqpainter.h>
 #include <ntqdrawutil.h>
-#include <ntqcheckbox.h>
+#include <tqcheckbox.h>
 #include <tqevent.h>
 #include <ntqapplication.h>
 
diff --git a/examples/life/lifedlg.cpp b/examples/life/lifedlg.cpp
index 7f1371b6f..9bc47e8b1 100644
--- a/examples/life/lifedlg.cpp
+++ b/examples/life/lifedlg.cpp
@@ -9,10 +9,10 @@
 
 #include "lifedlg.h"
 #include <ntqapplication.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqlabel.h>
-#include <ntqslider.h>
-#include <ntqcombobox.h>
+#include <tqslider.h>
+#include <tqcombobox.h>
 #include <tqdatetime.h>
 #include <stdlib.h>
 
diff --git a/examples/lineedits/lineedits.cpp b/examples/lineedits/lineedits.cpp
index d4d42597a..a61972583 100644
--- a/examples/lineedits/lineedits.cpp
+++ b/examples/lineedits/lineedits.cpp
@@ -9,8 +9,8 @@
 
 #include "lineedits.h"
 
-#include <ntqlineedit.h>
-#include <ntqcombobox.h>
+#include <tqlineedit.h>
+#include <tqcombobox.h>
 #include <ntqframe.h>
 #include <ntqvalidator.h>
 #include <tqlabel.h>
diff --git a/examples/listbox/listbox.cpp b/examples/listbox/listbox.cpp
index af9b4b2aa..51b7b4f49 100644
--- a/examples/listbox/listbox.cpp
+++ b/examples/listbox/listbox.cpp
@@ -10,13 +10,13 @@
 #include "listbox.h"
 
 #include <tqlabel.h>
-#include <ntqradiobutton.h>
-#include <ntqcheckbox.h>
-#include <ntqspinbox.h>
+#include <tqradiobutton.h>
+#include <tqcheckbox.h>
+#include <tqspinbox.h>
 #include <ntqlistbox.h>
 #include <ntqbuttongroup.h>
 #include <ntqlayout.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 
 
 ListBoxDemo::ListBoxDemo()
diff --git a/examples/listboxcombo/listboxcombo.cpp b/examples/listboxcombo/listboxcombo.cpp
index 1b5a719c4..28558cf77 100644
--- a/examples/listboxcombo/listboxcombo.cpp
+++ b/examples/listboxcombo/listboxcombo.cpp
@@ -9,10 +9,10 @@
 
 #include "listboxcombo.h"
 
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
 #include <ntqlistbox.h>
 #include <ntqhbox.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqstring.h>
 #include <tqpixmap.h>
 #include <tqlabel.h>
diff --git a/examples/mdi/application.cpp b/examples/mdi/application.cpp
index 458b8e751..f339e8839 100644
--- a/examples/mdi/application.cpp
+++ b/examples/mdi/application.cpp
@@ -23,7 +23,7 @@
 #include <ntqmessagebox.h>
 #include <tqprinter.h>
 #include <ntqapplication.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <ntqaccel.h>
 #include <tqtextstream.h>
 #include <tqtextedit.h>
diff --git a/examples/movies/main.cpp b/examples/movies/main.cpp
index 40fe25c4e..50249b93f 100644
--- a/examples/movies/main.cpp
+++ b/examples/movies/main.cpp
@@ -9,7 +9,7 @@
 
 #include <ntqapplication.h>
 #include <tqfiledialog.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqlabel.h>
 #include <tqpainter.h>
 #include <ntqmessagebox.h>
diff --git a/examples/network/clientserver/client/client.cpp b/examples/network/clientserver/client/client.cpp
index 5d7eed62d..2a8b6b3e0 100644
--- a/examples/network/clientserver/client/client.cpp
+++ b/examples/network/clientserver/client/client.cpp
@@ -12,9 +12,9 @@
 #include <ntqvbox.h>
 #include <ntqhbox.h>
 #include <tqtextview.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
 #include <tqlabel.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqtextstream.h>
 
 
diff --git a/examples/network/clientserver/server/server.cpp b/examples/network/clientserver/server/server.cpp
index 0550e92fa..c2d53255b 100644
--- a/examples/network/clientserver/server/server.cpp
+++ b/examples/network/clientserver/server/server.cpp
@@ -13,7 +13,7 @@
 #include <ntqvbox.h>
 #include <tqtextview.h>
 #include <tqlabel.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqtextstream.h>
 
 #include <stdlib.h>
diff --git a/examples/network/ftpclient/ftpmainwindow.ui.h b/examples/network/ftpclient/ftpmainwindow.ui.h
index 0c32d1ad9..603ca1479 100644
--- a/examples/network/ftpclient/ftpmainwindow.ui.h
+++ b/examples/network/ftpclient/ftpmainwindow.ui.h
@@ -19,8 +19,8 @@
 *****************************************************************************/
 
 #include <tqftp.h>
-#include <ntqlineedit.h>
-#include <ntqspinbox.h>
+#include <tqlineedit.h>
+#include <tqspinbox.h>
 #include <tqstatusbar.h>
 #include <ntqmessagebox.h>
 #include <tqfiledialog.h>
diff --git a/examples/network/httpd/httpd.cpp b/examples/network/httpd/httpd.cpp
index 448f87c2e..db01925e8 100644
--- a/examples/network/httpd/httpd.cpp
+++ b/examples/network/httpd/httpd.cpp
@@ -16,7 +16,7 @@
 #include <ntqvbox.h>
 #include <tqlabel.h>
 #include <tqtextview.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 
 // HttpDaemon is the the class that implements the simple HTTP server.
 class HttpDaemon : public TQServerSocket
diff --git a/examples/network/infoprotocol/infoclient/client.cpp b/examples/network/infoprotocol/infoclient/client.cpp
index 114296bc4..857c4924c 100644
--- a/examples/network/infoprotocol/infoclient/client.cpp
+++ b/examples/network/infoprotocol/infoclient/client.cpp
@@ -10,9 +10,9 @@
 #include <tqsocket.h>
 #include <ntqapplication.h>
 #include <tqtextedit.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
 #include <tqlabel.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqtextstream.h>
 #include <ntqlistbox.h>
 
diff --git a/examples/network/infoprotocol/infoserver/server.cpp b/examples/network/infoprotocol/infoserver/server.cpp
index a651d38a9..509a55623 100644
--- a/examples/network/infoprotocol/infoserver/server.cpp
+++ b/examples/network/infoprotocol/infoserver/server.cpp
@@ -8,7 +8,7 @@
 *****************************************************************************/
 
 #include <tqtextview.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqtextstream.h>
 #include <ntqapplication.h>
 #include <ntqmessagebox.h>
diff --git a/examples/network/infoprotocol/infourlclient/client.cpp b/examples/network/infoprotocol/infourlclient/client.cpp
index ee1a85c85..29afa91c8 100644
--- a/examples/network/infoprotocol/infourlclient/client.cpp
+++ b/examples/network/infoprotocol/infourlclient/client.cpp
@@ -9,7 +9,7 @@
 
 #include <ntqapplication.h>
 #include <tqtextedit.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqfiledialog.h>
 
 #include "qip.h"
diff --git a/examples/network/mail/composer.cpp b/examples/network/mail/composer.cpp
index 790a47153..603a0a84a 100644
--- a/examples/network/mail/composer.cpp
+++ b/examples/network/mail/composer.cpp
@@ -10,9 +10,9 @@
 #include "composer.h"
 #include "smtp.h"
 
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
 #include <ntqmultilineedit.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqlabel.h>
 #include <ntqlayout.h>
 
diff --git a/examples/network/networkprotocol/view.cpp b/examples/network/networkprotocol/view.cpp
index 55de084a6..416fe04d4 100644
--- a/examples/network/networkprotocol/view.cpp
+++ b/examples/network/networkprotocol/view.cpp
@@ -10,7 +10,7 @@
 #include "view.h"
 
 #include <tqlabel.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <ntqmultilineedit.h>
 #include <tqfiledialog.h>
 
diff --git a/examples/network/remotecontrol/remotectrlimpl.cpp b/examples/network/remotecontrol/remotectrlimpl.cpp
index e92aef67d..70e5f7965 100644
--- a/examples/network/remotecontrol/remotectrlimpl.cpp
+++ b/examples/network/remotecontrol/remotectrlimpl.cpp
@@ -1,7 +1,7 @@
 #include "remotectrlimpl.h"
 
-#include <ntqpushbutton.h>
-#include <ntqlineedit.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
 #include <tqsocket.h>
 #include <tqfiledialog.h>
 #include <tqcolordialog.h>
diff --git a/examples/opengl/box/globjwin.cpp b/examples/opengl/box/globjwin.cpp
index 8a8c62047..5bc52fb99 100644
--- a/examples/opengl/box/globjwin.cpp
+++ b/examples/opengl/box/globjwin.cpp
@@ -7,8 +7,8 @@
 **
 *****************************************************************************/
 
-#include <ntqpushbutton.h>
-#include <ntqslider.h>
+#include <tqpushbutton.h>
+#include <tqslider.h>
 #include <ntqlayout.h>
 #include <ntqframe.h>
 #include <tqmenubar.h>
diff --git a/examples/opengl/glpixmap/globjwin.cpp b/examples/opengl/glpixmap/globjwin.cpp
index 568117793..52ab136dd 100644
--- a/examples/opengl/glpixmap/globjwin.cpp
+++ b/examples/opengl/glpixmap/globjwin.cpp
@@ -14,8 +14,8 @@
 ****************************************************************************/
 
 
-#include <ntqpushbutton.h>
-#include <ntqslider.h>
+#include <tqpushbutton.h>
+#include <tqslider.h>
 #include <ntqlayout.h>
 #include <ntqframe.h>
 #include <tqlabel.h>
diff --git a/examples/opengl/overlay_x11/README b/examples/opengl/overlay_x11/README
index 00b0f6454..d6afecfdc 100644
--- a/examples/opengl/overlay_x11/README
+++ b/examples/opengl/overlay_x11/README
@@ -71,4 +71,4 @@ for what you want. This way, the normal TQt widgets can be used as
 overlays for fancy effects: just create a palette for them with the
 transparent color for the wanted color roles, e.g. Background and
 Base, in the Normal and/or Active modes. This way, you can create
-see-through QPushButtons etc.
+see-through TQPushButtons etc.
diff --git a/examples/opengl/overlay_x11/overlay_x11.doc b/examples/opengl/overlay_x11/overlay_x11.doc
index d38bff08c..844621779 100644
--- a/examples/opengl/overlay_x11/overlay_x11.doc
+++ b/examples/opengl/overlay_x11/overlay_x11.doc
@@ -76,7 +76,7 @@ transparent color for what you want. This way, the normal TQt widgets
 can be used as overlays for fancy effects. Just create a palette for
 them with the transparent color for the relevant color roles, e.g.
 Background and Base, in the Normal and/or Active modes. This way, you
-can create see-through QPushButtons etc.
+can create see-through TQPushButtons etc.
 \endlist
 
 */
diff --git a/examples/opengl/sharedbox/globjwin.cpp b/examples/opengl/sharedbox/globjwin.cpp
index 576b17711..6d832453d 100644
--- a/examples/opengl/sharedbox/globjwin.cpp
+++ b/examples/opengl/sharedbox/globjwin.cpp
@@ -7,8 +7,8 @@
 **
 *****************************************************************************/
 
-#include <ntqpushbutton.h>
-#include <ntqslider.h>
+#include <tqpushbutton.h>
+#include <tqslider.h>
 #include <ntqlayout.h>
 #include <ntqframe.h>
 #include <tqmenubar.h>
diff --git a/examples/opengl/texture/globjwin.cpp b/examples/opengl/texture/globjwin.cpp
index 65ee40225..f09974149 100644
--- a/examples/opengl/texture/globjwin.cpp
+++ b/examples/opengl/texture/globjwin.cpp
@@ -7,8 +7,8 @@
 **
 *****************************************************************************/
 
-#include <ntqpushbutton.h>
-#include <ntqslider.h>
+#include <tqpushbutton.h>
+#include <tqslider.h>
 #include <ntqlayout.h>
 #include <ntqframe.h>
 #include <tqmenubar.h>
diff --git a/examples/popup/popup.h b/examples/popup/popup.h
index 6145b2139..819ca1e2f 100644
--- a/examples/popup/popup.h
+++ b/examples/popup/popup.h
@@ -14,8 +14,8 @@
 #ifndef POPUP_H
 #define POPUP_H
 #include <tqlabel.h>
-#include <ntqpushbutton.h>
-#include <ntqlineedit.h>
+#include <tqpushbutton.h>
+#include <tqlineedit.h>
 
 class FancyPopup : public TQLabel
 {
diff --git a/examples/process/process.cpp b/examples/process/process.cpp
index 364e1a135..80730700a 100644
--- a/examples/process/process.cpp
+++ b/examples/process/process.cpp
@@ -11,7 +11,7 @@
 #include <tqprocess.h>
 #include <ntqvbox.h>
 #include <tqtextview.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <ntqapplication.h>
 #include <ntqmessagebox.h>
 
diff --git a/examples/progressbar/progressbar.cpp b/examples/progressbar/progressbar.cpp
index dfe2d70a7..c321ade9e 100644
--- a/examples/progressbar/progressbar.cpp
+++ b/examples/progressbar/progressbar.cpp
@@ -9,8 +9,8 @@
 
 #include "progressbar.h"
 
-#include <ntqradiobutton.h>
-#include <ntqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqpushbutton.h>
 #include <ntqprogressbar.h>
 #include <ntqlayout.h>
 
diff --git a/examples/qfd/fontdisplayer.cpp b/examples/qfd/fontdisplayer.cpp
index d690d155a..6d6de8c26 100644
--- a/examples/qfd/fontdisplayer.cpp
+++ b/examples/qfd/fontdisplayer.cpp
@@ -9,13 +9,13 @@
 
 #include "fontdisplayer.h"
 #include <ntqapplication.h>
-#include <ntqslider.h>
-#include <ntqspinbox.h>
+#include <tqslider.h>
+#include <tqspinbox.h>
 #include <tqpainter.h>
 #include <tqtoolbar.h>
 #include <tqstatusbar.h>
 #include <tqlabel.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqfontdialog.h>
 #include <stdlib.h>
 
diff --git a/examples/qfd/qfd.cpp b/examples/qfd/qfd.cpp
index 752a59e99..d5e3dd84d 100644
--- a/examples/qfd/qfd.cpp
+++ b/examples/qfd/qfd.cpp
@@ -10,7 +10,7 @@
 #include "fontdisplayer.h"
 
 #include <ntqapplication.h>
-#include <ntqslider.h>
+#include <tqslider.h>
 #include <tqpainter.h>
 #include <tqstatusbar.h>
 
diff --git a/examples/qmag/qmag.cpp b/examples/qmag/qmag.cpp
index c6b810c77..efca57ef7 100644
--- a/examples/qmag/qmag.cpp
+++ b/examples/qmag/qmag.cpp
@@ -7,8 +7,8 @@
 **
 *****************************************************************************/
 
-#include <ntqcombobox.h>
-#include <ntqpushbutton.h>
+#include <tqcombobox.h>
+#include <tqpushbutton.h>
 #include <tqpixmap.h>
 #include <tqimage.h>
 #include <tqlabel.h>
diff --git a/examples/rangecontrols/rangecontrols.cpp b/examples/rangecontrols/rangecontrols.cpp
index 808a2ec0d..a7d331ee3 100644
--- a/examples/rangecontrols/rangecontrols.cpp
+++ b/examples/rangecontrols/rangecontrols.cpp
@@ -10,12 +10,12 @@
 #include "rangecontrols.h"
 
 #include <ntqhbox.h>
-#include <ntqlcdnumber.h>
-#include <ntqspinbox.h>
+#include <tqlcdnumber.h>
+#include <tqspinbox.h>
 #include <tqlabel.h>
 #include <tqstring.h>
-#include <ntqslider.h>
-#include <ntqcheckbox.h>
+#include <tqslider.h>
+#include <tqcheckbox.h>
 
 #include <limits.h>
 
diff --git a/examples/regexptester/regexptester.cpp b/examples/regexptester/regexptester.cpp
index 13c6ca0e6..6942e64ec 100644
--- a/examples/regexptester/regexptester.cpp
+++ b/examples/regexptester/regexptester.cpp
@@ -1,10 +1,10 @@
 #include <ntqapplication.h>
-#include <ntqcheckbox.h>
+#include <tqcheckbox.h>
 #include <tqclipboard.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
 #include <tqlabel.h>
 #include <ntqlayout.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqregexp.h>
 #include <tqstatusbar.h>
 #include <ntqtable.h>
diff --git a/examples/regexptester/regexptester.h b/examples/regexptester/regexptester.h
index d3256f556..0dbb50d05 100644
--- a/examples/regexptester/regexptester.h
+++ b/examples/regexptester/regexptester.h
@@ -1,7 +1,7 @@
 #ifndef REGEXPTESTER_H
 #define REGEXPTESTER_H
 
-#include <ntqdialog.h>
+#include <tqdialog.h>
 
 class TQCheckBox;
 class TQComboBox;
diff --git a/examples/richtext/richtext.cpp b/examples/richtext/richtext.cpp
index 6cf45e048..9a97228bb 100644
--- a/examples/richtext/richtext.cpp
+++ b/examples/richtext/richtext.cpp
@@ -11,7 +11,7 @@
 
 #include <ntqhbox.h>
 #include <ntqhbox.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqtextview.h>
 #include <tqbrush.h>
 #include <ntqapplication.h>
diff --git a/examples/rot13/rot13.cpp b/examples/rot13/rot13.cpp
index dfcc5d684..e64323664 100644
--- a/examples/rot13/rot13.cpp
+++ b/examples/rot13/rot13.cpp
@@ -10,7 +10,7 @@
 #include "rot13.h"
 
 #include <ntqmultilineedit.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <ntqapplication.h>
 #include <ntqlayout.h>
 
diff --git a/examples/scribble/scribble.cpp b/examples/scribble/scribble.cpp
index 39b110014..a5f4dce94 100644
--- a/examples/scribble/scribble.cpp
+++ b/examples/scribble/scribble.cpp
@@ -14,7 +14,7 @@
 #include <tqpainter.h>
 #include <tqtoolbar.h>
 #include <tqtoolbutton.h>
-#include <ntqspinbox.h>
+#include <tqspinbox.h>
 #include <tqtooltip.h>
 #include <tqrect.h>
 #include <tqpoint.h>
diff --git a/examples/scrollview/README b/examples/scrollview/README
index 3bdaa7def..e07df00ce 100644
--- a/examples/scrollview/README
+++ b/examples/scrollview/README
@@ -1,3 +1,3 @@
-This example demonstrates the use of QScrollView for displaying large
-widgets.  Both techniques are demonstrated: using QScrollView to scroll
-around a large widget, and drawing arbitrary material in a QScrollView.
+This example demonstrates the use of TQScrollView for displaying large
+widgets.  Both techniques are demonstrated: using TQScrollView to scroll
+around a large widget, and drawing arbitrary material in a TQScrollView.
diff --git a/examples/scrollview/scrollview.cpp b/examples/scrollview/scrollview.cpp
index bfaa81f69..c1d444ba3 100644
--- a/examples/scrollview/scrollview.cpp
+++ b/examples/scrollview/scrollview.cpp
@@ -7,11 +7,11 @@
 **
 *****************************************************************************/
 
-#include <ntqscrollview.h>
+#include <tqscrollview.h>
 #include <ntqapplication.h>
 #include <tqmenubar.h>
 #include <tqpopupmenu.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <ntqmessagebox.h>
diff --git a/examples/showimg/imagetexteditor.cpp b/examples/showimg/imagetexteditor.cpp
index cbc09cfdb..d69ef74dd 100644
--- a/examples/showimg/imagetexteditor.cpp
+++ b/examples/showimg/imagetexteditor.cpp
@@ -13,12 +13,12 @@
 #include <ntqgrid.h>
 #include <ntqvbox.h>
 #include <ntqhbox.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
 #include <ntqmultilineedit.h>
 #include <tqlabel.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
 #include <ntqlistbox.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 
 
 ImageTextEditor::ImageTextEditor( TQImage& i, TQWidget *parent, const char *name, WFlags f ) :
diff --git a/examples/showimg/imagetexteditor.h b/examples/showimg/imagetexteditor.h
index 21664d278..7cc5c2489 100644
--- a/examples/showimg/imagetexteditor.h
+++ b/examples/showimg/imagetexteditor.h
@@ -10,7 +10,7 @@
 #ifndef IMAGETEXTEDITOR_H
 #define IMAGETEXTEDITOR_H
 
-#include <ntqdialog.h>
+#include <tqdialog.h>
 
 class TQImage;
 class TQComboBox;
diff --git a/examples/sql/overview/custom1/main.h b/examples/sql/overview/custom1/main.h
index c3c65a626..488c34bbc 100644
--- a/examples/sql/overview/custom1/main.h
+++ b/examples/sql/overview/custom1/main.h
@@ -8,11 +8,11 @@
 *****************************************************************************/
 
 #include <ntqapplication.h>
-#include <ntqdialog.h>
+#include <tqdialog.h>
 #include <tqlabel.h>
 #include <ntqlayout.h>
-#include <ntqlineedit.h>
-#include <ntqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
 #include <tqsqldatabase.h>
 #include <tqsqlcursor.h>
 #include <tqsqlform.h>
diff --git a/examples/sql/overview/form1/main.cpp b/examples/sql/overview/form1/main.cpp
index 5f3dd8f2e..cf3cb2895 100644
--- a/examples/sql/overview/form1/main.cpp
+++ b/examples/sql/overview/form1/main.cpp
@@ -8,10 +8,10 @@
 *****************************************************************************/
 
 #include <ntqapplication.h>
-#include <ntqdialog.h>
+#include <tqdialog.h>
 #include <tqlabel.h>
 #include <ntqlayout.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
 #include <tqsqldatabase.h>
 #include <tqsqlcursor.h>
 #include <tqsqlform.h>
diff --git a/examples/sql/overview/form2/main.h b/examples/sql/overview/form2/main.h
index 42d152d41..d4a4f58b2 100644
--- a/examples/sql/overview/form2/main.h
+++ b/examples/sql/overview/form2/main.h
@@ -8,11 +8,11 @@
 *****************************************************************************/
 
 #include <ntqapplication.h>
-#include <ntqdialog.h>
+#include <tqdialog.h>
 #include <tqlabel.h>
 #include <ntqlayout.h>
-#include <ntqlineedit.h>
-#include <ntqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
 #include <tqsqldatabase.h>
 #include <tqsqlcursor.h>
 #include <tqsqlform.h>
diff --git a/examples/sql/overview/table3/main.h b/examples/sql/overview/table3/main.h
index 37efecfe8..b93e94b1d 100644
--- a/examples/sql/overview/table3/main.h
+++ b/examples/sql/overview/table3/main.h
@@ -8,7 +8,7 @@
 *****************************************************************************/
 
 #include <ntqapplication.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
 #include <tqmap.h>
 #include <tqsqldatabase.h>
 #include <tqsqlcursor.h>
diff --git a/examples/sql/overview/table4/main.h b/examples/sql/overview/table4/main.h
index d4e84d2ce..46cbdc71d 100644
--- a/examples/sql/overview/table4/main.h
+++ b/examples/sql/overview/table4/main.h
@@ -8,7 +8,7 @@
 *****************************************************************************/
 
 #include <ntqapplication.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
 #include <tqmap.h>
 #include <tqpainter.h>
 #include <tqsqldatabase.h>
diff --git a/examples/tabdialog/tabdialog.cpp b/examples/tabdialog/tabdialog.cpp
index 129013827..a001bdefa 100644
--- a/examples/tabdialog/tabdialog.cpp
+++ b/examples/tabdialog/tabdialog.cpp
@@ -11,10 +11,10 @@
 
 #include <ntqvbox.h>
 #include <tqlabel.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
 #include <tqdatetime.h>
 #include <ntqbuttongroup.h>
-#include <ntqcheckbox.h>
+#include <tqcheckbox.h>
 #include <ntqlistbox.h>
 #include <ntqapplication.h>
 
diff --git a/examples/table/statistics/statistics.cpp b/examples/table/statistics/statistics.cpp
index c74270336..8a906a324 100644
--- a/examples/table/statistics/statistics.cpp
+++ b/examples/table/statistics/statistics.cpp
@@ -12,7 +12,7 @@
 #include <tqdir.h>
 #include <tqstringlist.h>
 #include <ntqheader.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
 #include <stdlib.h>
 
 const char* dirs[] = {
diff --git a/examples/table/statistics/statistics.h b/examples/table/statistics/statistics.h
index abc15cf8d..21d248a7c 100644
--- a/examples/table/statistics/statistics.h
+++ b/examples/table/statistics/statistics.h
@@ -11,7 +11,7 @@
 #define STATISTICS_H
 
 #include <ntqtable.h>
-#include <ntqcombobox.h>
+#include <tqcombobox.h>
 
 class TableItem : public TQTableItem
 {
diff --git a/examples/tablet/scribble.cpp b/examples/tablet/scribble.cpp
index 800fb4033..f19c91254 100644
--- a/examples/tablet/scribble.cpp
+++ b/examples/tablet/scribble.cpp
@@ -15,7 +15,7 @@
 #include <tqpainter.h>
 #include <tqtoolbar.h>
 #include <tqtoolbutton.h>
-#include <ntqspinbox.h>
+#include <tqspinbox.h>
 #include <tqtooltip.h>
 #include <tqrect.h>
 #include <tqpoint.h>
diff --git a/examples/tetrix/README b/examples/tetrix/README
index 148260a71..cf2cb3fb7 100644
--- a/examples/tetrix/README
+++ b/examples/tetrix/README
@@ -5,7 +5,7 @@ fact the first TQt application and was written at a time when TQt only
 had pushbutton widgets and the drawing engine was limited to drawing
 text in a single font and drawing lines (no kidding, those were the
 only two drawing operations). In fact the tetrix project doubled the
-number of widgets in TQt by introducing the QLCDNumber widget. The whole
+number of widgets in TQt by introducing the TQLCDNumber widget. The whole
 application was written in 5 evenings and 1 weekend and is not very
 well documented. The tetrix engine is implemented in the GenericTetrix
 class and was first made on my good old 10 MHZ AT where I made a DOS
diff --git a/examples/tetrix/qtetrix.h b/examples/tetrix/qtetrix.h
index b831f96dd..f3cfddc71 100644
--- a/examples/tetrix/qtetrix.h
+++ b/examples/tetrix/qtetrix.h
@@ -12,9 +12,9 @@
 
 #include "qtetrixb.h"
 #include <ntqframe.h>
-#include <ntqlcdnumber.h>
+#include <tqlcdnumber.h>
 #include <tqlabel.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqpainter.h>
 
 
diff --git a/examples/textedit/textedit.cpp b/examples/textedit/textedit.cpp
index ed626896d..33472c451 100644
--- a/examples/textedit/textedit.cpp
+++ b/examples/textedit/textedit.cpp
@@ -17,8 +17,8 @@
 #include <ntqtabwidget.h>
 #include <ntqapplication.h>
 #include <tqfontdatabase.h>
-#include <ntqcombobox.h>
-#include <ntqlineedit.h>
+#include <tqcombobox.h>
+#include <tqlineedit.h>
 #include <tqfileinfo.h>
 #include <tqfile.h>
 #include <tqfiledialog.h>
diff --git a/examples/themes/metal.cpp b/examples/themes/metal.cpp
index 02ec1c4ad..557edf7c7 100644
--- a/examples/themes/metal.cpp
+++ b/examples/themes/metal.cpp
@@ -12,7 +12,7 @@
 #ifndef TQT_NO_STYLE_WINDOWS
 
 #include "ntqapplication.h"
-#include "ntqcombobox.h"
+#include "tqcombobox.h"
 #include "tqpainter.h"
 #include "ntqdrawutil.h" // for now
 #include "tqpixmap.h" // for now
@@ -20,11 +20,11 @@
 #include "tqwidget.h"
 #include "tqlabel.h"
 #include "tqimage.h"
-#include "ntqpushbutton.h"
+#include "tqpushbutton.h"
 #include "tqwidget.h"
 #include "ntqrangecontrol.h"
-#include "ntqscrollbar.h"
-#include "ntqslider.h"
+#include "tqscrollbar.h"
+#include "tqslider.h"
 #include <limits.h>
 
 
diff --git a/examples/themes/wood.cpp b/examples/themes/wood.cpp
index 891cf2bf5..a217cebad 100644
--- a/examples/themes/wood.cpp
+++ b/examples/themes/wood.cpp
@@ -12,7 +12,7 @@
 #ifndef TQT_NO_STYLE_WINDOWS
 
 #include "ntqapplication.h"
-#include "ntqcombobox.h"
+#include "tqcombobox.h"
 #include "tqpainter.h"
 #include "ntqdrawutil.h" // for now
 #include "tqpixmap.h" // for now
@@ -20,10 +20,10 @@
 #include "tqwidget.h"
 #include "tqlabel.h"
 #include "tqimage.h"
-#include "ntqpushbutton.h"
+#include "tqpushbutton.h"
 #include "tqwidget.h"
 #include "ntqrangecontrol.h"
-#include "ntqscrollbar.h"
+#include "tqscrollbar.h"
 #include <limits.h>
 #include "tqstylefactory.h"
 
diff --git a/examples/thread/prodcons/prodcons.cpp b/examples/thread/prodcons/prodcons.cpp
index 28532b5aa..6e63c1432 100644
--- a/examples/thread/prodcons/prodcons.cpp
+++ b/examples/thread/prodcons/prodcons.cpp
@@ -3,8 +3,8 @@
 #include <tqmutex.h>
 #include <ntqapplication.h>
 #include <tqwidget.h>
-#include <ntqpushbutton.h>
-#include <ntqcheckbox.h>
+#include <tqpushbutton.h>
+#include <tqcheckbox.h>
 #include <ntqprogressbar.h>
 #include <ntqlayout.h>
 #include <tqevent.h>
diff --git a/examples/thread/semaphores/main.cpp b/examples/thread/semaphores/main.cpp
index d7e481c6f..8b7916f26 100644
--- a/examples/thread/semaphores/main.cpp
+++ b/examples/thread/semaphores/main.cpp
@@ -8,7 +8,7 @@
 *****************************************************************************/
 #include <ntqapplication.h>
 #include <tqwidget.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <ntqmultilineedit.h>
 #include <tqthread.h>
 #include <tqsemaphore.h>
diff --git a/examples/tictac/tictac.cpp b/examples/tictac/tictac.cpp
index cb2d1a465..5f7f66184 100644
--- a/examples/tictac/tictac.cpp
+++ b/examples/tictac/tictac.cpp
@@ -11,8 +11,8 @@
 #include <ntqapplication.h>
 #include <tqpainter.h>
 #include <ntqdrawutil.h>
-#include <ntqcombobox.h>
-#include <ntqcheckbox.h>
+#include <tqcombobox.h>
+#include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <ntqlayout.h>
 #include <stdlib.h>				// rand() function
diff --git a/examples/tictac/tictac.h b/examples/tictac/tictac.h
index ceb7fc506..b14820281 100644
--- a/examples/tictac/tictac.h
+++ b/examples/tictac/tictac.h
@@ -11,7 +11,7 @@
 #define TICTAC_H
 
 
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqptrvector.h>
 
 class TQComboBox;
diff --git a/examples/toplevel/toplevel.doc b/examples/toplevel/toplevel.doc
index 1487f74b4..f65adc546 100644
--- a/examples/toplevel/toplevel.doc
+++ b/examples/toplevel/toplevel.doc
@@ -90,7 +90,7 @@
   \printto cbBehaviorTool
   A modal widget blocks input to other toplevel widgets, unless 
   those are in a different modal group (see \c WGroupLeader).
-  Dialogs are often modal, and the QDialog class provides an easy API
+  Dialogs are often modal, and the TQDialog class provides an easy API
   to create and display them without the need to explicitly use this
   flag.
 
diff --git a/examples/tqdir/tqdir.cpp b/examples/tqdir/tqdir.cpp
index 4bf715278..cd427a9c6 100644
--- a/examples/tqdir/tqdir.cpp
+++ b/examples/tqdir/tqdir.cpp
@@ -16,14 +16,14 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <ntqhbox.h>
-#include <ntqspinbox.h>
+#include <tqspinbox.h>
 #include <tqlabel.h>
 #include <ntqmultilineedit.h>
 #include <ntqheader.h>
 #include <tqevent.h>
 #include <tqpainter.h>
 #include <tqpopupmenu.h>
-#include <ntqpushbutton.h>
+#include <tqpushbutton.h>
 #include <tqtoolbutton.h>
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/examples/tqdir/tqdir.h b/examples/tqdir/tqdir.h
index 6362644b2..be76dfaea 100644
--- a/examples/tqdir/tqdir.h
+++ b/examples/tqdir/tqdir.h
@@ -10,7 +10,7 @@
 #ifndef TQDIREXAMPLE_H
 #define TQDIREXAMPLE_H
 
-#include <ntqscrollview.h>
+#include <tqscrollview.h>
 #include <tqfiledialog.h>
 #include <tqwidgetstack.h>
 #include <ntqvbox.h>
diff --git a/examples/widgets/widgets.cpp b/examples/widgets/widgets.cpp
index 2872ddf3b..2f4e20042 100644
--- a/examples/widgets/widgets.cpp
+++ b/examples/widgets/widgets.cpp
@@ -18,20 +18,20 @@
 #include <tqmenubar.h>
 #include <tqpopupmenu.h>
 #include <ntqbuttongroup.h>
-#include <ntqcheckbox.h>
-#include <ntqcombobox.h>
+#include <tqcheckbox.h>
+#include <tqcombobox.h>
 #include <ntqframe.h>
 #include <ntqgroupbox.h>
 #include <tqlabel.h>
-#include <ntqlcdnumber.h>
+#include <tqlcdnumber.h>
 #include <ntqmultilineedit.h>
-#include <ntqlineedit.h>
+#include <tqlineedit.h>
 #include <ntqlistbox.h>
-#include <ntqpushbutton.h>
-#include <ntqradiobutton.h>
-#include <ntqslider.h>
+#include <tqpushbutton.h>
+#include <tqradiobutton.h>
+#include <tqslider.h>
 #include <tqtooltip.h>
-#include <ntqspinbox.h>
+#include <tqspinbox.h>
 #include <tqstatusbar.h>
 #include <tqwhatsthis.h>
 #include <tqtoolbutton.h>
diff --git a/examples/wizard/wizard.cpp b/examples/wizard/wizard.cpp
index ad8aab9d1..c0fbf5041 100644
--- a/examples/wizard/wizard.cpp
+++ b/examples/wizard/wizard.cpp
@@ -13,8 +13,8 @@
 #include <ntqhbox.h>
 #include <ntqvbox.h>
 #include <tqlabel.h>
-#include <ntqlineedit.h>
-#include <ntqpushbutton.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
 #include <ntqvalidator.h>
 #include <ntqapplication.h>
 
diff --git a/examples/xform/xform.cpp b/examples/xform/xform.cpp
index 602a90855..e69224c67 100644
--- a/examples/xform/xform.cpp
+++ b/examples/xform/xform.cpp
@@ -9,15 +9,15 @@
 
 #include <ntqapplication.h>
 
-#include <ntqdialog.h>
+#include <tqdialog.h>
 #include <tqlabel.h>
-#include <ntqlineedit.h>
-#include <ntqpushbutton.h>
-#include <ntqcheckbox.h>
-#include <ntqradiobutton.h>
+#include <tqlineedit.h>
+#include <tqpushbutton.h>
+#include <tqcheckbox.h>
+#include <tqradiobutton.h>
 #include <ntqbuttongroup.h>
-#include <ntqlcdnumber.h>
-#include <ntqslider.h>
+#include <tqlcdnumber.h>
+#include <tqslider.h>
 #include <tqmenubar.h>
 #include <tqfontdialog.h>
 #include <ntqlayout.h>
-- 
cgit v1.2.1