From 3fda03faf1b67aa1221099f3a2153a0aa40811ef Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 14 Feb 2012 21:17:02 -0600
Subject: Update various qt function definitions and static methods for tqt3

---
 kjsembed/tools/headers/qcanvas.h | 14 +++++++-------
 kjsembed/tools/headers/qtimer.h  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'kjsembed')

diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h
index bdf46d83..e784261c 100644
--- a/kjsembed/tools/headers/qcanvas.h
+++ b/kjsembed/tools/headers/qcanvas.h
@@ -48,7 +48,7 @@
 #include "tqpointarray.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
@@ -344,7 +344,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
@@ -384,7 +384,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
@@ -408,7 +408,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
@@ -454,7 +454,7 @@ public:
 	{ return (uint)framecount; }
 
 private:
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQCanvasPixmapArray( const TQCanvasPixmapArray & );
     TQCanvasPixmapArray &operator=( const TQCanvasPixmapArray & );
 #endif
@@ -520,7 +520,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
@@ -776,7 +776,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
diff --git a/kjsembed/tools/headers/qtimer.h b/kjsembed/tools/headers/qtimer.h
index 20bfe9da..1f7115f2 100644
--- a/kjsembed/tools/headers/qtimer.h
+++ b/kjsembed/tools/headers/qtimer.h
@@ -72,7 +72,7 @@ private:
     uint nulltimer : 1;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQTimer( const TQTimer & );
     TQTimer &operator=( const TQTimer & );
 #endif
-- 
cgit v1.2.1