Update to latest tqt3 automated conversion

1 files changed, 48 insertions, 48 deletions

diff --git a/doc/html/t11-cannon-cpp.html b/doc/html/t11-cannon-cpp.html
index bd2f1f4ea..eeb1104f6 100644
--- a/doc/html/t11-cannon-cpp.html
+++ b/doc/html/t11-cannon-cpp.html
@@ -39,25 +39,25 @@ body { background: #ffffff; color: black; }
 ****************************************************************/
 
 #include "cannon.h"
-#include &lt;<a href="qtimer-h.html">qtimer.h</a>&gt;
-#include &lt;<a href="qpainter-h.html">qpainter.h</a>&gt;
-#include &lt;<a href="qpixmap-h.html">qpixmap.h</a>&gt;
+#include &lt;<a href="qtimer-h.html">ntqtimer.h</a>&gt;
+#include &lt;<a href="qpainter-h.html">ntqpainter.h</a>&gt;
+#include &lt;<a href="qpixmap-h.html">ntqpixmap.h</a>&gt;
 
 #include &lt;math.h&gt;
 
 
-<a name="f57"></a>CannonField::CannonField( <a href="qwidget.html">TQWidget</a> *parent, const char *name )
-        : <a href="qwidget.html">TQWidget</a>( parent, name )
+<a name="f57"></a>CannonField::CannonField( <a href="ntqwidget.html">TQWidget</a> *parent, const char *name )
+        : <a href="ntqwidget.html">TQWidget</a>( parent, name )
 {
     ang = 45;
     f = 0;
     timerCount = 0;
-    autoShootTimer = new <a href="qtimer.html">TQTimer</a>( this, "movement handler" );
-    <a href="qobject.html#connect">connect</a>( autoShootTimer, SIGNAL(<a href="qtimer.html#timeout">timeout</a>()),
+    autoShootTimer = new <a href="ntqtimer.html">TQTimer</a>( this, "movement handler" );
+    <a href="ntqobject.html#connect">connect</a>( autoShootTimer, SIGNAL(<a href="ntqtimer.html#timeout">timeout</a>()),
              this, SLOT(moveShot()) );
     shoot_ang = 0;
     shoot_f = 0;
-    <a href="qwidget.html#setPalette">setPalette</a>( TQPalette( TQColor( 250, 250, 200) ) );
+    <a href="ntqwidget.html#setPalette">setPalette</a>( TQPalette( TQColor( 250, 250, 200) ) );
 }
 
 
@@ -70,7 +70,7 @@ void <a name="f58"></a>CannonField::setAngle( int degrees )
     if ( ang == degrees )
         return;
     ang = degrees;
-    <a href="qwidget.html#repaint">repaint</a>( cannonRect(), FALSE );
+    <a href="ntqwidget.html#repaint">repaint</a>( cannonRect(), FALSE );
     emit angleChanged( ang );
 }
 
@@ -88,77 +88,77 @@ void <a name="f59"></a>CannonField::setForce( int newton )
 
 void <a name="f60"></a>CannonField::shoot()
 {
-    if ( autoShootTimer-&gt;<a href="qtimer.html#isActive">isActive</a>() )
+    if ( autoShootTimer-&gt;<a href="ntqtimer.html#isActive">isActive</a>() )
         return;
     timerCount = 0;
     shoot_ang = ang;
     shoot_f = f;
-    autoShootTimer-&gt;<a href="qtimer.html#start">start</a>( 50 );
+    autoShootTimer-&gt;<a href="ntqtimer.html#start">start</a>( 50 );
 }
 
 
 void <a name="f61"></a>CannonField::moveShot()
 {
-    <a href="qregion.html">TQRegion</a> r( shotRect() );
+    <a href="ntqregion.html">TQRegion</a> r( shotRect() );
     timerCount++;
 
-    <a href="qrect.html">TQRect</a> shotR = shotRect();
+    <a href="ntqrect.html">TQRect</a> shotR = shotRect();
 
-    if ( shotR.<a href="qrect.html#x">x</a>() &gt; width() || shotR.<a href="qrect.html#y">y</a>() &gt; height() )
-        autoShootTimer-&gt;<a href="qtimer.html#stop">stop</a>();
+    if ( shotR.<a href="ntqrect.html#x">x</a>() &gt; width() || shotR.<a href="ntqrect.html#y">y</a>() &gt; height() )
+        autoShootTimer-&gt;<a href="ntqtimer.html#stop">stop</a>();
     else
-        r = r.<a href="qrect.html#unite">unite</a>( TQRegion( shotR ) );
-    <a href="qwidget.html#repaint">repaint</a>( r );
+        r = r.<a href="ntqrect.html#unite">unite</a>( TQRegion( shotR ) );
+    <a href="ntqwidget.html#repaint">repaint</a>( r );
 }
 
 
-void CannonField::<a href="qwidget.html#paintEvent">paintEvent</a>( <a href="qpaintevent.html">TQPaintEvent</a> *e )
+void CannonField::<a href="ntqwidget.html#paintEvent">paintEvent</a>( <a href="qpaintevent.html">TQPaintEvent</a> *e )
 {
-    <a href="qrect.html">TQRect</a> updateR = e-&gt;<a href="qpaintevent.html#rect">rect</a>();
-    <a href="qpainter.html">TQPainter</a> p( this );
+    <a href="ntqrect.html">TQRect</a> updateR = e-&gt;<a href="qpaintevent.html#rect">rect</a>();
+    <a href="ntqpainter.html">TQPainter</a> p( this );
 
-    if ( updateR.<a href="qrect.html#intersects">intersects</a>( cannonRect() ) )
+    if ( updateR.<a href="ntqrect.html#intersects">intersects</a>( cannonRect() ) )
         paintCannon( &amp;p );
-    if ( autoShootTimer-&gt;<a href="qtimer.html#isActive">isActive</a>() &amp;&amp;
-         updateR.<a href="qrect.html#intersects">intersects</a>( shotRect() ) )
+    if ( autoShootTimer-&gt;<a href="ntqtimer.html#isActive">isActive</a>() &amp;&amp;
+         updateR.<a href="ntqrect.html#intersects">intersects</a>( shotRect() ) )
         paintShot( &amp;p );
 }
 
 
-void <a name="f62"></a>CannonField::paintShot( <a href="qpainter.html">TQPainter</a> *p )
+void <a name="f62"></a>CannonField::paintShot( <a href="ntqpainter.html">TQPainter</a> *p )
 {
-    p-&gt;<a href="qpainter.html#setBrush">setBrush</a>( black );
-    p-&gt;<a href="qpainter.html#setPen">setPen</a>( NoPen );
-    p-&gt;<a href="qpainter.html#drawRect">drawRect</a>( shotRect() );
+    p-&gt;<a href="ntqpainter.html#setBrush">setBrush</a>( black );
+    p-&gt;<a href="ntqpainter.html#setPen">setPen</a>( NoPen );
+    p-&gt;<a href="ntqpainter.html#drawRect">drawRect</a>( shotRect() );
 }
 
 
-const <a href="qrect.html">TQRect</a> barrelRect(33, -4, 15, 8);
+const <a href="ntqrect.html">TQRect</a> barrelRect(33, -4, 15, 8);
 
-void <a name="f63"></a>CannonField::paintCannon( <a href="qpainter.html">TQPainter</a> *p )
+void <a name="f63"></a>CannonField::paintCannon( <a href="ntqpainter.html">TQPainter</a> *p )
 {
-    <a href="qrect.html">TQRect</a> cr = cannonRect();
-    <a href="qpixmap.html">TQPixmap</a> pix( cr.<a href="qrect.html#size">size</a>() );
-    pix.<a href="qpixmap.html#fill">fill</a>( this, cr.<a href="qrect.html#topLeft">topLeft</a>() );
+    <a href="ntqrect.html">TQRect</a> cr = cannonRect();
+    <a href="ntqpixmap.html">TQPixmap</a> pix( cr.<a href="ntqrect.html#size">size</a>() );
+    pix.<a href="ntqpixmap.html#fill">fill</a>( this, cr.<a href="ntqrect.html#topLeft">topLeft</a>() );
 
-    <a href="qpainter.html">TQPainter</a> tmp( &amp;pix );
-    tmp.<a href="qpainter.html#setBrush">setBrush</a>( blue );
-    tmp.<a href="qpainter.html#setPen">setPen</a>( NoPen );
+    <a href="ntqpainter.html">TQPainter</a> tmp( &amp;pix );
+    tmp.<a href="ntqpainter.html#setBrush">setBrush</a>( blue );
+    tmp.<a href="ntqpainter.html#setPen">setPen</a>( NoPen );
 
-    tmp.<a href="qpainter.html#translate">translate</a>( 0, pix.<a href="qpixmap.html#height">height</a>() - 1 );
-    tmp.<a href="qpainter.html#drawPie">drawPie</a>( TQRect( -35,-35, 70, 70 ), 0, 90*16 );
-    tmp.<a href="qpainter.html#rotate">rotate</a>( -ang );
-    tmp.<a href="qpainter.html#drawRect">drawRect</a>( barrelRect );
-    tmp.<a href="qpainter.html#end">end</a>();
+    tmp.<a href="ntqpainter.html#translate">translate</a>( 0, pix.<a href="ntqpixmap.html#height">height</a>() - 1 );
+    tmp.<a href="ntqpainter.html#drawPie">drawPie</a>( TQRect( -35,-35, 70, 70 ), 0, 90*16 );
+    tmp.<a href="ntqpainter.html#rotate">rotate</a>( -ang );
+    tmp.<a href="ntqpainter.html#drawRect">drawRect</a>( barrelRect );
+    tmp.<a href="ntqpainter.html#end">end</a>();
 
-    p-&gt;<a href="qpainter.html#drawPixmap">drawPixmap</a>( cr.<a href="qrect.html#topLeft">topLeft</a>(), pix );
+    p-&gt;<a href="ntqpainter.html#drawPixmap">drawPixmap</a>( cr.<a href="ntqrect.html#topLeft">topLeft</a>(), pix );
 }
 
 
 TQRect <a name="f64"></a>CannonField::cannonRect() const
 {
-    <a href="qrect.html">TQRect</a> r( 0, 0, 50, 50 );
-    r.<a href="qrect.html#moveBottomLeft">moveBottomLeft</a>( <a href="qwidget.html#rect">rect</a>().bottomLeft() );
+    <a href="ntqrect.html">TQRect</a> r( 0, 0, 50, 50 );
+    r.<a href="ntqrect.html#moveBottomLeft">moveBottomLeft</a>( <a href="ntqwidget.html#rect">rect</a>().bottomLeft() );
     return r;
 }
 
@@ -173,18 +173,18 @@ TQRect <a name="f65"></a>CannonField::shotRect() const
 
     double velx      = velocity*cos( radians );
     double vely      = velocity*sin( radians );
-    double x0        = ( barrelRect.<a href="qrect.html#right">right</a>()  + 5 )*cos(radians);
-    double y0        = ( barrelRect.<a href="qrect.html#right">right</a>()  + 5 )*sin(radians);
+    double x0        = ( barrelRect.<a href="ntqrect.html#right">right</a>()  + 5 )*cos(radians);
+    double y0        = ( barrelRect.<a href="ntqrect.html#right">right</a>()  + 5 )*sin(radians);
     double x         = x0 + velx*time;
     double y         = y0 + vely*time - 0.5*gravity*time*time;
 
-    <a href="qrect.html">TQRect</a> r = TQRect( 0, 0, 6, 6 );
-    r.<a href="qrect.html#moveCenter">moveCenter</a>( TQPoint( qRound(x), height() - 1 - qRound(y) ) );
+    <a href="ntqrect.html">TQRect</a> r = TQRect( 0, 0, 6, 6 );
+    r.<a href="ntqrect.html#moveCenter">moveCenter</a>( TQPoint( qRound(x), height() - 1 - qRound(y) ) );
     return r;
 }
 
 
-TQSizePolicy CannonField::<a href="qwidget.html#sizePolicy">sizePolicy</a>() const
+TQSizePolicy CannonField::<a href="ntqwidget.html#sizePolicy">sizePolicy</a>() const
 {
     return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
 }