Update to latest tqt3 automated conversion

3 files changed, 31 insertions, 31 deletions

diff --git a/src/canvas/qcanvas.h b/src/canvas/ntqcanvas.h
index 37c30816d..b104fd8a6 100644
--- a/src/canvas/qcanvas.h
+++ b/src/canvas/ntqcanvas.h
@@ -42,13 +42,13 @@
 #define TQCANVAS_H
 
 #ifndef QT_H
-#include "qscrollview.h"
-#include "qpixmap.h"
-#include "qptrlist.h"
-#include "qbrush.h"
-#include "qpen.h"
-#include "qvaluelist.h"
-#include "qpointarray.h"
+#include "ntqscrollview.h"
+#include "ntqpixmap.h"
+#include "ntqptrlist.h"
+#include "ntqbrush.h"
+#include "ntqpen.h"
+#include "ntqvaluelist.h"
+#include "ntqpointarray.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_CANVAS ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_CANVAS )
@@ -810,7 +810,7 @@ private:
 };
 
 #define Q_DEFINED_QCANVAS
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif // QT_NO_CANVAS
 
 #endif // TQCANVAS_H
diff --git a/src/canvas/qcanvas.cpp b/src/canvas/qcanvas.cpp
index 167e02094..7b337fb49 100644
--- a/src/canvas/qcanvas.cpp
+++ b/src/canvas/qcanvas.cpp
@@ -38,16 +38,16 @@
 **
 **********************************************************************/
 
-#include "qcanvas.h"
+#include "ntqcanvas.h"
 #ifndef QT_NO_CANVAS
-#include "qapplication.h"
-#include "qbitmap.h"
-#include "qimage.h"
-#include "qptrdict.h"
-#include "qpainter.h"
-#include "qpolygonscanner.h"
-#include "qtimer.h"
-#include "qtl.h"
+#include "ntqapplication.h"
+#include "ntqbitmap.h"
+#include "ntqimage.h"
+#include "ntqptrdict.h"
+#include "ntqpainter.h"
+#include "ntqpolygonscanner.h"
+#include "ntqtimer.h"
+#include "ntqtl.h"
 
 #include <stdlib.h>
 
@@ -436,7 +436,7 @@ static int scm(int a, int b)
 
 
 /*!
-    \class TQCanvas qcanvas.h
+    \class TQCanvas ntqcanvas.h
     \brief The TQCanvas class provides a 2D area that can contain TQCanvasItem objects.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -1844,7 +1844,7 @@ class TQCanvasItemExtra {
 
 
 /*!
-    \class TQCanvasItem qcanvas.h
+    \class TQCanvasItem ntqcanvas.h
     \brief The TQCanvasItem class provides an abstract graphic object on a TQCanvas.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -2484,7 +2484,7 @@ static bool collision_double_dispatch( const TQCanvasSprite* s1,
 
 
 /*!
-    \class TQCanvasSprite qcanvas.h
+    \class TQCanvasSprite ntqcanvas.h
     \brief The TQCanvasSprite class provides an animated canvas item on a TQCanvas.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -2801,7 +2801,7 @@ TQRect TQCanvasItem::boundingRectAdvanced() const
 }
 
 /*!
-    \class TQCanvasPixmap qcanvas.h
+    \class TQCanvasPixmap ntqcanvas.h
     \brief The TQCanvasPixmap class provides pixmaps for TQCanvasSprites.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -2931,7 +2931,7 @@ TQCanvasPixmap::~TQCanvasPixmap()
 */
 
 /*!
-    \class TQCanvasPixmapArray qcanvas.h
+    \class TQCanvasPixmapArray ntqcanvas.h
     \brief The TQCanvasPixmapArray class provides an array of TQCanvasPixmaps.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -3457,7 +3457,7 @@ void TQCanvasSprite::draw(TQPainter& painter)
 }
 
 /*!
-    \class TQCanvasView qcanvas.h
+    \class TQCanvasView ntqcanvas.h
     \brief The TQCanvasView class provides an on-screen view of a TQCanvas.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -3726,7 +3726,7 @@ TQSize TQCanvasView::sizeHint() const
 // ### TQt 4.0 customer request: operate on doubles rather than int.
 // ### I know, almost impossible due to the use of TQRegion etc.
 /*!
-    \class TQCanvasPolygonalItem qcanvas.h
+    \class TQCanvasPolygonalItem ntqcanvas.h
     \brief The TQCanvasPolygonalItem class provides a polygonal canvas item
     on a TQCanvas.
 \if defined(commercial)
@@ -4135,7 +4135,7 @@ void TQCanvasPolygonalItem::setBrush(TQBrush b)
 
 
 /*!
-    \class TQCanvasPolygon qcanvas.h
+    \class TQCanvasPolygon ntqcanvas.h
     \brief The TQCanvasPolygon class provides a polygon on a TQCanvas.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -4228,7 +4228,7 @@ void TQCanvasPolygon::moveBy(double dx, double dy)
 }
 
 /*!
-    \class TQCanvasSpline qcanvas.h
+    \class TQCanvasSpline ntqcanvas.h
     \brief The TQCanvasSpline class provides multi-bezier splines on a TQCanvas.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -4390,7 +4390,7 @@ TQPointArray TQCanvasPolygon::areaPoints() const
 // points -- that way for some uses just the constructor call would be
 // required?
 /*!
-    \class TQCanvasLine qcanvas.h
+    \class TQCanvasLine ntqcanvas.h
     \brief The TQCanvasLine class provides a line on a TQCanvas.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -4534,7 +4534,7 @@ void TQCanvasLine::moveBy(double dx, double dy)
 }
 
 /*!
-    \class TQCanvasRectangle qcanvas.h
+    \class TQCanvasRectangle ntqcanvas.h
     \brief The TQCanvasRectangle class provides a rectangle on a TQCanvas.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -4672,7 +4672,7 @@ void TQCanvasRectangle::drawShape(TQPainter & p)
 
 
 /*!
-    \class TQCanvasEllipse qcanvas.h
+    \class TQCanvasEllipse ntqcanvas.h
     \brief The TQCanvasEllipse class provides an ellipse or ellipse segment on a TQCanvas.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -4859,7 +4859,7 @@ void TQCanvasEllipse::drawShape(TQPainter & p)
 
 
 /*!
-    \class TQCanvasText qcanvas.h
+    \class TQCanvasText ntqcanvas.h
     \brief The TQCanvasText class provides a text object on a TQCanvas.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/canvas/qt_canvas.pri b/src/canvas/qt_canvas.pri
index 779a52153..ad3ee30bb 100644
--- a/src/canvas/qt_canvas.pri
+++ b/src/canvas/qt_canvas.pri
@@ -1,6 +1,6 @@
 # Qt canvas module
 
 canvas {
-	HEADERS += $$CANVAS_H/qcanvas.h
+	HEADERS += $$CANVAS_H/ntqcanvas.h
 	SOURCES += $$CANVAS_CPP/qcanvas.cpp
 }