Rename graphics class nt* related files to equivalent tq* (part 2)

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

83 files changed, 130 insertions, 130 deletions

diff --git a/examples/README b/examples/README
index 7ca50168d..d95703fbe 100644
--- a/examples/README
+++ b/examples/README
@@ -95,7 +95,7 @@ dragdrop
 drawdemo
     Draws a color wheel, text and shapes. This example demonstrates
     several drawing functions and printer output using TQPainter,
-    QWMatrix, TQFont, TQFontMetrics, TQColor, TQBrush, and QPrinter. You
+    TQWMatrix, TQFont, TQFontMetrics, TQColor, TQBrush, and TQPrinter. You
     can easily add you own drawing functions. See "ourDrawFunctions".
 
 drawlines
@@ -225,20 +225,20 @@ network/remotecontrol
     Controlling one application from another using TQSocket-based IPC.
 
 opengl/box
-    Shows how to use OpenGL in TQt using QGLWidget.
+    Shows how to use OpenGL in TQt using TQGLWidget.
 
 opengl/gear
     Shows how to build OpenGL display lists.
 
 opengl/glpixmap
     This is based on the box example. It shows how to render an OpenGL
-    scene into a QPixmap.
+    scene into a TQPixmap.
 
 opengl/overlay
     Demonstrates the use of OpenGL overlays (where supported).
 
 opengl/sharedbox
-    Demonstrates how to share OpenGL display lists with QGLWidgets.
+    Demonstrates how to share OpenGL display lists with TQGLWidgets.
 
 opengl/texture
     Shows how to use OpenGL textures.
@@ -392,7 +392,7 @@ wizard
 
 xform
     Demonstrates how to arbitrarily rotate, shear and scale text and
-    graphics using QWMatrix.
+    graphics using TQWMatrix.
 
 xml/outliner
     Shows how to read in an XML file using Qt's DOM classes and
diff --git a/examples/action/application.cpp b/examples/action/application.cpp
index 82f39c5aa..0a6502a41 100644
--- a/examples/action/application.cpp
+++ b/examples/action/application.cpp
@@ -10,7 +10,7 @@
 #include "application.h"
 
 #include <tqimage.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqtoolbar.h>
 #include <tqtoolbutton.h>
 #include <tqpopupmenu.h>
@@ -20,7 +20,7 @@
 #include <tqfiledialog.h>
 #include <tqstatusbar.h>
 #include <ntqmessagebox.h>
-#include <ntqprinter.h>
+#include <tqprinter.h>
 #include <ntqapplication.h>
 #include <ntqaccel.h>
 #include <tqtextstream.h>
diff --git a/examples/application/application.cpp b/examples/application/application.cpp
index 7f27683c0..e1385fdff 100644
--- a/examples/application/application.cpp
+++ b/examples/application/application.cpp
@@ -10,7 +10,7 @@
 #include "application.h"
 
 #include <tqimage.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqtoolbar.h>
 #include <tqtoolbutton.h>
 #include <tqpopupmenu.h>
@@ -20,7 +20,7 @@
 #include <tqfiledialog.h>
 #include <tqstatusbar.h>
 #include <ntqmessagebox.h>
-#include <ntqprinter.h>
+#include <tqprinter.h>
 #include <ntqapplication.h>
 #include <ntqaccel.h>
 #include <tqtextstream.h>
diff --git a/examples/biff/biff.h b/examples/biff/biff.h
index fa8afef43..26495881a 100644
--- a/examples/biff/biff.h
+++ b/examples/biff/biff.h
@@ -12,7 +12,7 @@
 
 #include <tqwidget.h>
 #include <tqdatetime.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 
 
 class Biff : public TQWidget
diff --git a/examples/canvas/canvas.cpp b/examples/canvas/canvas.cpp
index c93667a4d..a6d410db7 100644
--- a/examples/canvas/canvas.cpp
+++ b/examples/canvas/canvas.cpp
@@ -5,7 +5,7 @@
 #include <tqmenubar.h>
 #include <ntqapplication.h>
 #include <tqpainter.h>
-#include <ntqprinter.h>
+#include <tqprinter.h>
 #include <ntqlabel.h>
 #include <tqimage.h>
 #include <ntqprogressdialog.h>
diff --git a/examples/chart/canvasview.cpp b/examples/chart/canvasview.cpp
index 6640a19ae..cb1cc741b 100644
--- a/examples/chart/canvasview.cpp
+++ b/examples/chart/canvasview.cpp
@@ -2,7 +2,7 @@
 #include "chartform.h"
 
 #include <ntqcursor.h>
-#include <ntqpoint.h>
+#include <tqpoint.h>
 #include <tqpopupmenu.h>
 #include <tqstatusbar.h>
 
diff --git a/examples/chart/chartform.cpp b/examples/chart/chartform.cpp
index 7cd29138e..a36676214 100644
--- a/examples/chart/chartform.cpp
+++ b/examples/chart/chartform.cpp
@@ -12,9 +12,9 @@
 #include <tqfontdialog.h>
 #include <tqmenubar.h>
 #include <ntqmessagebox.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqpopupmenu.h>
-#include <ntqprinter.h>
+#include <tqprinter.h>
 #include <ntqradiobutton.h>
 #include <tqsettings.h>
 #include <ntqspinbox.h>
diff --git a/examples/chart/chartform_files.cpp b/examples/chart/chartform_files.cpp
index 95df7a10a..7c3feeb5d 100644
--- a/examples/chart/chartform_files.cpp
+++ b/examples/chart/chartform_files.cpp
@@ -4,7 +4,7 @@
 #include <tqfile.h>
 #include <tqfiledialog.h>
 #include <tqpainter.h>
-#include <ntqprinter.h>
+#include <tqprinter.h>
 #include <tqstatusbar.h>
 
 
diff --git a/examples/chart/setdataform.cpp b/examples/chart/setdataform.cpp
index 26eb1c16d..82bd2cad8 100644
--- a/examples/chart/setdataform.cpp
+++ b/examples/chart/setdataform.cpp
@@ -4,7 +4,7 @@
 #include <tqcolordialog.h>
 #include <ntqcombobox.h>
 #include <ntqlayout.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <ntqpushbutton.h>
 #include <ntqtable.h>
 
diff --git a/examples/demo/dnd/dnd.h b/examples/demo/dnd/dnd.h
index 3487d9cc9..b064b9c8f 100644
--- a/examples/demo/dnd/dnd.h
+++ b/examples/demo/dnd/dnd.h
@@ -1,4 +1,4 @@
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqmap.h>
 #include "dndbase.h"
 
diff --git a/examples/demo/dnd/styledbutton.cpp b/examples/demo/dnd/styledbutton.cpp
index 1a884704d..51e8968cf 100644
--- a/examples/demo/dnd/styledbutton.cpp
+++ b/examples/demo/dnd/styledbutton.cpp
@@ -34,11 +34,11 @@
 #include "styledbutton.h"
 
 #include <tqcolordialog.h>
-#include <ntqpalette.h>
+#include <tqpalette.h>
 #include <ntqlabel.h>
 #include <tqpainter.h>
 #include <tqimage.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <ntqapplication.h>
 #include <tqdragobject.h>
 #include <tqstyle.h>
diff --git a/examples/demo/dnd/styledbutton.h b/examples/demo/dnd/styledbutton.h
index 84ad4e500..fc6391a0b 100644
--- a/examples/demo/dnd/styledbutton.h
+++ b/examples/demo/dnd/styledbutton.h
@@ -35,7 +35,7 @@
 #define STYLEDBUTTON_H
 
 #include <ntqbutton.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 
 class TQColor;
 class TQBrush;
diff --git a/examples/demo/i18n/i18n.cpp b/examples/demo/i18n/i18n.cpp
index a089e6cca..1986189a8 100644
--- a/examples/demo/i18n/i18n.cpp
+++ b/examples/demo/i18n/i18n.cpp
@@ -10,7 +10,7 @@
 #include <tqmenubar.h>
 #include <tqtoolbar.h>
 #include <tqtoolbutton.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqiconset.h>
 #include <ntqapplication.h>
 #include <tqwidgetlist.h>
diff --git a/examples/demo/opengl/glcontrolwidget.h b/examples/demo/opengl/glcontrolwidget.h
index 7942c31ef..97cd129eb 100644
--- a/examples/demo/opengl/glcontrolwidget.h
+++ b/examples/demo/opengl/glcontrolwidget.h
@@ -1,7 +1,7 @@
 #ifndef GLCONTROLWIDGET_H
 #define GLCONTROLWIDGET_H
 
-#include <ntqgl.h>
+#include <tqgl.h>
 
 class GLControlWidget : public TQGLWidget
 {
diff --git a/examples/demo/opengl/glinfo_x11.cpp b/examples/demo/opengl/glinfo_x11.cpp
index 88761f3f6..2289adeba 100644
--- a/examples/demo/opengl/glinfo_x11.cpp
+++ b/examples/demo/opengl/glinfo_x11.cpp
@@ -8,7 +8,7 @@
 *****************************************************************************/
 
 #include <tqstringlist.h>
-#include <ntqgl.h>
+#include <tqgl.h>
 #include "glinfo.h"
 
 #include <GL/glx.h>
diff --git a/examples/demo/opengl/gllandscape.h b/examples/demo/opengl/gllandscape.h
index 54a03c012..5288b5eba 100644
--- a/examples/demo/opengl/gllandscape.h
+++ b/examples/demo/opengl/gllandscape.h
@@ -1,7 +1,7 @@
 #ifndef GLLANDSCAPE_H
 #define GLLANDSCAPE_H
 
-#include <ntqgl.h>
+#include <tqgl.h>
 
 class GLLandscape : public TQGLWidget
 {
diff --git a/examples/demo/opengl/glworkspace.cpp b/examples/demo/opengl/glworkspace.cpp
index ec2a6b138..6a2d7fe89 100644
--- a/examples/demo/opengl/glworkspace.cpp
+++ b/examples/demo/opengl/glworkspace.cpp
@@ -9,7 +9,7 @@
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
 #include <tqaction.h>
-#include <ntqprinter.h>
+#include <tqprinter.h>
 #include <tqpainter.h>
 #include <ntqcheckbox.h>
 #include <ntqvbox.h>
diff --git a/examples/demo/opengl/printpreview.ui b/examples/demo/opengl/printpreview.ui
index 064ff35e9..fe6130ba0 100644
--- a/examples/demo/opengl/printpreview.ui
+++ b/examples/demo/opengl/printpreview.ui
@@ -256,7 +256,7 @@
 </connections>
 <includes>
     <include location="global" impldecl="in declaration">tqimage.h</include>
-    <include location="global" impldecl="in declaration">ntqpixmap.h</include>
+    <include location="global" impldecl="in declaration">tqpixmap.h</include>
     <include location="local" impldecl="in implementation">printpreview.ui.h</include>
 </includes>
 <variables>
diff --git a/examples/demo/qthumbwheel.cpp b/examples/demo/qthumbwheel.cpp
index aba1fc4ee..ec6fc9e56 100644
--- a/examples/demo/qthumbwheel.cpp
+++ b/examples/demo/qthumbwheel.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_THUMBWHEEL
 #include <tqpainter.h>
 #include <ntqdrawutil.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <math.h>
 
 static const double m_pi = 3.14159265358979323846;
diff --git a/examples/demo/textdrawing/example.html b/examples/demo/textdrawing/example.html
index 3f215fd53..12d21ff72 100644
--- a/examples/demo/textdrawing/example.html
+++ b/examples/demo/textdrawing/example.html
@@ -74,7 +74,7 @@ key for another widget.
 <ul>
 <li> A plain text: set by passing a <a href="tqstring.html">TQString</a> to <a href="#dffb43">setText</a>().
 <li> A rich text: set by passing a TQString that contains a rich text to setText().
-<li> A pixmap: set by passing a <a href="ntqpixmap.html">TQPixmap</a> to <a href="#f3f301">setPixmap</a>().
+<li> A pixmap: set by passing a <a href="tqpixmap.html">TQPixmap</a> to <a href="#f3f301">setPixmap</a>().
 <li> A movie: set by passing a <a href="tqmovie.html">TQMovie</a> to <a href="#60de9f">setMovie</a>().
 <li> A number: set by passing an <em>int</em> or a <em>double</em> to <a href="#1a8f6a">setNum</a>(), which converts the number to plain text.
 <li> Nothing: The same as an empty plain text. This is the default. Set by <a href="#be73f3">clear</a>().
@@ -103,7 +103,7 @@ the other widget (called the TQLabel's "buddy"). Example:
 (the <a href="ntqlineedit.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="ntqpixmap.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="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>Examples:
  <a href="cursor-cursor-cpp.html#TQLabel">cursor/cursor.cpp</a>
  <a href="layout-layout-cpp.html#TQLabel">layout/layout.cpp</a>
@@ -175,7 +175,7 @@ available space.
 <p>If the label contains a movie, returns a pointer to it. Otherwise,
 returns 0.
 <p>See also  <a href="#60de9f">setMovie</a>().
-<h3 class="fn"><a href="ntqpixmap.html">TQPixmap</a> * <a name="101ecb"></a>TQLabel::pixmap () const</h3>
+<h3 class="fn"><a href="tqpixmap.html">TQPixmap</a> * <a name="101ecb"></a>TQLabel::pixmap () const</h3>
 <p>If the label contains a pixmap, returns a pointer to it. Otherwise,
 returns 0.
 <p>See also  <a href="#f3f301">setPixmap</a>().
@@ -273,7 +273,7 @@ the label. Any previous content is cleared.
 <p>The buddy accelerator, if any, is disabled.
 <p>The label resizes itself if auto-resizing is enabled.
 <p>See also  <a href="#dffb43">setText</a>(), <a href="tqstring.html#01d80b">TQString::setNum</a>() and <a href="#191701">setBuddy</a>().
-<h3 class="fn">void <a name="f3f301"></a>TQLabel::setPixmap ( const <a href="ntqpixmap.html">TQPixmap</a> &amp; pixmap ) <code>[virtual slot]</code></h3>
+<h3 class="fn">void <a name="f3f301"></a>TQLabel::setPixmap ( const <a href="tqpixmap.html">TQPixmap</a> &amp; pixmap ) <code>[virtual slot]</code></h3>
 <p>Sets the label contents to <em>pixmap.</em> Any previous content is cleared.
 <p>The buddy accelerator, if any, is disabled.
 <p>The label resizes itself if auto-resizing is enabled.
diff --git a/examples/demo/textdrawing/helpwindow.cpp b/examples/demo/textdrawing/helpwindow.cpp
index 13a538882..90ed211d4 100644
--- a/examples/demo/textdrawing/helpwindow.cpp
+++ b/examples/demo/textdrawing/helpwindow.cpp
@@ -9,7 +9,7 @@
 
 #include "helpwindow.h"
 #include <tqstatusbar.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
 #include <tqtoolbar.h>
@@ -28,7 +28,7 @@
 #include <tqfileinfo.h>
 #include <tqfile.h>
 #include <tqdatastream.h>
-#include <ntqprinter.h>
+#include <tqprinter.h>
 #include <ntqsimplerichtext.h>
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
diff --git a/examples/demo/textdrawing/textedit.cpp b/examples/demo/textdrawing/textedit.cpp
index 80c40e9e7..66e7e8b11 100644
--- a/examples/demo/textdrawing/textedit.cpp
+++ b/examples/demo/textdrawing/textedit.cpp
@@ -22,7 +22,7 @@
 #include <tqfileinfo.h>
 #include <tqfile.h>
 #include <tqfiledialog.h>
-#include <ntqprinter.h>
+#include <tqprinter.h>
 #include <tqpaintdevicemetrics.h>
 #include <ntqsimplerichtext.h>
 #include <tqcolordialog.h>
diff --git a/examples/dirview/dirview.cpp b/examples/dirview/dirview.cpp
index 752744bca..e6342f26a 100644
--- a/examples/dirview/dirview.cpp
+++ b/examples/dirview/dirview.cpp
@@ -12,9 +12,9 @@
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <ntqevent.h>
-#include <ntqpoint.h>
+#include <tqpoint.h>
 #include <ntqmessagebox.h>
 #include <tqdragobject.h>
 #include <tqmime.h>
diff --git a/examples/dragdrop/dropsite.cpp b/examples/dragdrop/dropsite.cpp
index e7621f674..f6e493aa7 100644
--- a/examples/dragdrop/dropsite.cpp
+++ b/examples/dragdrop/dropsite.cpp
@@ -14,7 +14,7 @@
 #include "dropsite.h"
 #include "secret.h"
 #include <ntqevent.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqdragobject.h>
 #include <tqimage.h>
 #include <tqdir.h>
diff --git a/examples/dragdrop/main.cpp b/examples/dragdrop/main.cpp
index 3a618b60f..91244fd83 100644
--- a/examples/dragdrop/main.cpp
+++ b/examples/dragdrop/main.cpp
@@ -15,7 +15,7 @@
 #include <ntqlayout.h>
 #include <ntqcombobox.h>
 #include <ntqlabel.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 
 static void addStuff( TQWidget * parent, bool image, bool secret = FALSE )
 {
diff --git a/examples/drawdemo/drawdemo.cpp b/examples/drawdemo/drawdemo.cpp
index 3ca91496b..d3d0b309d 100644
--- a/examples/drawdemo/drawdemo.cpp
+++ b/examples/drawdemo/drawdemo.cpp
@@ -9,7 +9,7 @@
 
 #include <tqwidget.h>
 #include <tqpainter.h>
-#include <ntqprinter.h>
+#include <tqprinter.h>
 #include <ntqpushbutton.h>
 #include <ntqradiobutton.h>
 #include <ntqbuttongroup.h>
diff --git a/examples/fileiconview/mainwindow.cpp b/examples/fileiconview/mainwindow.cpp
index e2f1e3982..1a508be52 100644
--- a/examples/fileiconview/mainwindow.cpp
+++ b/examples/fileiconview/mainwindow.cpp
@@ -17,7 +17,7 @@
 #include <tqstatusbar.h>
 #include <tqtoolbar.h>
 #include <ntqcombobox.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqtoolbutton.h>
 #include <tqdir.h>
 #include <tqfileinfo.h>
diff --git a/examples/fileiconview/tqfileiconview.cpp b/examples/fileiconview/tqfileiconview.cpp
index 1dde840b9..f84ffdf13 100644
--- a/examples/fileiconview/tqfileiconview.cpp
+++ b/examples/fileiconview/tqfileiconview.cpp
@@ -10,7 +10,7 @@
 #include "tqfileiconview.h"
 #include <tqpainter.h>
 #include <tqstringlist.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqmime.h>
 #include <tqstrlist.h>
 #include <tqdragobject.h>
@@ -19,7 +19,7 @@
 #include <tqpopupmenu.h>
 #include <ntqcursor.h>
 #include <ntqapplication.h>
-#include <ntqwmatrix.h>
+#include <tqwmatrix.h>
 
 #include <stdlib.h>
 
diff --git a/examples/hello/hello.cpp b/examples/hello/hello.cpp
index d0d992ee4..815b586ba 100644
--- a/examples/hello/hello.cpp
+++ b/examples/hello/hello.cpp
@@ -11,7 +11,7 @@
 #include <ntqpushbutton.h>
 #include <tqtimer.h>
 #include <tqpainter.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 
 
 /*
diff --git a/examples/helpviewer/helpwindow.cpp b/examples/helpviewer/helpwindow.cpp
index a7558a6c2..2954fd2b3 100644
--- a/examples/helpviewer/helpwindow.cpp
+++ b/examples/helpviewer/helpwindow.cpp
@@ -9,7 +9,7 @@
 
 #include "helpwindow.h"
 #include <tqstatusbar.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
 #include <tqtoolbar.h>
@@ -28,7 +28,7 @@
 #include <tqfileinfo.h>
 #include <tqfile.h>
 #include <tqdatastream.h>
-#include <ntqprinter.h>
+#include <tqprinter.h>
 #include <ntqsimplerichtext.h>
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
diff --git a/examples/iconview/main.cpp b/examples/iconview/main.cpp
index ba6d509ad..fdb83feb0 100644
--- a/examples/iconview/main.cpp
+++ b/examples/iconview/main.cpp
@@ -10,7 +10,7 @@
 #include <tqiconview.h>
 #include <ntqapplication.h>
 #include <tqdragobject.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqiconset.h>
 
 #include <tqmime.h>
diff --git a/examples/iconview/simple_dd/main.h b/examples/iconview/simple_dd/main.h
index 64ba6a5b0..c8e731ce0 100644
--- a/examples/iconview/simple_dd/main.h
+++ b/examples/iconview/simple_dd/main.h
@@ -12,7 +12,7 @@
 #include <ntqsplitter.h>
 #include <ntqlistbox.h>
 #include <tqiconview.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 
 class TQDragEnterEvent;
 class TQDragDropEvent;
diff --git a/examples/listboxcombo/listboxcombo.cpp b/examples/listboxcombo/listboxcombo.cpp
index 1c13287d9..dac9bdc12 100644
--- a/examples/listboxcombo/listboxcombo.cpp
+++ b/examples/listboxcombo/listboxcombo.cpp
@@ -14,7 +14,7 @@
 #include <ntqhbox.h>
 #include <ntqpushbutton.h>
 #include <tqstring.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <ntqlabel.h>
 #include <tqimage.h>
 #include <tqpainter.h>
diff --git a/examples/listviews/listviews.cpp b/examples/listviews/listviews.cpp
index b28de6ff5..adb02b743 100644
--- a/examples/listviews/listviews.cpp
+++ b/examples/listviews/listviews.cpp
@@ -11,7 +11,7 @@
 
 #include <ntqlabel.h>
 #include <tqpainter.h>
-#include <ntqpalette.h>
+#include <tqpalette.h>
 #include <tqobjectlist.h>
 #include <tqpopupmenu.h>
 #include <ntqheader.h>
diff --git a/examples/mdi/application.cpp b/examples/mdi/application.cpp
index e0ca39ba1..db6480560 100644
--- a/examples/mdi/application.cpp
+++ b/examples/mdi/application.cpp
@@ -10,7 +10,7 @@
 #include "application.h"
 #include <tqworkspace.h>
 #include <tqimage.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqtoolbar.h>
 #include <tqtoolbutton.h>
 #include <tqpopupmenu.h>
@@ -21,7 +21,7 @@
 #include <ntqlabel.h>
 #include <tqstatusbar.h>
 #include <ntqmessagebox.h>
-#include <ntqprinter.h>
+#include <tqprinter.h>
 #include <ntqapplication.h>
 #include <ntqpushbutton.h>
 #include <ntqaccel.h>
diff --git a/examples/menu/menu.cpp b/examples/menu/menu.cpp
index 68611b445..78d5084ed 100644
--- a/examples/menu/menu.cpp
+++ b/examples/menu/menu.cpp
@@ -12,7 +12,7 @@
 #include <tqpopupmenu.h>
 #include <ntqapplication.h>
 #include <ntqmessagebox.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqpainter.h>
 
 /* XPM */
diff --git a/examples/network/ftpclient/ftpviewitem.cpp b/examples/network/ftpclient/ftpviewitem.cpp
index 97544b67f..f958c5724 100644
--- a/examples/network/ftpclient/ftpviewitem.cpp
+++ b/examples/network/ftpclient/ftpviewitem.cpp
@@ -7,7 +7,7 @@
 **
 *****************************************************************************/
 
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 
 #include "ftpviewitem.h"
 
diff --git a/examples/network/remotecontrol/ipcserver.cpp b/examples/network/remotecontrol/ipcserver.cpp
index a64e70e6b..a850bfa53 100644
--- a/examples/network/remotecontrol/ipcserver.cpp
+++ b/examples/network/remotecontrol/ipcserver.cpp
@@ -3,7 +3,7 @@
 #include <tqsocket.h>
 #include <ntqvariant.h>
 #include <tqimage.h>
-#include <ntqpalette.h>
+#include <tqpalette.h>
 #include <ntqapplication.h>
 
 class IpcSocket : public TQSocket
diff --git a/examples/opengl/box/README b/examples/opengl/box/README
index 242c37257..d5fd6ab20 100644
--- a/examples/opengl/box/README
+++ b/examples/opengl/box/README
@@ -2,7 +2,7 @@
 The box example
 
 This example program shows how to use OpenGL in Qt: Put your OpenGL
-code in a class inherited from QGLWidget. The resulting subclass may
+code in a class inherited from TQGLWidget. The resulting subclass may
 be used like any other TQt widget, with signals and slots, geometry
 management, etc..
 
diff --git a/examples/opengl/box/box.doc b/examples/opengl/box/box.doc
index d30bd75b4..96f21208d 100644
--- a/examples/opengl/box/box.doc
+++ b/examples/opengl/box/box.doc
@@ -6,7 +6,7 @@
 This example demonstrates how to use OpenGL in Qt. 
 
 Essentially, all you do is put your OpenGL code in a class inherited
-from QGLWidget. This class may then be used like any other TQt widget,
+from TQGLWidget. This class may then be used like any other TQt widget,
 including the use of signals and slots and geometry management.
 
 See \c{$TQTDIR/examples/opengl/box} for the source code.
diff --git a/examples/opengl/box/glbox.h b/examples/opengl/box/glbox.h
index 9d8bebc99..7e930b21f 100644
--- a/examples/opengl/box/glbox.h
+++ b/examples/opengl/box/glbox.h
@@ -16,7 +16,7 @@
 #ifndef GLBOX_H
 #define GLBOX_H
 
-#include <ntqgl.h>
+#include <tqgl.h>
 
 
 class GLBox : public TQGLWidget
diff --git a/examples/opengl/box/main.cpp b/examples/opengl/box/main.cpp
index 52521c845..62b46122d 100644
--- a/examples/opengl/box/main.cpp
+++ b/examples/opengl/box/main.cpp
@@ -18,7 +18,7 @@
 
 #include "globjwin.h"
 #include <ntqapplication.h>
-#include <ntqgl.h>
+#include <tqgl.h>
 
 /*
   The main program is here. 
diff --git a/examples/opengl/gear/gear.cpp b/examples/opengl/gear/gear.cpp
index 0ceb2f6cb..6b901b47e 100644
--- a/examples/opengl/gear/gear.cpp
+++ b/examples/opengl/gear/gear.cpp
@@ -13,7 +13,7 @@
 // distribution.
 //
 
-#include <ntqgl.h>
+#include <tqgl.h>
 #include <ntqapplication.h>
 #include <math.h>
 
diff --git a/examples/opengl/glpixmap/README b/examples/opengl/glpixmap/README
index b01cfafee..166a4bbf4 100644
--- a/examples/opengl/glpixmap/README
+++ b/examples/opengl/glpixmap/README
@@ -3,6 +3,6 @@ The OpenGL pixmap example
 
 This example program is an extension of the "box" example program.
 
-It demonstrates how to render OpenGL into a QPixmap.
+It demonstrates how to render OpenGL into a TQPixmap.
 
 
diff --git a/examples/opengl/glpixmap/glbox.h b/examples/opengl/glpixmap/glbox.h
index 9903c23d9..a4c7da131 100644
--- a/examples/opengl/glpixmap/glbox.h
+++ b/examples/opengl/glpixmap/glbox.h
@@ -16,7 +16,7 @@
 #ifndef GLBOX_H
 #define GLBOX_H
 
-#include <ntqgl.h>
+#include <tqgl.h>
 
 
 class GLBox : public TQGLWidget
diff --git a/examples/opengl/glpixmap/globjwin.cpp b/examples/opengl/glpixmap/globjwin.cpp
index 9a5b8bf11..caee75e44 100644
--- a/examples/opengl/glpixmap/globjwin.cpp
+++ b/examples/opengl/glpixmap/globjwin.cpp
@@ -23,7 +23,7 @@
 #include <tqpopupmenu.h>
 #include <ntqapplication.h>
 #include <ntqkeycode.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqimage.h>
 #include <tqpainter.h>
 #include "globjwin.h"
diff --git a/examples/opengl/glpixmap/glpixmap.doc b/examples/opengl/glpixmap/glpixmap.doc
index 22fce4de3..1e5c7a531 100644
--- a/examples/opengl/glpixmap/glpixmap.doc
+++ b/examples/opengl/glpixmap/glpixmap.doc
@@ -6,7 +6,7 @@
 This example program is an extension of the \link
 opengl-box-example.html OpenGL Box example\endlink.
 
-It demonstrates how to render OpenGL into a QPixmap.
+It demonstrates how to render OpenGL into a TQPixmap.
 
 See \c{$TQTDIR/examples/opengl/glpixmap} for the source code.
 
diff --git a/examples/opengl/glpixmap/main.cpp b/examples/opengl/glpixmap/main.cpp
index 67d1c77d5..4dd6665d1 100644
--- a/examples/opengl/glpixmap/main.cpp
+++ b/examples/opengl/glpixmap/main.cpp
@@ -18,7 +18,7 @@
 
 #include "globjwin.h"
 #include <ntqapplication.h>
-#include <ntqgl.h>
+#include <tqgl.h>
 
 /*
   The main program is here. 
diff --git a/examples/opengl/overlay/README b/examples/opengl/overlay/README
index 39e20b8a3..469c527b6 100644
--- a/examples/opengl/overlay/README
+++ b/examples/opengl/overlay/README
@@ -2,7 +2,7 @@
 The overlay example
 
 This example program shows how to use OpenGL overlays with the TQt OpenGL
-Extension. It contains a QGLWidget with a relatively expensive
+Extension. It contains a TQGLWidget with a relatively expensive
 redrawing operation, and rubber-band drawing in the overlay plane.
 Using the overlay has the advantage that the rubber-band may be drawn
 and erased without damaging the image in the main plane, so costly
diff --git a/examples/opengl/overlay/glteapots.h b/examples/opengl/overlay/glteapots.h
index 24f27367f..ca249e546 100644
--- a/examples/opengl/overlay/glteapots.h
+++ b/examples/opengl/overlay/glteapots.h
@@ -17,7 +17,7 @@
 #ifndef GLBOX_H
 #define GLBOX_H
 
-#include <ntqgl.h>
+#include <tqgl.h>
 
 
 class GLTeapots : public TQGLWidget
diff --git a/examples/opengl/overlay/main.cpp b/examples/opengl/overlay/main.cpp
index 3a56a5fe3..d5ec55eae 100644
--- a/examples/opengl/overlay/main.cpp
+++ b/examples/opengl/overlay/main.cpp
@@ -18,7 +18,7 @@
 
 #include "globjwin.h"
 #include <ntqapplication.h>
-#include <ntqgl.h>
+#include <tqgl.h>
 #include <ntqmessagebox.h>
 
 /*
diff --git a/examples/opengl/overlay/overlay.doc b/examples/opengl/overlay/overlay.doc
index 43762330b..e38569f58 100644
--- a/examples/opengl/overlay/overlay.doc
+++ b/examples/opengl/overlay/overlay.doc
@@ -4,7 +4,7 @@
   \title OpenGL Overlay Example
 
 This example demonstrates how to use OpenGL overlays with the TQt OpenGL
-Extension. It features a QGLWidget with a relatively expensive redrawing
+Extension. It features a TQGLWidget with a relatively expensive redrawing
 operation, and rubber-band drawing in the overlay plane. Using the
 overlay has the advantage that the rubber-band may be drawn and erased
 without damaging the image in the main plane, so costly redraws are
diff --git a/examples/opengl/overlay_x11/README b/examples/opengl/overlay_x11/README
index f11c439df..00b0f6454 100644
--- a/examples/opengl/overlay_x11/README
+++ b/examples/opengl/overlay_x11/README
@@ -3,7 +3,7 @@
 UPDATE: From version 5.0 onwards, the TQt OpenGL Extension includes
 direct support for use of OpenGL overlays. For many uses of overlays,
 this makes the technique described below redundant. See the 'overlay'
-example program. The following is a discussion on how to use non-QGL
+example program. The following is a discussion on how to use non-TQGL
 widgets in overlay planes.
 -----------------------------------------------------------------------
 
@@ -15,10 +15,10 @@ Extension with X11 overlay visuals.
 
 The example program has three main parts:
 
-GearWidget: A simple QGLWidget that renders the usual gears. Modified
+GearWidget: A simple TQGLWidget that renders the usual gears. Modified
 so that it will print a debug message every time it redraws (renders)
 itself. Thus, you can eaily confirm that drawing in the overlay plane
-does not cause redrawings in the main plane where the QGLWidget
+does not cause redrawings in the main plane where the TQGLWidget
 resides.
 
 RubberbandWidget: Very simple standard (non-GL) TQt widget that
@@ -38,7 +38,7 @@ Running it:
 -----------
 
 Start the overlayrubber executable. Click and drag with the left mouse
-button to see rubberband drawing. Observe that the QGLWidget does
+button to see rubberband drawing. Observe that the TQGLWidget does
 not redraw itself (no redraw debug messages are output), and yet the
 image is not destroyed. Marvel at the coolness of X11 overlays!
 
@@ -58,15 +58,15 @@ Using with geometry management: The QLayout classes will not allow you
 to put one widget (the overlay) on top of another (the OpenGL widget);
 that would defy the whole purpose of the automatic layout. The
 solution is to add just one of them to the QLayout object. Have it
-keep a pointer to the other (i.e. the QGLWidget knows about its
+keep a pointer to the other (i.e. the TQGLWidget knows about its
 overlay widget or vice versa). Implement the resizeEvent() method of
 the widget you put in the layout, and make it call setGeometry() on
 the other widget with its own geometry as parameters, thus keeping the
 two widgets' geometries synchronized.
 
-Using with QPalette and TQColorGroup: Instead of the somewhat
+Using with TQPalette and TQColorGroup: Instead of the somewhat
 simplistic setBackgroundColor( transparentColor ), you can use Qt's
-QPalette system for having your overlay widgets use transparent color
+TQPalette system for having your overlay widgets use 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 wanted color roles, e.g. Background and
diff --git a/examples/opengl/overlay_x11/README.X11-OVERLAYS b/examples/opengl/overlay_x11/README.X11-OVERLAYS
index 18bcb1e5f..7d014bbca 100644
--- a/examples/opengl/overlay_x11/README.X11-OVERLAYS
+++ b/examples/opengl/overlay_x11/README.X11-OVERLAYS
@@ -11,7 +11,7 @@ highly recommended book "OpenGL Programming for the X Window System"
 UPDATE: From version 5.0 onwards, the TQt OpenGL Extension includes
 direct support for use of OpenGL overlays. For many uses of overlays,
 this makes the technique described below redundant. See the 'overlay'
-example program. The following is a discussion on how to use non-QGL
+example program. The following is a discussion on how to use non-TQGL
 widgets in overlay planes.
 -----------------------------------------------------------------------
 
@@ -43,9 +43,9 @@ for more information.
 How it works:
 -------------
 
-Given the above, a QGLWidget will by default use the main plane
+Given the above, a TQGLWidget will by default use the main plane
 visual, while all other widgets will use the overlay visual. Thus, one
-can place a normal widget on top of the QGLWidget, and do drawing in
+can place a normal widget on top of the TQGLWidget, and do drawing in
 it, without destroying the image in the OpenGL window. In other words,
 one can use all the drawing capabilities of TQPainter to draw the
 annotations, rubberbands, whatever. For the typical use of overlays,
@@ -85,7 +85,7 @@ the visual is in an overlay plane.
 transparency information for overlay visuals.
 
 The overlayrubber example program will output what visual is used for
-the normal TQt widgets, and what visual is used by the QGLWidget.
+the normal TQt widgets, and what visual is used by the TQGLWidget.
 
 
 
diff --git a/examples/opengl/overlay_x11/gearwidget.h b/examples/opengl/overlay_x11/gearwidget.h
index ce1c2b822..4c04fcbc8 100644
--- a/examples/opengl/overlay_x11/gearwidget.h
+++ b/examples/opengl/overlay_x11/gearwidget.h
@@ -12,7 +12,7 @@
 #ifndef GEAR_H
 #define GEAR_H
 
-#include <ntqgl.h>
+#include <tqgl.h>
 
 class GearWidget : public TQGLWidget
 {
diff --git a/examples/opengl/overlay_x11/overlay_x11.doc b/examples/opengl/overlay_x11/overlay_x11.doc
index 8b2f0a459..d38bff08c 100644
--- a/examples/opengl/overlay_x11/overlay_x11.doc
+++ b/examples/opengl/overlay_x11/overlay_x11.doc
@@ -7,7 +7,7 @@
 direct support for use of OpenGL overlays. For many uses of overlays,
 this makes the technique described below redundant. See the \link
 opengl-overlay-example.html overlay\endlink example program. The
-following is a discussion on how to use non-QGL widgets in overlay
+following is a discussion on how to use non-TQGL widgets in overlay
 planes.
 
 Overlayrubber: An example program showing how to use TQt and TQt OpenGL
@@ -21,11 +21,11 @@ information on \link opengl-x11-overlays.html overlays\endlink.
 The example program has three main parts:
 
 \list 1
-\i \e GearWidget - a normal, simple QGLWidget. This renders the usual
+\i \e GearWidget - a normal, simple TQGLWidget. This renders the usual
 gears. It has been modified to print a debug message every time it
 redraws (renders) itself. Thus, you can easily confirm that drawing in
 the overlay plane does not cause redrawings in the main plane where
-the QGLWidget resides.
+the TQGLWidget resides.
 
 \i \e RubberbandWidget - Very simple standard (non-GL) TQt widget that
 implements rubberband drawing. Designed for use in an overlay plane.
@@ -42,7 +42,7 @@ color of that plane.
 \section1 Running the Example
 
 Start the \c overlayrubber executable. Click and drag with the left
-mouse button to see rubberband drawing. Observe that the QGLWidget
+mouse button to see rubberband drawing. Observe that the TQGLWidget
 does not redraw itself (no redraw debug messages are output), and yet
 the image is not destroyed. Marvel at the coolness of X11 overlays!
 
@@ -63,15 +63,15 @@ be moved, resized, or removed without destroying the OpenGL image.
 putting one widget (the overlay) on top of another (the OpenGL
 widget); that would defy the whole purpose of the automatic layout.
 The solution is to add just one of them to the QLayout object. Have it
-keep a pointer to the other (i.e. the QGLWidget knows about its
+keep a pointer to the other (i.e. the TQGLWidget knows about its
 overlay widget or vice versa). Implement the resizeEvent() method of
 the widget you put in the layout, and make it call setGeometry() on
 the other widget with its own geometry as parameters, thus keeping the
 two widgets' geometries synchronized.
 
-\i \e{Using together with QPalette and TQColorGroup.} Instead of the
+\i \e{Using together with TQPalette and TQColorGroup.} Instead of the
 simplistic setBackgroundColor( transparentColor ), you can
-use Qt's QPalette system to make your overlay widgets use
+use Qt's TQPalette system to make your overlay widgets use
 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.
diff --git a/examples/opengl/sharedbox/README b/examples/opengl/sharedbox/README
index 4959294d5..7677b5259 100644
--- a/examples/opengl/sharedbox/README
+++ b/examples/opengl/sharedbox/README
@@ -3,6 +3,6 @@ The shared box example
 
 This example program is an extension of the "box" example program.
 
-It demonstrates how to use OpenGL display list sharing with QGLWidgets.
+It demonstrates how to use OpenGL display list sharing with TQGLWidgets.
 
 
diff --git a/examples/opengl/sharedbox/glbox.h b/examples/opengl/sharedbox/glbox.h
index f7565979f..46696e5af 100644
--- a/examples/opengl/sharedbox/glbox.h
+++ b/examples/opengl/sharedbox/glbox.h
@@ -16,7 +16,7 @@
 #ifndef GLBOX_H
 #define GLBOX_H
 
-#include <ntqgl.h>
+#include <tqgl.h>
 
 
 class GLBox : public TQGLWidget
diff --git a/examples/opengl/sharedbox/main.cpp b/examples/opengl/sharedbox/main.cpp
index 67d1c77d5..4dd6665d1 100644
--- a/examples/opengl/sharedbox/main.cpp
+++ b/examples/opengl/sharedbox/main.cpp
@@ -18,7 +18,7 @@
 
 #include "globjwin.h"
 #include <ntqapplication.h>
-#include <ntqgl.h>
+#include <tqgl.h>
 
 /*
   The main program is here. 
diff --git a/examples/opengl/sharedbox/sharedbox.doc b/examples/opengl/sharedbox/sharedbox.doc
index f3fb52bf2..7be3cc9ce 100644
--- a/examples/opengl/sharedbox/sharedbox.doc
+++ b/examples/opengl/sharedbox/sharedbox.doc
@@ -8,7 +8,7 @@ This example program is an extension of the \link
 opengl-box-example.html Box example\endlink.
 
 It demonstrates how to use OpenGL display list sharing with
-QGLWidgets.
+TQGLWidgets.
 
 See \c{$TQTDIR/examples/opengl/sharedbox} for the source code.
 
diff --git a/examples/opengl/texture/gltexobj.h b/examples/opengl/texture/gltexobj.h
index 0f86b2684..00a974c72 100644
--- a/examples/opengl/texture/gltexobj.h
+++ b/examples/opengl/texture/gltexobj.h
@@ -16,7 +16,7 @@
 #ifndef GLTEXOBJ_H
 #define GLTEXOBJ_H
 
-#include <ntqgl.h>
+#include <tqgl.h>
 
 
 class GLTexobj : public TQGLWidget
diff --git a/examples/opengl/texture/main.cpp b/examples/opengl/texture/main.cpp
index 35b97f368..499e016e7 100644
--- a/examples/opengl/texture/main.cpp
+++ b/examples/opengl/texture/main.cpp
@@ -16,7 +16,7 @@
 
 #include "globjwin.h"
 #include <ntqapplication.h>
-#include <ntqgl.h>
+#include <tqgl.h>
 
 /*
   The main program is here. 
diff --git a/examples/picture/picture.cpp b/examples/picture/picture.cpp
index 97562293a..49230d30b 100644
--- a/examples/picture/picture.cpp
+++ b/examples/picture/picture.cpp
@@ -9,8 +9,8 @@
 
 #include <ntqapplication.h>
 #include <tqpainter.h>
-#include <ntqpicture.h>
-#include <ntqpixmap.h>
+#include <tqpicture.h>
+#include <tqpixmap.h>
 #include <tqwidget.h>
 #include <ntqmessagebox.h>
 #include <tqfile.h>
diff --git a/examples/qmag/qmag.cpp b/examples/qmag/qmag.cpp
index d21e06ebb..c3463f5b5 100644
--- a/examples/qmag/qmag.cpp
+++ b/examples/qmag/qmag.cpp
@@ -9,7 +9,7 @@
 
 #include <ntqcombobox.h>
 #include <ntqpushbutton.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqimage.h>
 #include <ntqlabel.h>
 #include <tqfiledialog.h>
@@ -17,7 +17,7 @@
 
 #include <ntqapplication.h>
 #include <tqpainter.h>
-#include <ntqwmatrix.h>
+#include <tqwmatrix.h>
 
 
 class MagWidget : public TQWidget
diff --git a/examples/qwerty/qwerty.h b/examples/qwerty/qwerty.h
index 515a7c753..6da83a381 100644
--- a/examples/qwerty/qwerty.h
+++ b/examples/qwerty/qwerty.h
@@ -13,7 +13,7 @@
 #include <tqwidget.h>
 #include <tqmenubar.h>
 #include <ntqmultilineedit.h>
-#include <ntqprinter.h>
+#include <tqprinter.h>
 
 class Editor : public TQWidget
 {
diff --git a/examples/scribble/scribble.cpp b/examples/scribble/scribble.cpp
index b25064961..08cc05081 100644
--- a/examples/scribble/scribble.cpp
+++ b/examples/scribble/scribble.cpp
@@ -16,8 +16,8 @@
 #include <tqtoolbutton.h>
 #include <ntqspinbox.h>
 #include <tqtooltip.h>
-#include <ntqrect.h>
-#include <ntqpoint.h>
+#include <tqrect.h>
+#include <tqpoint.h>
 #include <tqcolordialog.h>
 #include <tqfiledialog.h>
 #include <ntqcursor.h>
diff --git a/examples/scribble/scribble.h b/examples/scribble/scribble.h
index ad622dfaa..be302fc63 100644
--- a/examples/scribble/scribble.h
+++ b/examples/scribble/scribble.h
@@ -11,12 +11,12 @@
 #define SCRIBBLE_H
 
 #include <tqmainwindow.h>
-#include <ntqpen.h>
-#include <ntqpoint.h>
-#include <ntqpixmap.h>
+#include <tqpen.h>
+#include <tqpoint.h>
+#include <tqpixmap.h>
 #include <tqwidget.h>
 #include <tqstring.h>
-#include <ntqpointarray.h>
+#include <tqpointarray.h>
 
 class TQMouseEvent;
 class TQResizeEvent;
diff --git a/examples/scrollview/scrollview.cpp b/examples/scrollview/scrollview.cpp
index f7afda02c..f7142c126 100644
--- a/examples/scrollview/scrollview.cpp
+++ b/examples/scrollview/scrollview.cpp
@@ -13,7 +13,7 @@
 #include <tqpopupmenu.h>
 #include <ntqpushbutton.h>
 #include <tqpainter.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <ntqmessagebox.h>
 #include <ntqlayout.h>
 #include <ntqlabel.h>
diff --git a/examples/showimg/imagefip.h b/examples/showimg/imagefip.h
index f72ea9820..fad621681 100644
--- a/examples/showimg/imagefip.h
+++ b/examples/showimg/imagefip.h
@@ -12,7 +12,7 @@
 
 #include <tqfiledialog.h>
 #include <tqstrlist.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 
 class ImageIconProvider : public TQFileIconProvider
 {
diff --git a/examples/table/small-table-demo/main.cpp b/examples/table/small-table-demo/main.cpp
index 7af453dc7..65fad0f16 100644
--- a/examples/table/small-table-demo/main.cpp
+++ b/examples/table/small-table-demo/main.cpp
@@ -10,7 +10,7 @@
 #include <ntqapplication.h>
 #include <ntqtable.h>
 #include <tqimage.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqstringlist.h>
 
 // TQt logo: static const char *qtlogo_xpm[]
diff --git a/examples/tablet/canvas.cpp b/examples/tablet/canvas.cpp
index 7a2fe6098..c2c40c816 100644
--- a/examples/tablet/canvas.cpp
+++ b/examples/tablet/canvas.cpp
@@ -12,7 +12,7 @@
 #include <ntqapplication.h>
 #include <tqpainter.h>
 #include <ntqevent.h>
-#include <ntqrect.h>
+#include <tqrect.h>
 
 const bool no_writing = FALSE;
 
diff --git a/examples/tablet/canvas.h b/examples/tablet/canvas.h
index b8eb80aa7..c7752f861 100644
--- a/examples/tablet/canvas.h
+++ b/examples/tablet/canvas.h
@@ -7,10 +7,10 @@
 **
 *****************************************************************************/
 
-#include <ntqpen.h>
-#include <ntqpixmap.h>
-#include <ntqpoint.h>
-#include <ntqpointarray.h>
+#include <tqpen.h>
+#include <tqpixmap.h>
+#include <tqpoint.h>
+#include <tqpointarray.h>
 #include <tqwidget.h>
 
 
diff --git a/examples/tablet/scribble.cpp b/examples/tablet/scribble.cpp
index c44667308..273967bc6 100644
--- a/examples/tablet/scribble.cpp
+++ b/examples/tablet/scribble.cpp
@@ -17,8 +17,8 @@
 #include <tqtoolbutton.h>
 #include <ntqspinbox.h>
 #include <tqtooltip.h>
-#include <ntqrect.h>
-#include <ntqpoint.h>
+#include <tqrect.h>
+#include <tqpoint.h>
 #include <tqcolordialog.h>
 #include <tqfiledialog.h>
 #include <ntqcursor.h>
diff --git a/examples/tablet/scribble.h b/examples/tablet/scribble.h
index 3bb942841..3c999bda6 100644
--- a/examples/tablet/scribble.h
+++ b/examples/tablet/scribble.h
@@ -11,12 +11,12 @@
 #define SCRIBBLE_H
 
 #include <tqmainwindow.h>
-#include <ntqpen.h>
-#include <ntqpoint.h>
-#include <ntqpixmap.h>
+#include <tqpen.h>
+#include <tqpoint.h>
+#include <tqpixmap.h>
 #include <tqwidget.h>
 #include <tqstring.h>
-#include <ntqpointarray.h>
+#include <tqpointarray.h>
 
 class TQMouseEvent;
 class TQResizeEvent;
diff --git a/examples/textedit/textedit.cpp b/examples/textedit/textedit.cpp
index e8fd0b123..ce416ccda 100644
--- a/examples/textedit/textedit.cpp
+++ b/examples/textedit/textedit.cpp
@@ -22,7 +22,7 @@
 #include <tqfileinfo.h>
 #include <tqfile.h>
 #include <tqfiledialog.h>
-#include <ntqprinter.h>
+#include <tqprinter.h>
 #include <tqpaintdevicemetrics.h>
 #include <ntqsimplerichtext.h>
 #include <tqcolordialog.h>
diff --git a/examples/themes/metal.cpp b/examples/themes/metal.cpp
index edf9fb15c..01ac1e3ab 100644
--- a/examples/themes/metal.cpp
+++ b/examples/themes/metal.cpp
@@ -15,8 +15,8 @@
 #include "ntqcombobox.h"
 #include "tqpainter.h"
 #include "ntqdrawutil.h" // for now
-#include "ntqpixmap.h" // for now
-#include "ntqpalette.h" // for now
+#include "tqpixmap.h" // for now
+#include "tqpalette.h" // for now
 #include "tqwidget.h"
 #include "ntqlabel.h"
 #include "tqimage.h"
diff --git a/examples/themes/metal.h b/examples/themes/metal.h
index 7838bd1c5..b37999c0c 100644
--- a/examples/themes/metal.h
+++ b/examples/themes/metal.h
@@ -15,7 +15,7 @@
 #define METAL_H
 
 
-#include <ntqpalette.h>
+#include <tqpalette.h>
 
 #ifndef TQT_NO_STYLE_WINDOWS
 
diff --git a/examples/themes/wood.cpp b/examples/themes/wood.cpp
index ef3ab893f..d2f39c0f8 100644
--- a/examples/themes/wood.cpp
+++ b/examples/themes/wood.cpp
@@ -15,8 +15,8 @@
 #include "ntqcombobox.h"
 #include "tqpainter.h"
 #include "ntqdrawutil.h" // for now
-#include "ntqpixmap.h" // for now
-#include "ntqpalette.h" // for now
+#include "tqpixmap.h" // for now
+#include "tqpalette.h" // for now
 #include "tqwidget.h"
 #include "ntqlabel.h"
 #include "tqimage.h"
diff --git a/examples/themes/wood.h b/examples/themes/wood.h
index 75778f55c..869c89b2b 100644
--- a/examples/themes/wood.h
+++ b/examples/themes/wood.h
@@ -15,7 +15,7 @@
 #define WOOD_H
 
 
-#include <ntqpalette.h>
+#include <tqpalette.h>
 
 #ifndef TQT_NO_STYLE_WINDOWS
 
diff --git a/examples/tqdir/tqdir.h b/examples/tqdir/tqdir.h
index cbe4f68b5..6362644b2 100644
--- a/examples/tqdir/tqdir.h
+++ b/examples/tqdir/tqdir.h
@@ -15,7 +15,7 @@
 #include <tqwidgetstack.h>
 #include <ntqvbox.h>
 #include <tqurl.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqstringlist.h>
 
 class TQMultiLineEdit;
diff --git a/examples/tux/tux.cpp b/examples/tux/tux.cpp
index 7a8c5b746..3a25b6228 100644
--- a/examples/tux/tux.cpp
+++ b/examples/tux/tux.cpp
@@ -1,7 +1,7 @@
 #include <ntqapplication.h>
 #include <tqwidget.h>
 #include <tqimage.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <tqbitmap.h>
 #include <tqfile.h>
 
diff --git a/examples/widgets/widgets.cpp b/examples/widgets/widgets.cpp
index 393aea0c6..a47980279 100644
--- a/examples/widgets/widgets.cpp
+++ b/examples/widgets/widgets.cpp
@@ -8,7 +8,7 @@
 *****************************************************************************/
 
 #include <ntqmessagebox.h>
-#include <ntqpixmap.h>
+#include <tqpixmap.h>
 #include <ntqlayout.h>
 #include <ntqapplication.h>
 
diff --git a/examples/xform/xform.cpp b/examples/xform/xform.cpp
index 25b3c967f..b466630c0 100644
--- a/examples/xform/xform.cpp
+++ b/examples/xform/xform.cpp
@@ -25,8 +25,8 @@
 #include <tqwidgetstack.h>
 
 #include <tqpainter.h>
-#include <ntqpixmap.h>
-#include <ntqpicture.h>
+#include <tqpixmap.h>
+#include <tqpicture.h>
 
 #include <stdlib.h>