TQt4 port kdegames

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegames@1236074 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 7 insertions, 6 deletions

diff --git a/kpat/dealer.h b/kpat/dealer.h
index 42c07e9c..63b5bde9 100644
--- a/kpat/dealer.h
+++ b/kpat/dealer.h
@@ -35,7 +35,7 @@ public:
 }
     const char *name;
     uint gameindex;
-    virtual Dealer *createGame(KMainWindow *parent) = 0;
+    virtual Dealer *createGame(KMainWindow *tqparent) = 0;
 };
 
 class CardState;
@@ -54,13 +54,14 @@ struct State
   Dealer -- abstract base class of all varieties of patience
 
 ***************************************************************/
-class Dealer: public QCanvasView
+class Dealer: public TQCanvasView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
 
-    Dealer( KMainWindow* parent = 0, const char* name = 0 );
+    Dealer( KMainWindow* tqparent = 0, const char* name = 0 );
     virtual ~Dealer();
 
     static const Dealer *instance();
@@ -170,7 +171,7 @@ protected:
     // it's not const because it changes the random seed
     virtual MoveHint *chooseHint();
 
-    KMainWindow *parent() const;
+    KMainWindow *tqparent() const;
 
     bool waiting() const { return _waiting != 0; }
     void setWaiting(bool w);
@@ -182,7 +183,7 @@ protected:
     void setState(State *);
 
     // reimplement this to add game-specific information in the state structure
-    virtual TQString getGameState() const { return TQString::null; }
+    virtual TQString getGameState() const { return TQString(); }
     // reimplement this to use the game-specific information from the state structure
     virtual void setGameState( const TQString & ) {}
 
@@ -210,7 +211,7 @@ protected:
 
     KRandomSequence randseq;
     TQColor _midcolor;
-    Q_UINT32 _id;
+    TQ_UINT32 _id;
     bool takeTargets;
     bool _won;
     int _waiting;