11 files changed, 24 insertions, 24 deletions
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 )