1 files changed, 9 insertions, 9 deletions
diff --git a/src/canvas/ntqcanvas.h b/src/canvas/ntqcanvas.h
index b104fd8a..b3c25470 100644
--- a/src/canvas/ntqcanvas.h
+++ b/src/canvas/ntqcanvas.h
@@ -51,7 +51,7 @@
 #include "ntqpointarray.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_CANVAS ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_CANVAS )
+#if !defined( TQT_MODULE_CANVAS ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_CANVAS )
 #define TQM_EXPORT_CANVAS
 #define TQM_TEMPLATE_EXTERN_CANVAS
 #else
@@ -218,7 +218,7 @@ class TQCanvasData;
 
 class TQM_EXPORT_CANVAS TQCanvas : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQCanvas( TQObject* parent = 0, const char* name = 0 );
     TQCanvas(int w, int h);
@@ -353,7 +353,7 @@ private:
 
     friend void qt_unview(TQCanvas* c);
 
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQCanvas( const TQCanvas & );
     TQCanvas &operator=( const TQCanvas & );
 #endif
@@ -363,7 +363,7 @@ class TQCanvasViewData;
 
 class TQM_EXPORT_CANVAS TQCanvasView : public TQScrollView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     TQCanvasView(TQWidget* parent=0, const char* name=0, WFlags f=0);
@@ -393,7 +393,7 @@ private slots:
     void updateContentsSize();
 
 private:
-#if defined(Q_DISABLE_COPY) // Disabled copy constructor and operator=
+#if defined(TQ_DISABLE_COPY) // Disabled copy constructor and operator=
     TQCanvasView( const TQCanvasView & );
     TQCanvasView &operator=( const TQCanvasView & );
 #endif
@@ -417,7 +417,7 @@ public:
     void setOffset(int x, int y) { hotx = x; hoty = y; }
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQCanvasPixmap( const TQCanvasPixmap & );
     TQCanvasPixmap &operator=( const TQCanvasPixmap & );
 #endif
@@ -463,7 +463,7 @@ public:
 	{ return (uint)framecount; }
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQCanvasPixmapArray( const TQCanvasPixmapArray & );
     TQCanvasPixmapArray &operator=( const TQCanvasPixmapArray & );
 #endif
@@ -529,7 +529,7 @@ public:
     void draw(TQPainter& painter);
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQCanvasSprite( const TQCanvasSprite & );
     TQCanvasSprite &operator=( const TQCanvasSprite & );
 #endif
@@ -786,7 +786,7 @@ protected:
     virtual void draw(TQPainter&);
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQCanvasText( const TQCanvasText & );
     TQCanvasText &operator=( const TQCanvasText & );
 #endif