From aac788452d57994e398808c6d0bd53e561a0cd08 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 2 Aug 2010 19:19:58 +0000
Subject: TQt conversion fixes

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebindings@1158421 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kjsembed/tools/headers/qbrush.h  |  2 +-
 kjsembed/tools/headers/qcanvas.h | 52 ++++++++++++++++++++--------------------
 kjsembed/tools/headers/qdir.h    |  4 ++--
 kjsembed/tools/headers/qpen.h    |  2 +-
 4 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'kjsembed/tools')

diff --git a/kjsembed/tools/headers/qbrush.h b/kjsembed/tools/headers/qbrush.h
index e85f0750..82b00044 100644
--- a/kjsembed/tools/headers/qbrush.h
+++ b/kjsembed/tools/headers/qbrush.h
@@ -46,7 +46,7 @@
 
 class Q_EXPORT TQBrush: public Qt
 {
-friend class QPainter;
+friend class TQPainter;
 public:
     TQBrush();
     TQBrush( BrushStyle );
diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h
index 797c4bd3..8eb70959 100644
--- a/kjsembed/tools/headers/qcanvas.h
+++ b/kjsembed/tools/headers/qcanvas.h
@@ -59,18 +59,18 @@
 #ifndef QT_NO_CANVAS
 
 
-class QCanvasSprite;
-class QCanvasPolygonalItem;
-class QCanvasRectangle;
-class QCanvasPolygon;
-class QCanvasEllipse;
-class QCanvasText;
-class QCanvasLine;
-class QCanvasChunk;
-class QCanvas;
-class QCanvasItem;
-class QCanvasView;
-class QCanvasPixmap;
+class TQCanvasSprite;
+class TQCanvasPolygonalItem;
+class TQCanvasRectangle;
+class TQCanvasPolygon;
+class TQCanvasEllipse;
+class TQCanvasText;
+class TQCanvasLine;
+class TQCanvasChunk;
+class TQCanvas;
+class TQCanvasItem;
+class TQCanvasView;
+class TQCanvasPixmap;
 
 
 class QM_EXPORT_CANVAS TQCanvasItemList : public TQValueList<TQCanvasItem*> {
@@ -80,7 +80,7 @@ public:
 };
 
 
-class QCanvasItemExtra;
+class TQCanvasItemExtra;
 
 class QM_EXPORT_CANVAS TQCanvasItem : public Qt
 {
@@ -171,13 +171,13 @@ protected:
 private:
     // For friendly subclasses...
 
-    friend class QCanvasPolygonalItem;
-    friend class QCanvasSprite;
-    friend class QCanvasRectangle;
-    friend class QCanvasPolygon;
-    friend class QCanvasEllipse;
-    friend class QCanvasText;
-    friend class QCanvasLine;
+    friend class TQCanvasPolygonalItem;
+    friend class TQCanvasSprite;
+    friend class TQCanvasRectangle;
+    friend class TQCanvasPolygon;
+    friend class TQCanvasEllipse;
+    friend class TQCanvasText;
+    friend class TQCanvasLine;
 
     virtual TQPointArray chunks() const;
     virtual void addToChunks();
@@ -204,7 +204,7 @@ private:
 };
 
 
-class QCanvasData;
+class TQCanvasData;
 
 class QM_EXPORT_CANVAS TQCanvas : public QObject
 {
@@ -350,7 +350,7 @@ private:
 #endif
 };
 
-class QCanvasViewData;
+class TQCanvasViewData;
 
 class QM_EXPORT_CANVAS TQCanvasView : public QScrollView
 {
@@ -415,8 +415,8 @@ private:
     void init(const TQImage&);
     void init(const TQPixmap& pixmap, int hx, int hy);
 
-    friend class QCanvasSprite;
-    friend class QCanvasPixmapArray;
+    friend class TQCanvasSprite;
+    friend class TQCanvasPixmapArray;
     friend bool qt_testCollision(const TQCanvasSprite* s1, const TQCanvasSprite* s2);
 
     int hotx,hoty;
@@ -544,7 +544,7 @@ private:
     TQCanvasPixmapArray* images;
 };
 
-class QPolygonalProcessor;
+class TQPolygonalProcessor;
 
 class QM_EXPORT_CANVAS TQCanvasPolygonalItem : public QCanvasItem
 {
@@ -741,7 +741,7 @@ private:
 };
 
 
-class QCanvasTextExtra;
+class TQCanvasTextExtra;
 
 class QM_EXPORT_CANVAS TQCanvasText : public QCanvasItem
 {
diff --git a/kjsembed/tools/headers/qdir.h b/kjsembed/tools/headers/qdir.h
index 2056828e..200514dd 100644
--- a/kjsembed/tools/headers/qdir.h
+++ b/kjsembed/tools/headers/qdir.h
@@ -48,8 +48,8 @@
 #ifndef QT_NO_DIR
 typedef TQPtrList<TQFileInfo> QFileInfoList;
 typedef TQPtrListIterator<TQFileInfo> QFileInfoListIterator;
-class QStringList;
-template <class T> class QDeepCopy;
+class TQStringList;
+template <class T> class TQDeepCopy;
 
 
 class Q_EXPORT QDir
diff --git a/kjsembed/tools/headers/qpen.h b/kjsembed/tools/headers/qpen.h
index 7db9325e..585e7af2 100644
--- a/kjsembed/tools/headers/qpen.h
+++ b/kjsembed/tools/headers/qpen.h
@@ -71,7 +71,7 @@ public:
 					{ return !(operator==(p)); }
 
 private:
-    friend class QPainter;
+    friend class TQPainter;
 #ifdef Q_WS_WIN
     friend class QFontEngineWin;
 #endif
-- 
cgit v1.2.1