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

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

88 files changed, 148 insertions, 148 deletions

diff --git a/examples/README b/examples/README
index 2f11f8568..7ca50168d 100644
--- a/examples/README
+++ b/examples/README
@@ -74,7 +74,7 @@ demo
 
 desktop
     The desktop demo contains three routines, each of which draws
-    something on the desktop. It does some nice stuff with QPainter,
+    something on the desktop. It does some nice stuff with TQPainter,
     and also demonstrates how one can treat the desktop as a widget
     like any other.
 
@@ -94,8 +94,8 @@ dragdrop
 
 drawdemo
     Draws a color wheel, text and shapes. This example demonstrates
-    several drawing functions and printer output using QPainter,
-    QWMatrix, QFont, QFontMetrics, TQColor, QBrush, and QPrinter. You
+    several drawing functions and printer output using TQPainter,
+    QWMatrix, TQFont, TQFontMetrics, TQColor, TQBrush, and QPrinter. You
     can easily add you own drawing functions. See "ourDrawFunctions".
 
 drawlines
@@ -192,7 +192,7 @@ menu
     example.)
 
 movies
-    The Movies example displays animated GIF files using the QMovie
+    The Movies example displays animated GIF files using the TQMovie
     and QLabel classes.
 
 network/archivesearch
@@ -271,7 +271,7 @@ tqdir
 
 qfd
     This example program displays all the characters of a selected
-    font. It shows the use of QFontDialog, QFontMetrics and QFontInfo,
+    font. It shows the use of TQFontDialog, TQFontMetrics and TQFontInfo,
     and a QTable subclass.
 
 qmag
@@ -301,7 +301,7 @@ scribble
     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
-    also how to use the QColorDialog.
+    also how to use the TQColorDialog.
 
 scrollview
     This example shows one way of using a QScrollview. This widget is
diff --git a/examples/aclock/aclock.cpp b/examples/aclock/aclock.cpp
index 4d4b7a0cd..eb364da02 100644
--- a/examples/aclock/aclock.cpp
+++ b/examples/aclock/aclock.cpp
@@ -9,7 +9,7 @@
 
 #include "aclock.h"
 #include <tqtimer.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqbitmap.h>
 
 //
diff --git a/examples/action/application.cpp b/examples/action/application.cpp
index f38534ea0..82f39c5aa 100644
--- a/examples/action/application.cpp
+++ b/examples/action/application.cpp
@@ -24,8 +24,8 @@
 #include <ntqapplication.h>
 #include <ntqaccel.h>
 #include <tqtextstream.h>
-#include <ntqpainter.h>
-#include <ntqpaintdevicemetrics.h>
+#include <tqpainter.h>
+#include <tqpaintdevicemetrics.h>
 #include <ntqwhatsthis.h>
 #include <tqaction.h>
 #include <ntqsimplerichtext.h>
diff --git a/examples/application/application.cpp b/examples/application/application.cpp
index 7b25ca459..7f27683c0 100644
--- a/examples/application/application.cpp
+++ b/examples/application/application.cpp
@@ -24,8 +24,8 @@
 #include <ntqapplication.h>
 #include <ntqaccel.h>
 #include <tqtextstream.h>
-#include <ntqpainter.h>
-#include <ntqpaintdevicemetrics.h>
+#include <tqpainter.h>
+#include <tqpaintdevicemetrics.h>
 #include <ntqwhatsthis.h>
 #include <ntqsimplerichtext.h>
 
diff --git a/examples/biff/biff.cpp b/examples/biff/biff.cpp
index 986e9abdc..6394a58d1 100644
--- a/examples/biff/biff.cpp
+++ b/examples/biff/biff.cpp
@@ -10,7 +10,7 @@
 #include "biff.h"
 #include <tqstring.h>
 #include <tqfileinfo.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/examples/canvas/blendshadow.cpp b/examples/canvas/blendshadow.cpp
index 635b1fc37..0ca3bf968 100644
--- a/examples/canvas/blendshadow.cpp
+++ b/examples/canvas/blendshadow.cpp
@@ -1,5 +1,5 @@
 #include <tqimage.h>
-#include <ntqcolor.h>
+#include <tqcolor.h>
 
 static inline int blendComponent( int v, int av, int s, int as )
 {
diff --git a/examples/canvas/canvas.cpp b/examples/canvas/canvas.cpp
index 75ef7a562..c93667a4d 100644
--- a/examples/canvas/canvas.cpp
+++ b/examples/canvas/canvas.cpp
@@ -4,7 +4,7 @@
 #include <ntqmessagebox.h>
 #include <tqmenubar.h>
 #include <ntqapplication.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqprinter.h>
 #include <ntqlabel.h>
 #include <tqimage.h>
diff --git a/examples/canvas/makeimg.cpp b/examples/canvas/makeimg.cpp
index 253b43956..31ae0d9fb 100644
--- a/examples/canvas/makeimg.cpp
+++ b/examples/canvas/makeimg.cpp
@@ -1,5 +1,5 @@
 #include <tqimage.h>
-#include <ntqcolor.h>
+#include <tqcolor.h>
 
 static inline int blendComponent( int v, int av, int s, int as )
 {
diff --git a/examples/chart/chartform.cpp b/examples/chart/chartform.cpp
index 24b13198d..7cd29138e 100644
--- a/examples/chart/chartform.cpp
+++ b/examples/chart/chartform.cpp
@@ -8,8 +8,8 @@
 #include <ntqcombobox.h>
 #include <tqfile.h>
 #include <tqfiledialog.h>
-#include <ntqfont.h>
-#include <ntqfontdialog.h>
+#include <tqfont.h>
+#include <tqfontdialog.h>
 #include <tqmenubar.h>
 #include <ntqmessagebox.h>
 #include <ntqpixmap.h>
diff --git a/examples/chart/chartform_canvas.cpp b/examples/chart/chartform_canvas.cpp
index 8d7892924..ffcf748a4 100644
--- a/examples/chart/chartform_canvas.cpp
+++ b/examples/chart/chartform_canvas.cpp
@@ -1,7 +1,7 @@
 #include "canvastext.h"
 #include "chartform.h"
 
-#include <ntqbrush.h>
+#include <tqbrush.h>
 #include <tqcanvas.h>
 
 #include <math.h> // sin, cos
diff --git a/examples/chart/chartform_files.cpp b/examples/chart/chartform_files.cpp
index 60358d1fb..95df7a10a 100644
--- a/examples/chart/chartform_files.cpp
+++ b/examples/chart/chartform_files.cpp
@@ -3,7 +3,7 @@
 
 #include <tqfile.h>
 #include <tqfiledialog.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqprinter.h>
 #include <tqstatusbar.h>
 
diff --git a/examples/chart/element.h b/examples/chart/element.h
index f9b6c3117..a6827867c 100644
--- a/examples/chart/element.h
+++ b/examples/chart/element.h
@@ -1,7 +1,7 @@
 #ifndef ELEMENT_H
 #define ELEMENT_H
 
-#include <ntqcolor.h>
+#include <tqcolor.h>
 #include <ntqnamespace.h>
 #include <tqstring.h>
 #include <tqvaluevector.h>
diff --git a/examples/chart/optionsform.cpp b/examples/chart/optionsform.cpp
index 1896067c0..dd2c8d2b8 100644
--- a/examples/chart/optionsform.cpp
+++ b/examples/chart/optionsform.cpp
@@ -2,7 +2,7 @@
 
 #include <ntqbuttongroup.h>
 #include <ntqcombobox.h>
-#include <ntqfontdialog.h>
+#include <tqfontdialog.h>
 #include <ntqframe.h>
 #include <tqimage.h>
 #include <ntqlabel.h>
diff --git a/examples/chart/setdataform.cpp b/examples/chart/setdataform.cpp
index 7de1e2b06..26eb1c16d 100644
--- a/examples/chart/setdataform.cpp
+++ b/examples/chart/setdataform.cpp
@@ -1,7 +1,7 @@
 #include "setdataform.h"
 #include "chartform.h"
 
-#include <ntqcolordialog.h>
+#include <tqcolordialog.h>
 #include <ntqcombobox.h>
 #include <ntqlayout.h>
 #include <ntqpixmap.h>
diff --git a/examples/customlayout/main.cpp b/examples/customlayout/main.cpp
index b22f6ffcb..c988d9de9 100644
--- a/examples/customlayout/main.cpp
+++ b/examples/customlayout/main.cpp
@@ -15,11 +15,11 @@
 
 #include <ntqapplication.h>
 #include <ntqlabel.h>
-#include <ntqcolor.h>
+#include <tqcolor.h>
 #include <ntqgroupbox.h>
 #include <ntqpushbutton.h>
 #include <ntqmultilineedit.h>
-#include <ntqcolor.h>
+#include <tqcolor.h>
 
 int main( int argc, char **argv )
 {
diff --git a/examples/demo/display.cpp b/examples/demo/display.cpp
index 588aeaeab..131a69ae2 100644
--- a/examples/demo/display.cpp
+++ b/examples/demo/display.cpp
@@ -9,7 +9,7 @@
 
 #include "display.h"
 
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqlayout.h>
 #include <tqtimer.h>
 #include <ntqpushbutton.h>
diff --git a/examples/demo/dnd/styledbutton.cpp b/examples/demo/dnd/styledbutton.cpp
index ec377d030..1a884704d 100644
--- a/examples/demo/dnd/styledbutton.cpp
+++ b/examples/demo/dnd/styledbutton.cpp
@@ -33,10 +33,10 @@
 
 #include "styledbutton.h"
 
-#include <ntqcolordialog.h>
+#include <tqcolordialog.h>
 #include <ntqpalette.h>
 #include <ntqlabel.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqimage.h>
 #include <ntqpixmap.h>
 #include <ntqapplication.h>
diff --git a/examples/demo/frame.cpp b/examples/demo/frame.cpp
index 9115dda5f..95b4b2c63 100644
--- a/examples/demo/frame.cpp
+++ b/examples/demo/frame.cpp
@@ -14,7 +14,7 @@
 #include <tqmenubar.h>
 #include <ntqaccel.h>
 #include <tqtoolbox.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqwidgetstack.h>
 #include <tqstylefactory.h>
 #include <tqaction.h>
diff --git a/examples/demo/main.cpp b/examples/demo/main.cpp
index 892e18dc5..7bccb89ad 100644
--- a/examples/demo/main.cpp
+++ b/examples/demo/main.cpp
@@ -41,7 +41,7 @@
 #include <tqimage.h>
 
 #include <ntqtabwidget.h>
-#include <ntqfont.h>
+#include <tqfont.h>
 #include <tqworkspace.h>
 #include <tqwidgetstack.h>
 
diff --git a/examples/demo/opengl/glinfotext.h b/examples/demo/opengl/glinfotext.h
index 833a3dd3a..f5b6b3a49 100644
--- a/examples/demo/opengl/glinfotext.h
+++ b/examples/demo/opengl/glinfotext.h
@@ -1,6 +1,6 @@
 #include <ntqlayout.h>
 #include <tqtextview.h>
-#include <ntqfont.h>
+#include <tqfont.h>
 #include "glinfo.h"
 
 class GLInfoText : public TQWidget
diff --git a/examples/demo/opengl/glworkspace.cpp b/examples/demo/opengl/glworkspace.cpp
index 80d37b460..ec2a6b138 100644
--- a/examples/demo/opengl/glworkspace.cpp
+++ b/examples/demo/opengl/glworkspace.cpp
@@ -10,7 +10,7 @@
 #include <tqmenubar.h>
 #include <tqaction.h>
 #include <ntqprinter.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqcheckbox.h>
 #include <ntqvbox.h>
 #include <tqimage.h>
diff --git a/examples/demo/qasteroids/ledmeter.cpp b/examples/demo/qasteroids/ledmeter.cpp
index 5329d7ca8..a1cfb70d1 100644
--- a/examples/demo/qasteroids/ledmeter.cpp
+++ b/examples/demo/qasteroids/ledmeter.cpp
@@ -4,7 +4,7 @@
  * Part of the KDE project
  */
 
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include "ledmeter.h"
 
 KALedMeter::KALedMeter( TQWidget *parent ) : TQFrame( parent )
diff --git a/examples/demo/qthumbwheel.cpp b/examples/demo/qthumbwheel.cpp
index 984aa1f43..aba1fc4ee 100644
--- a/examples/demo/qthumbwheel.cpp
+++ b/examples/demo/qthumbwheel.cpp
@@ -41,7 +41,7 @@
 #include "qthumbwheel.h"
 
 #ifndef TQT_NO_THUMBWHEEL
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqdrawutil.h>
 #include <ntqpixmap.h>
 #include <math.h>
diff --git a/examples/demo/textdrawing/example.html b/examples/demo/textdrawing/example.html
index 639b7470d..3f215fd53 100644
--- a/examples/demo/textdrawing/example.html
+++ b/examples/demo/textdrawing/example.html
@@ -48,8 +48,8 @@ Inherits <a href="ntqframe.html">TQFrame</a>.
 </ul>
 <h2>Protected Members</h2>
 <ul>
-<li><div class="fn">virtual void <a href="#fac264"><b>drawContents</b></a> ( QPainter * ) </div>
-<li><div class="fn">virtual void <a href="#479dd2"><b>drawContentsMask</b></a> ( QPainter * ) </div>
+<li><div class="fn">virtual void <a href="#fac264"><b>drawContents</b></a> ( TQPainter * ) </div>
+<li><div class="fn">virtual void <a href="#479dd2"><b>drawContentsMask</b></a> ( TQPainter * ) </div>
 </ul>
 <h2>Properties</h2>
 <table border=1 cellpadding=3 cellspacing=0>
@@ -75,7 +75,7 @@ key for another widget.
 <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 movie: set by passing a <a href="ntqmovie.html">TQMovie</a> to <a href="#60de9f">setMovie</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>().
 </ul>
@@ -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="ntqmovie.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="ntqpixmap.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>
@@ -147,15 +147,15 @@ is disabled.
 <p>See also  <a href="#191701">setBuddy</a>().
 <h3 class="fn">void <a name="be73f3"></a>TQLabel::clear () <code>[slot]</code></h3>
 <p>Clears any label contents. Equivalent with <a href="#dffb43">setText</a>( "" ).
-<h3 class="fn">void <a name="fac264"></a>TQLabel::drawContents ( <a href="ntqpainter.html">TQPainter</a> * p ) <code>[virtual protected]</code></h3>
+<h3 class="fn">void <a name="fac264"></a>TQLabel::drawContents ( <a href="tqpainter.html">TQPainter</a> * p ) <code>[virtual protected]</code></h3>
 <p>Draws the label contents using the painter <em>p.</em>
 <p>Reimplemented from <a href="ntqframe.html#99e687">TQFrame.</a>
-<h3 class="fn">void <a name="479dd2"></a>TQLabel::drawContentsMask ( <a href="ntqpainter.html">TQPainter</a> * p ) <code>[virtual protected]</code></h3>
+<h3 class="fn">void <a name="479dd2"></a>TQLabel::drawContentsMask ( <a href="tqpainter.html">TQPainter</a> * p ) <code>[virtual protected]</code></h3>
 <p>Draws the label contents mask using the painter <em>p.</em>
 Used only in transparent mode.
 <p>See also  <a href="tqwidget.html#c7a335">TQWidget::setAutoMask</a>();.
 <p>Reimplemented from <a href="ntqframe.html#4cbf11">TQFrame.</a>
-<h3 class="fn">void <a name="0435a2"></a>TQLabel::fontChange ( const <a href="ntqfont.html">TQFont</a> &amp; ) <code>[virtual protected]</code></h3>
+<h3 class="fn">void <a name="0435a2"></a>TQLabel::fontChange ( const <a href="tqfont.html">TQFont</a> &amp; ) <code>[virtual protected]</code></h3>
 <p>Reimplemented for internal reasons; the API is not affected.
 <p>Reimplemented from <a href="tqwidget.html#570a8f">TQWidget.</a>
 <h3 class="fn">bool <a name="7e1f73"></a>TQLabel::hasScaledContents () const</h3>
@@ -171,7 +171,7 @@ available space.
 <h3 class="fn"><a href="tqsize.html">TQSize</a> <a name="53c8c7"></a>TQLabel::minimumSizeHint () const <code>[virtual]</code></h3>
 <p>Reimplemented for internal reasons; the API is not affected.
 <p>Reimplemented from <a href="tqwidget.html#3f0fc2">TQWidget.</a>
-<h3 class="fn"><a href="ntqmovie.html">TQMovie</a>* <a name="7dcdfe"></a>TQLabel::movie () const</h3>
+<h3 class="fn"><a href="tqmovie.html">TQMovie</a>* <a name="7dcdfe"></a>TQLabel::movie () const</h3>
 <p>If the label contains a movie, returns a pointer to it. Otherwise,
 returns 0.
 <p>See also  <a href="#60de9f">setMovie</a>().
@@ -254,7 +254,7 @@ pixels.
 <p>See also  <a href="#e3c907">indent</a>(), <a href="#1f406e">setAlignment</a>(), <a href="ntqframe.html#e0ccef">frameWidth</a>() and <a href="tqwidget.html#3a7237">font</a>().
 <p>Examples:
  <a href="movies-main-cpp.html#setIndent">movies/main.cpp</a>
-<h3 class="fn">void <a name="60de9f"></a>TQLabel::setMovie ( const <a href="ntqmovie.html">TQMovie</a> &amp; movie ) <code>[virtual slot]</code></h3>
+<h3 class="fn">void <a name="60de9f"></a>TQLabel::setMovie ( const <a href="tqmovie.html">TQMovie</a> &amp; movie ) <code>[virtual slot]</code></h3>
 <p>Sets the label contents to <em>movie.</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 713f08c78..13a538882 100644
--- a/examples/demo/textdrawing/helpwindow.cpp
+++ b/examples/demo/textdrawing/helpwindow.cpp
@@ -30,8 +30,8 @@
 #include <tqdatastream.h>
 #include <ntqprinter.h>
 #include <ntqsimplerichtext.h>
-#include <ntqpainter.h>
-#include <ntqpaintdevicemetrics.h>
+#include <tqpainter.h>
+#include <tqpaintdevicemetrics.h>
 
 #include <ctype.h>
 
diff --git a/examples/demo/textdrawing/textedit.cpp b/examples/demo/textdrawing/textedit.cpp
index 69d6e4435..80c40e9e7 100644
--- a/examples/demo/textdrawing/textedit.cpp
+++ b/examples/demo/textdrawing/textedit.cpp
@@ -16,17 +16,17 @@
 #include <tqtoolbar.h>
 #include <ntqtabwidget.h>
 #include <ntqapplication.h>
-#include <ntqfontdatabase.h>
+#include <tqfontdatabase.h>
 #include <ntqcombobox.h>
 #include <ntqlineedit.h>
 #include <tqfileinfo.h>
 #include <tqfile.h>
 #include <tqfiledialog.h>
 #include <ntqprinter.h>
-#include <ntqpaintdevicemetrics.h>
+#include <tqpaintdevicemetrics.h>
 #include <ntqsimplerichtext.h>
-#include <ntqcolordialog.h>
-#include <ntqpainter.h>
+#include <tqcolordialog.h>
+#include <tqpainter.h>
 
 TextEdit::TextEdit( TQWidget *parent, const char *name )
     : TQMainWindow( parent, name, 0 )
diff --git a/examples/desktop/desktop.cpp b/examples/desktop/desktop.cpp
index 4edd88ec0..4e9a54445 100644
--- a/examples/desktop/desktop.cpp
+++ b/examples/desktop/desktop.cpp
@@ -9,7 +9,7 @@
 
 #include <tqimage.h>
 #include <tqbitmap.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqapplication.h>
 #include <tqdropsite.h>
 #include <tqdragobject.h>
diff --git a/examples/desktop/desktop.doc b/examples/desktop/desktop.doc
index 3a7df648e..0da3b4393 100644
--- a/examples/desktop/desktop.doc
+++ b/examples/desktop/desktop.doc
@@ -7,7 +7,7 @@
   \title Painting on the Desktop
 
   The desktop demo contains three routines, each of which draws
-  something on the desktop.  It does some nice stuff with QPainter,
+  something on the desktop.  It does some nice stuff with TQPainter,
   and also demonstrates how one can treat the desktop as a widget like
   any other.
 
diff --git a/examples/dragdrop/dropsite.h b/examples/dragdrop/dropsite.h
index 020aaeaad..0714bbb3b 100644
--- a/examples/dragdrop/dropsite.h
+++ b/examples/dragdrop/dropsite.h
@@ -15,7 +15,7 @@
 #define DROPSITE_H
 
 #include <ntqlabel.h>
-#include <ntqmovie.h>
+#include <tqmovie.h>
 #include "tqdropsite.h"
 
 class TQDragObject;
diff --git a/examples/drawdemo/drawdemo.cpp b/examples/drawdemo/drawdemo.cpp
index 94a2b80e9..3ca91496b 100644
--- a/examples/drawdemo/drawdemo.cpp
+++ b/examples/drawdemo/drawdemo.cpp
@@ -8,7 +8,7 @@
 *****************************************************************************/
 
 #include <tqwidget.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqprinter.h>
 #include <ntqpushbutton.h>
 #include <ntqradiobutton.h>
diff --git a/examples/drawlines/connect.cpp b/examples/drawlines/connect.cpp
index b71b43d51..37c8a4690 100644
--- a/examples/drawlines/connect.cpp
+++ b/examples/drawlines/connect.cpp
@@ -8,7 +8,7 @@
 *****************************************************************************/
 
 #include <tqwidget.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqapplication.h>
 #include <stdlib.h>
 
diff --git a/examples/fileiconview/tqfileiconview.cpp b/examples/fileiconview/tqfileiconview.cpp
index 9f4d17d7b..1dde840b9 100644
--- a/examples/fileiconview/tqfileiconview.cpp
+++ b/examples/fileiconview/tqfileiconview.cpp
@@ -8,7 +8,7 @@
 *****************************************************************************/
 
 #include "tqfileiconview.h"
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqstringlist.h>
 #include <ntqpixmap.h>
 #include <tqmime.h>
diff --git a/examples/fonts/fonts.pro b/examples/fonts/fonts.pro
index 8659474bd..4117eb598 100644
--- a/examples/fonts/fonts.pro
+++ b/examples/fonts/fonts.pro
@@ -2,4 +2,4 @@ TEMPLATE	= subdirs
 
 CONFIG 		+= ordered
 
-SUBDIRS		= simple-qfont-demo
+SUBDIRS		= simple-tqfont-demo
diff --git a/examples/fonts/simple-qfont-demo/simple-qfont-demo.doc b/examples/fonts/simple-qfont-demo/simple-qfont-demo.doc
deleted file mode 100644
index 8b0a3657e..000000000
--- a/examples/fonts/simple-qfont-demo/simple-qfont-demo.doc
+++ /dev/null
@@ -1,28 +0,0 @@
-/*! \page simple-font-demo-example.html
-
-  \ingroup qfont-examples
-
-  \title A simple demonstration of QFont member functions
- 
-  This example demonstrates the use of various
-  QFont member functions.
-
-  <hr>
-
-  The main window API (viewer.h):
-
-  \include fonts/simple-qfont-demo/viewer.h
-
-  <hr>
-
-  The main window implementation (viewer.cpp):
-
-  \include fonts/simple-qfont-demo/viewer.cpp
-
-  <hr>
- 
-  main() program (simple-qfont-demo.cpp):
- 
-  \include fonts/simple-qfont-demo/simple-qfont-demo.cpp
-
-*/
diff --git a/examples/fonts/simple-qfont-demo/simple-qfont-demo.cpp b/examples/fonts/simple-tqfont-demo/simple-tqfont-demo.cpp
index aa12a5055..aa12a5055 100644
--- a/examples/fonts/simple-qfont-demo/simple-qfont-demo.cpp
+++ b/examples/fonts/simple-tqfont-demo/simple-tqfont-demo.cpp
diff --git a/examples/fonts/simple-tqfont-demo/simple-tqfont-demo.doc b/examples/fonts/simple-tqfont-demo/simple-tqfont-demo.doc
new file mode 100644
index 000000000..bc8819260
--- /dev/null
+++ b/examples/fonts/simple-tqfont-demo/simple-tqfont-demo.doc
@@ -0,0 +1,28 @@
+/*! \page simple-font-demo-example.html
+
+  \ingroup tqfont-examples
+
+  \title A simple demonstration of TQFont member functions
+ 
+  This example demonstrates the use of various
+  TQFont member functions.
+
+  <hr>
+
+  The main window API (viewer.h):
+
+  \include fonts/simple-tqfont-demo/viewer.h
+
+  <hr>
+
+  The main window implementation (viewer.cpp):
+
+  \include fonts/simple-tqfont-demo/viewer.cpp
+
+  <hr>
+ 
+  main() program (simple-tqfont-demo.cpp):
+ 
+  \include fonts/simple-tqfont-demo/simple-tqfont-demo.cpp
+
+*/
diff --git a/examples/fonts/simple-qfont-demo/simple-qfont-demo.pro b/examples/fonts/simple-tqfont-demo/simple-tqfont-demo.pro
index a85e83ce4..d740c4701 100644
--- a/examples/fonts/simple-qfont-demo/simple-qfont-demo.pro
+++ b/examples/fonts/simple-tqfont-demo/simple-tqfont-demo.pro
@@ -7,5 +7,5 @@ DEPENDPATH	= ../../include
 REQUIRES 	= full-config
 
 HEADERS		= viewer.h
-SOURCES		= simple-qfont-demo.cpp \
+SOURCES		= simple-tqfont-demo.cpp \
 	          viewer.cpp
diff --git a/examples/fonts/simple-qfont-demo/viewer.cpp b/examples/fonts/simple-tqfont-demo/viewer.cpp
index 88c202e3d..88c202e3d 100644
--- a/examples/fonts/simple-qfont-demo/viewer.cpp
+++ b/examples/fonts/simple-tqfont-demo/viewer.cpp
diff --git a/examples/fonts/simple-qfont-demo/viewer.h b/examples/fonts/simple-tqfont-demo/viewer.h
index 955ffe72f..cfc6be406 100644
--- a/examples/fonts/simple-qfont-demo/viewer.h
+++ b/examples/fonts/simple-tqfont-demo/viewer.h
@@ -4,7 +4,7 @@
 
 
 #include <tqwidget.h>
-#include <ntqfont.h>
+#include <tqfont.h>
 
 class TQTextView;
 class TQPushButton;
diff --git a/examples/forever/forever.cpp b/examples/forever/forever.cpp
index 4ba9b8c58..54fe49b6d 100644
--- a/examples/forever/forever.cpp
+++ b/examples/forever/forever.cpp
@@ -8,7 +8,7 @@
 *****************************************************************************/
 
 #include <tqtimer.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqapplication.h>
 #include <stdlib.h>				// defines rand() function
 
diff --git a/examples/gridview/gridview.cpp b/examples/gridview/gridview.cpp
index b074a09dc..823580a23 100644
--- a/examples/gridview/gridview.cpp
+++ b/examples/gridview/gridview.cpp
@@ -9,7 +9,7 @@
 
 #include <ntqapplication.h>
 #include <ntqgridview.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 
 // Grid size
 const int numRows = 100;
diff --git a/examples/hello/hello.cpp b/examples/hello/hello.cpp
index 34c02af49..d0d992ee4 100644
--- a/examples/hello/hello.cpp
+++ b/examples/hello/hello.cpp
@@ -10,7 +10,7 @@
 #include "hello.h"
 #include <ntqpushbutton.h>
 #include <tqtimer.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqpixmap.h>
 
 
diff --git a/examples/helpviewer/helpwindow.cpp b/examples/helpviewer/helpwindow.cpp
index 8a99230cc..a7558a6c2 100644
--- a/examples/helpviewer/helpwindow.cpp
+++ b/examples/helpviewer/helpwindow.cpp
@@ -30,8 +30,8 @@
 #include <tqdatastream.h>
 #include <ntqprinter.h>
 #include <ntqsimplerichtext.h>
-#include <ntqpainter.h>
-#include <ntqpaintdevicemetrics.h>
+#include <tqpainter.h>
+#include <tqpaintdevicemetrics.h>
 
 #include <ctype.h>
 
diff --git a/examples/layout/layout.cpp b/examples/layout/layout.cpp
index 0989ccb4f..872a31d25 100644
--- a/examples/layout/layout.cpp
+++ b/examples/layout/layout.cpp
@@ -9,7 +9,7 @@
 
 #include <ntqapplication.h>
 #include <ntqlabel.h>
-#include <ntqcolor.h>
+#include <tqcolor.h>
 #include <ntqpushbutton.h>
 #include <ntqlayout.h>
 #include <ntqlineedit.h>
diff --git a/examples/life/life.cpp b/examples/life/life.cpp
index c86340a40..50e03febc 100644
--- a/examples/life/life.cpp
+++ b/examples/life/life.cpp
@@ -9,7 +9,7 @@
 
 #include "life.h"
 
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqdrawutil.h>
 #include <ntqcheckbox.h>
 #include <ntqevent.h>
diff --git a/examples/listboxcombo/listboxcombo.cpp b/examples/listboxcombo/listboxcombo.cpp
index 041038fec..1c13287d9 100644
--- a/examples/listboxcombo/listboxcombo.cpp
+++ b/examples/listboxcombo/listboxcombo.cpp
@@ -17,7 +17,7 @@
 #include <ntqpixmap.h>
 #include <ntqlabel.h>
 #include <tqimage.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqstyle.h>
 
 
diff --git a/examples/listviews/listviews.cpp b/examples/listviews/listviews.cpp
index 865616fc8..b28de6ff5 100644
--- a/examples/listviews/listviews.cpp
+++ b/examples/listviews/listviews.cpp
@@ -10,7 +10,7 @@
 #include "listviews.h"
 
 #include <ntqlabel.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqpalette.h>
 #include <tqobjectlist.h>
 #include <tqpopupmenu.h>
diff --git a/examples/mdi/application.cpp b/examples/mdi/application.cpp
index 7543dd3fb..e0ca39ba1 100644
--- a/examples/mdi/application.cpp
+++ b/examples/mdi/application.cpp
@@ -15,7 +15,7 @@
 #include <tqtoolbutton.h>
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
-#include <ntqmovie.h>
+#include <tqmovie.h>
 #include <tqfile.h>
 #include <tqfiledialog.h>
 #include <ntqlabel.h>
@@ -27,8 +27,8 @@
 #include <ntqaccel.h>
 #include <tqtextstream.h>
 #include <tqtextedit.h>
-#include <ntqpainter.h>
-#include <ntqpaintdevicemetrics.h>
+#include <tqpainter.h>
+#include <tqpaintdevicemetrics.h>
 #include <ntqwhatsthis.h>
 #include <tqobjectlist.h>
 #include <ntqvbox.h>
diff --git a/examples/menu/menu.cpp b/examples/menu/menu.cpp
index 70d9e4dc4..68611b445 100644
--- a/examples/menu/menu.cpp
+++ b/examples/menu/menu.cpp
@@ -13,7 +13,7 @@
 #include <ntqapplication.h>
 #include <ntqmessagebox.h>
 #include <ntqpixmap.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 
 /* XPM */
 static const char * p1_xpm[] = {
diff --git a/examples/movies/main.cpp b/examples/movies/main.cpp
index 95c7b95a4..c94d51271 100644
--- a/examples/movies/main.cpp
+++ b/examples/movies/main.cpp
@@ -11,9 +11,9 @@
 #include <tqfiledialog.h>
 #include <ntqpushbutton.h>
 #include <ntqlabel.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqmessagebox.h>
-#include <ntqmovie.h>
+#include <tqmovie.h>
 #include <ntqvbox.h>
 
 
diff --git a/examples/movies/movies.doc b/examples/movies/movies.doc
index af702d3e9..eba88ef3c 100644
--- a/examples/movies/movies.doc
+++ b/examples/movies/movies.doc
@@ -5,7 +5,7 @@
   \ingroup examples
   \title Movies or the Story of the Animated GIF file
 
-  The Movies example displays MNG and animated GIF files using the QMovie and
+  The Movies example displays MNG and animated GIF files using the TQMovie and
   QLabel classes.
 
   The movies will only read an animated GIF if GIF reading was enabled when TQt was built.
diff --git a/examples/network/remotecontrol/remotectrlimpl.cpp b/examples/network/remotecontrol/remotectrlimpl.cpp
index 9df3c5c9e..e92aef67d 100644
--- a/examples/network/remotecontrol/remotectrlimpl.cpp
+++ b/examples/network/remotecontrol/remotectrlimpl.cpp
@@ -4,7 +4,7 @@
 #include <ntqlineedit.h>
 #include <tqsocket.h>
 #include <tqfiledialog.h>
-#include <ntqcolordialog.h>
+#include <tqcolordialog.h>
 #include <tqimage.h>
 
 RemoteCtrlImpl::RemoteCtrlImpl( TQSocket *s )
diff --git a/examples/opengl/glpixmap/globjwin.cpp b/examples/opengl/glpixmap/globjwin.cpp
index a34dd3cd8..9a5b8bf11 100644
--- a/examples/opengl/glpixmap/globjwin.cpp
+++ b/examples/opengl/glpixmap/globjwin.cpp
@@ -25,7 +25,7 @@
 #include <ntqkeycode.h>
 #include <ntqpixmap.h>
 #include <tqimage.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include "globjwin.h"
 #include "glbox.h"
 
diff --git a/examples/opengl/overlay_x11/README b/examples/opengl/overlay_x11/README
index 03dda2e83..f11c439df 100644
--- a/examples/opengl/overlay_x11/README
+++ b/examples/opengl/overlay_x11/README
@@ -64,7 +64,7 @@ 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 QColorGroup: Instead of the somewhat
+Using with QPalette and TQColorGroup: Instead of the somewhat
 simplistic setBackgroundColor( transparentColor ), you can use Qt's
 QPalette system for having your overlay widgets use transparent color
 for what you want. This way, the normal TQt widgets can be used as
diff --git a/examples/opengl/overlay_x11/README.X11-OVERLAYS b/examples/opengl/overlay_x11/README.X11-OVERLAYS
index 4e7a9b647..18bcb1e5f 100644
--- a/examples/opengl/overlay_x11/README.X11-OVERLAYS
+++ b/examples/opengl/overlay_x11/README.X11-OVERLAYS
@@ -47,7 +47,7 @@ Given the above, a QGLWidget 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
 it, without destroying the image in the OpenGL window. In other words,
-one can use all the drawing capabilities of QPainter to draw the
+one can use all the drawing capabilities of TQPainter to draw the
 annotations, rubberbands, whatever. For the typical use of overlays,
 this is much easier than using OpenGL for rendering the annotations.
 
diff --git a/examples/opengl/overlay_x11/overlay_x11.doc b/examples/opengl/overlay_x11/overlay_x11.doc
index 143d64f8f..8b2f0a459 100644
--- a/examples/opengl/overlay_x11/overlay_x11.doc
+++ b/examples/opengl/overlay_x11/overlay_x11.doc
@@ -69,7 +69,7 @@ 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 QColorGroup.} Instead of the
+\i \e{Using together with QPalette and TQColorGroup.} Instead of the
 simplistic setBackgroundColor( transparentColor ), you can
 use Qt's QPalette system to make your overlay widgets use
 transparent color for what you want. This way, the normal TQt widgets
diff --git a/examples/opengl/overlay_x11/rubberbandwidget.cpp b/examples/opengl/overlay_x11/rubberbandwidget.cpp
index a11a81441..d0e60bdc5 100644
--- a/examples/opengl/overlay_x11/rubberbandwidget.cpp
+++ b/examples/opengl/overlay_x11/rubberbandwidget.cpp
@@ -11,7 +11,7 @@
 *****************************************************************************/
 
 #include "rubberbandwidget.h"
-#include <ntqpainter.h>
+#include <tqpainter.h>
 
 
 RubberbandWidget::RubberbandWidget( TQColor transparentColor, TQWidget *parent, 
diff --git a/examples/picture/picture.cpp b/examples/picture/picture.cpp
index 276347506..97562293a 100644
--- a/examples/picture/picture.cpp
+++ b/examples/picture/picture.cpp
@@ -8,7 +8,7 @@
 *****************************************************************************/
 
 #include <ntqapplication.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqpicture.h>
 #include <ntqpixmap.h>
 #include <tqwidget.h>
diff --git a/examples/progress/progress.cpp b/examples/progress/progress.cpp
index f7c29f6aa..8086b81c1 100644
--- a/examples/progress/progress.cpp
+++ b/examples/progress/progress.cpp
@@ -11,7 +11,7 @@
 #include <ntqapplication.h>
 #include <tqmenubar.h>
 #include <tqpopupmenu.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <stdlib.h>
 
 class AnimatedThingy : public TQLabel {
diff --git a/examples/qfd/fontdisplayer.cpp b/examples/qfd/fontdisplayer.cpp
index fceff108f..0e77e7068 100644
--- a/examples/qfd/fontdisplayer.cpp
+++ b/examples/qfd/fontdisplayer.cpp
@@ -11,12 +11,12 @@
 #include <ntqapplication.h>
 #include <ntqslider.h>
 #include <ntqspinbox.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqtoolbar.h>
 #include <tqstatusbar.h>
 #include <ntqlabel.h>
 #include <ntqpushbutton.h>
-#include <ntqfontdialog.h>
+#include <tqfontdialog.h>
 #include <stdlib.h>
 
 
diff --git a/examples/qfd/qfd.cpp b/examples/qfd/qfd.cpp
index c8d397f21..752a59e99 100644
--- a/examples/qfd/qfd.cpp
+++ b/examples/qfd/qfd.cpp
@@ -11,7 +11,7 @@
 
 #include <ntqapplication.h>
 #include <ntqslider.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqstatusbar.h>
 
 
diff --git a/examples/qmag/qmag.cpp b/examples/qmag/qmag.cpp
index b44730f85..d21e06ebb 100644
--- a/examples/qmag/qmag.cpp
+++ b/examples/qmag/qmag.cpp
@@ -16,7 +16,7 @@
 #include <tqregexp.h>
 
 #include <ntqapplication.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqwmatrix.h>
 
 
diff --git a/examples/qwerty/qwerty.cpp b/examples/qwerty/qwerty.cpp
index 650503ba1..748b032b6 100644
--- a/examples/qwerty/qwerty.cpp
+++ b/examples/qwerty/qwerty.cpp
@@ -13,11 +13,11 @@
 #include <tqfiledialog.h>
 #include <tqpopupmenu.h>
 #include <tqtextstream.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqmessagebox.h>
-#include <ntqpaintdevicemetrics.h>
+#include <tqpaintdevicemetrics.h>
 #include <tqptrlist.h>
-#include <ntqfontdialog.h>
+#include <tqfontdialog.h>
 
 #include <tqtextcodec.h>
 
diff --git a/examples/richtext/richtext.cpp b/examples/richtext/richtext.cpp
index ea9589138..6cf45e048 100644
--- a/examples/richtext/richtext.cpp
+++ b/examples/richtext/richtext.cpp
@@ -13,7 +13,7 @@
 #include <ntqhbox.h>
 #include <ntqpushbutton.h>
 #include <tqtextview.h>
-#include <ntqbrush.h>
+#include <tqbrush.h>
 #include <ntqapplication.h>
 
 static const char* sayings[] = {
diff --git a/examples/scribble/scribble.cpp b/examples/scribble/scribble.cpp
index 6c26cea0c..b25064961 100644
--- a/examples/scribble/scribble.cpp
+++ b/examples/scribble/scribble.cpp
@@ -11,14 +11,14 @@
 
 #include <ntqapplication.h>
 #include <ntqevent.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqtoolbar.h>
 #include <tqtoolbutton.h>
 #include <ntqspinbox.h>
 #include <tqtooltip.h>
 #include <ntqrect.h>
 #include <ntqpoint.h>
-#include <ntqcolordialog.h>
+#include <tqcolordialog.h>
 #include <tqfiledialog.h>
 #include <ntqcursor.h>
 #include <tqimage.h>
diff --git a/examples/scrollview/scrollview.cpp b/examples/scrollview/scrollview.cpp
index 60088add9..f7afda02c 100644
--- a/examples/scrollview/scrollview.cpp
+++ b/examples/scrollview/scrollview.cpp
@@ -12,7 +12,7 @@
 #include <tqmenubar.h>
 #include <tqpopupmenu.h>
 #include <ntqpushbutton.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqpixmap.h>
 #include <ntqmessagebox.h>
 #include <ntqlayout.h>
diff --git a/examples/showimg/README b/examples/showimg/README
index 1061cd750..ba0cb7689 100644
--- a/examples/showimg/README
+++ b/examples/showimg/README
@@ -3,7 +3,7 @@ conversion facilities available. The CuteWidget can read a file into
 a pixmap and resizes the displayed pixmap when the widget is resized.
 
 Note that the function CuteWidget::paintEvent uses the drawPixmap function
-of QPainter to display the pixmap, the bitBlt function can also be used to
+of TQPainter to display the pixmap, the bitBlt function can also be used to
 display pixmaps.
 
 If you have installed the TQt imageio extension (see extensions/imageio
diff --git a/examples/showimg/showimg.cpp b/examples/showimg/showimg.cpp
index 00ca3a453..594d6c0e0 100644
--- a/examples/showimg/showimg.cpp
+++ b/examples/showimg/showimg.cpp
@@ -14,7 +14,7 @@
 #include <ntqmessagebox.h>
 #include <tqpopupmenu.h>
 #include <ntqlabel.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqapplication.h>
 #include <tqclipboard.h>
 
diff --git a/examples/splitter/splitter.cpp b/examples/splitter/splitter.cpp
index fd9f539d8..ee85f5d78 100644
--- a/examples/splitter/splitter.cpp
+++ b/examples/splitter/splitter.cpp
@@ -12,7 +12,7 @@
 #include <ntqsplitter.h>
 #include <ntqmultilineedit.h>
 
-#include <ntqpainter.h>
+#include <tqpainter.h>
 
 
 class Test : public TQWidget {
diff --git a/examples/sql/overview/table4/main.h b/examples/sql/overview/table4/main.h
index 5d5c5736a..d4e84d2ce 100644
--- a/examples/sql/overview/table4/main.h
+++ b/examples/sql/overview/table4/main.h
@@ -10,7 +10,7 @@
 #include <ntqapplication.h>
 #include <ntqcombobox.h>
 #include <tqmap.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqsqldatabase.h>
 #include <tqsqlcursor.h>
 #include <tqsqleditorfactory.h>
diff --git a/examples/tablet/canvas.cpp b/examples/tablet/canvas.cpp
index cd5da7d81..7a2fe6098 100644
--- a/examples/tablet/canvas.cpp
+++ b/examples/tablet/canvas.cpp
@@ -10,7 +10,7 @@
 #include "canvas.h"
 
 #include <ntqapplication.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqevent.h>
 #include <ntqrect.h>
 
diff --git a/examples/tablet/scribble.cpp b/examples/tablet/scribble.cpp
index d07a0c9a5..c44667308 100644
--- a/examples/tablet/scribble.cpp
+++ b/examples/tablet/scribble.cpp
@@ -12,14 +12,14 @@
 
 #include <ntqapplication.h>
 #include <ntqevent.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqtoolbar.h>
 #include <tqtoolbutton.h>
 #include <ntqspinbox.h>
 #include <tqtooltip.h>
 #include <ntqrect.h>
 #include <ntqpoint.h>
-#include <ntqcolordialog.h>
+#include <tqcolordialog.h>
 #include <tqfiledialog.h>
 #include <ntqcursor.h>
 #include <tqimage.h>
diff --git a/examples/tablet/tabletstats.cpp b/examples/tablet/tabletstats.cpp
index 07bf2d447..8fb69a00f 100644
--- a/examples/tablet/tabletstats.cpp
+++ b/examples/tablet/tabletstats.cpp
@@ -9,7 +9,7 @@
 
 #include <ntqlabel.h>
 #include <ntqlayout.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <math.h>
 
 #include "tabletstats.h"
diff --git a/examples/tetrix/qtetrix.h b/examples/tetrix/qtetrix.h
index b0731c872..b15bbfb1a 100644
--- a/examples/tetrix/qtetrix.h
+++ b/examples/tetrix/qtetrix.h
@@ -15,7 +15,7 @@
 #include <ntqlcdnumber.h>
 #include <ntqlabel.h>
 #include <ntqpushbutton.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 
 
 class ShowNextPiece : public TQFrame
diff --git a/examples/tetrix/qtetrixb.cpp b/examples/tetrix/qtetrixb.cpp
index f6a8fc9b6..a0e33b249 100644
--- a/examples/tetrix/qtetrixb.cpp
+++ b/examples/tetrix/qtetrixb.cpp
@@ -10,7 +10,7 @@
 #include "qtetrixb.h"
 #include "qtetrix.h"
 #include <tqtimer.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 
 const int waitAfterLineTime = 500;
 
diff --git a/examples/tetrix/tetrix.cpp b/examples/tetrix/tetrix.cpp
index 7cb623240..80409e09c 100644
--- a/examples/tetrix/tetrix.cpp
+++ b/examples/tetrix/tetrix.cpp
@@ -9,7 +9,7 @@
 
 #include "qtetrix.h"
 #include "tqdragapp.h"
-#include "ntqfont.h"
+#include "tqfont.h"
 
 int main( int argc, char **argv )
 {
diff --git a/examples/tetrix/tqdragapp.cpp b/examples/tetrix/tqdragapp.cpp
index 82cdfb612..b759403aa 100644
--- a/examples/tetrix/tqdragapp.cpp
+++ b/examples/tetrix/tqdragapp.cpp
@@ -12,9 +12,9 @@
 #include "tqintdict.h"
 #include "tqpopupmenu.h"
 #include "ntqguardedptr.h"
-#include "ntqcolor.h"
+#include "tqcolor.h"
 #include "tqwidget.h"
-#include "ntqfontmetrics.h"
+#include "tqfontmetrics.h"
 #include "ntqcursor.h"
 #include "tqobjectlist.h"
 
diff --git a/examples/textedit/textedit.cpp b/examples/textedit/textedit.cpp
index e814901ff..e8fd0b123 100644
--- a/examples/textedit/textedit.cpp
+++ b/examples/textedit/textedit.cpp
@@ -16,17 +16,17 @@
 #include <tqtoolbar.h>
 #include <ntqtabwidget.h>
 #include <ntqapplication.h>
-#include <ntqfontdatabase.h>
+#include <tqfontdatabase.h>
 #include <ntqcombobox.h>
 #include <ntqlineedit.h>
 #include <tqfileinfo.h>
 #include <tqfile.h>
 #include <tqfiledialog.h>
 #include <ntqprinter.h>
-#include <ntqpaintdevicemetrics.h>
+#include <tqpaintdevicemetrics.h>
 #include <ntqsimplerichtext.h>
-#include <ntqcolordialog.h>
-#include <ntqpainter.h>
+#include <tqcolordialog.h>
+#include <tqpainter.h>
 
 TextEdit::TextEdit( TQWidget *parent, const char *name )
     : TQMainWindow( parent, name )
diff --git a/examples/themes/metal.cpp b/examples/themes/metal.cpp
index 5f9ead623..edf9fb15c 100644
--- a/examples/themes/metal.cpp
+++ b/examples/themes/metal.cpp
@@ -13,7 +13,7 @@
 
 #include "ntqapplication.h"
 #include "ntqcombobox.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqdrawutil.h" // for now
 #include "ntqpixmap.h" // for now
 #include "ntqpalette.h" // for now
diff --git a/examples/themes/themes.cpp b/examples/themes/themes.cpp
index 4825aef4f..31ac8ade8 100644
--- a/examples/themes/themes.cpp
+++ b/examples/themes/themes.cpp
@@ -24,7 +24,7 @@
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
 #include <ntqmessagebox.h>
-#include <ntqfont.h>
+#include <tqfont.h>
 #include <tqstylefactory.h>
 #include <tqaction.h>
 #include <tqsignalmapper.h>
diff --git a/examples/themes/themes.h b/examples/themes/themes.h
index c36e404fe..93e21dde3 100644
--- a/examples/themes/themes.h
+++ b/examples/themes/themes.h
@@ -11,7 +11,7 @@
 #define THEMES_H
 
 #include <tqmainwindow.h>
-#include <ntqfont.h>
+#include <tqfont.h>
 
 class TQTabWidget;
 
diff --git a/examples/themes/wood.cpp b/examples/themes/wood.cpp
index 39c737cd3..ef3ab893f 100644
--- a/examples/themes/wood.cpp
+++ b/examples/themes/wood.cpp
@@ -13,7 +13,7 @@
 
 #include "ntqapplication.h"
 #include "ntqcombobox.h"
-#include "ntqpainter.h"
+#include "tqpainter.h"
 #include "ntqdrawutil.h" // for now
 #include "ntqpixmap.h" // for now
 #include "ntqpalette.h" // for now
diff --git a/examples/tictac/tictac.cpp b/examples/tictac/tictac.cpp
index 64923a5b6..32656a21d 100644
--- a/examples/tictac/tictac.cpp
+++ b/examples/tictac/tictac.cpp
@@ -9,7 +9,7 @@
 
 #include "tictac.h"
 #include <ntqapplication.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqdrawutil.h>
 #include <ntqcombobox.h>
 #include <ntqcheckbox.h>
diff --git a/examples/tooltip/tooltip.cpp b/examples/tooltip/tooltip.cpp
index fe28b56ee..d7406fa88 100644
--- a/examples/tooltip/tooltip.cpp
+++ b/examples/tooltip/tooltip.cpp
@@ -9,7 +9,7 @@
 
 #include "tooltip.h"
 #include <ntqapplication.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <stdlib.h>
 
 
diff --git a/examples/tqdir/tqdir.cpp b/examples/tqdir/tqdir.cpp
index 1a915f9cc..7a29b562a 100644
--- a/examples/tqdir/tqdir.cpp
+++ b/examples/tqdir/tqdir.cpp
@@ -21,7 +21,7 @@
 #include <ntqmultilineedit.h>
 #include <ntqheader.h>
 #include <ntqevent.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <tqpopupmenu.h>
 #include <ntqpushbutton.h>
 #include <tqtoolbutton.h>
diff --git a/examples/widgets/widgets.cpp b/examples/widgets/widgets.cpp
index f89835d03..393aea0c6 100644
--- a/examples/widgets/widgets.cpp
+++ b/examples/widgets/widgets.cpp
@@ -47,7 +47,7 @@
 #include <tqfiledialog.h>
 #include <ntqaccel.h>
 #include <ntqmetaobject.h>
-#include <ntqpainter.h>
+#include <tqpainter.h>
 
 #include "widgets.h"
 
diff --git a/examples/widgets/widgets.h b/examples/widgets/widgets.h
index 0452879e3..d28d33454 100644
--- a/examples/widgets/widgets.h
+++ b/examples/widgets/widgets.h
@@ -15,7 +15,7 @@
 #define WIDGETS_H
 
 #include <tqmainwindow.h>
-#include <ntqmovie.h>
+#include <tqmovie.h>
 #include <ntqlistview.h>
 class TQLabel;
 class TQCheckBox;
diff --git a/examples/xform/xform.cpp b/examples/xform/xform.cpp
index 16eff3196..25b3c967f 100644
--- a/examples/xform/xform.cpp
+++ b/examples/xform/xform.cpp
@@ -19,12 +19,12 @@
 #include <ntqlcdnumber.h>
 #include <ntqslider.h>
 #include <tqmenubar.h>
-#include <ntqfontdialog.h>
+#include <tqfontdialog.h>
 #include <ntqlayout.h>
 #include <ntqvbox.h>
 #include <tqwidgetstack.h>
 
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include <ntqpixmap.h>
 #include <ntqpicture.h>