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

8 files changed, 19 insertions, 14 deletions

diff --git a/ksirtet/ksirtet/ai.h b/ksirtet/ksirtet/ai.h
index 465925ef..21266824 100644
--- a/ksirtet/ksirtet/ai.h
+++ b/ksirtet/ksirtet/ai.h
@@ -7,6 +7,7 @@
 class KSAI : public AI
 {
     Q_OBJECT
+  TQ_OBJECT
  public:
     KSAI();
 
diff --git a/ksirtet/ksirtet/board.cpp b/ksirtet/ksirtet/board.cpp
index f50aa1a4..00126e68 100644
--- a/ksirtet/ksirtet/board.cpp
+++ b/ksirtet/ksirtet/board.cpp
@@ -8,8 +8,8 @@
 
 using namespace KGrid2D;
 
-KSBoard::KSBoard(bool graphic, TQWidget *parent)
-    : Board(graphic, new GiftPool(parent), parent),
+KSBoard::KSBoard(bool graphic, TQWidget *tqparent)
+    : Board(graphic, new GiftPool(tqparent), tqparent),
       filled(matrix().height()), linesRemoved(4)
 {
     init();
diff --git a/ksirtet/ksirtet/board.h b/ksirtet/ksirtet/board.h
index 45ec0f26..a1ac1612 100644
--- a/ksirtet/ksirtet/board.h
+++ b/ksirtet/ksirtet/board.h
@@ -7,8 +7,9 @@
 class KSBoard : public Board
 {
  Q_OBJECT
+  TQ_OBJECT
  public:
-	KSBoard(bool graphic, TQWidget *parent);
+	KSBoard(bool graphic, TQWidget *tqparent);
 	void copy(const GenericTetris &);
 
 	void start(const GTInitData &);
diff --git a/ksirtet/ksirtet/field.cpp b/ksirtet/ksirtet/field.cpp
index 46f5c4de..1f7cbbc4 100644
--- a/ksirtet/ksirtet/field.cpp
+++ b/ksirtet/ksirtet/field.cpp
@@ -11,8 +11,8 @@
 #include "piece.h"
 
 //-----------------------------------------------------------------------------
-KSField::KSField(TQWidget *parent)
-    : Field(parent)
+KSField::KSField(TQWidget *tqparent)
+    : Field(tqparent)
 {
     const Board *b = static_cast<Board *>(board);
     TQWhatsThis::add(b->giftPool(), i18n("Indicate the number of garbage lines you received from your opponent."));
@@ -43,7 +43,7 @@ void KSField::settingsChanged()
     removedList->clear();
     TQWhatsThis::remove(removedList);
     KGameLCD *lcd = new KGameLCD(5, removedList);
-    TQString s = (Prefs::showDetailedRemoved() ? i18n("Total:") : TQString::null);
+    TQString s = (Prefs::showDetailedRemoved() ? i18n("Total:") : TQString());
     removedList->append(s, lcd);
     lcd->displayInt( board->nbRemoved() );
     lcd->show();
diff --git a/ksirtet/ksirtet/field.h b/ksirtet/ksirtet/field.h
index 26378b28..adbe31cd 100644
--- a/ksirtet/ksirtet/field.h
+++ b/ksirtet/ksirtet/field.h
@@ -8,8 +8,9 @@
 class KSField : public Field
 {
  Q_OBJECT
+  TQ_OBJECT
  public:
-    KSField(TQWidget *parent);
+    KSField(TQWidget *tqparent);
 
  private slots:
     virtual void removedUpdated();
diff --git a/ksirtet/ksirtet/main.cpp b/ksirtet/ksirtet/main.cpp
index 4c66c22f..09d02461 100644
--- a/ksirtet/ksirtet/main.cpp
+++ b/ksirtet/ksirtet/main.cpp
@@ -64,9 +64,9 @@ KSFactory::KSFactory()
     : CommonFactory(MAIN_DATA, BASE_BOARD_INFO, COMMON_BOARD_INFO)
 {}
 
-BaseInterface *KSFactory::createInterface(TQWidget *parent)
+BaseInterface *KSFactory::createInterface(TQWidget *tqparent)
 {
-    return new Interface(MP_GAME_INFO, parent);
+    return new Interface(MP_GAME_INFO, tqparent);
 }
 
 //-----------------------------------------------------------------------------
diff --git a/ksirtet/ksirtet/main.h b/ksirtet/ksirtet/main.h
index 05af263d..c01bcfae 100644
--- a/ksirtet/ksirtet/main.h
+++ b/ksirtet/ksirtet/main.h
@@ -16,11 +16,11 @@ class KSFactory : public CommonFactory
    KSFactory();
 
  protected:
-    virtual BaseBoard *createBoard(bool graphic, TQWidget *parent)
-        { return new KSBoard(graphic, parent); }
-    virtual BaseField *createField(TQWidget *parent)
-        { return new KSField(parent); }
-    virtual BaseInterface *createInterface(TQWidget *parent);
+    virtual BaseBoard *createBoard(bool graphic, TQWidget *tqparent)
+        { return new KSBoard(graphic, tqparent); }
+    virtual BaseField *createField(TQWidget *tqparent)
+        { return new KSField(tqparent); }
+    virtual BaseInterface *createInterface(TQWidget *tqparent);
     virtual AI *createAI() { return new KSAI; }
     virtual TQWidget *createGameConfig() { return new KSGameConfig; }
 };
@@ -29,6 +29,7 @@ class KSFactory : public CommonFactory
 class KSMainWindow : public MainWindow
 {
  Q_OBJECT
+  TQ_OBJECT
  public:
     KSMainWindow() { init(); }
 };
diff --git a/ksirtet/ksirtet/settings.h b/ksirtet/ksirtet/settings.h
index 7e945db6..bd8dcad1 100644
--- a/ksirtet/ksirtet/settings.h
+++ b/ksirtet/ksirtet/settings.h
@@ -7,6 +7,7 @@
 class KSGameConfig : public GameConfig
 {
     Q_OBJECT
+  TQ_OBJECT
  public:
     KSGameConfig();
 };