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, 24 insertions, 24 deletions

diff --git a/kbounce/kbounce.cpp b/kbounce/kbounce.cpp
index 5bfcc320..2d4fe887 100644
--- a/kbounce/kbounce.cpp
+++ b/kbounce/kbounce.cpp
@@ -89,21 +89,21 @@ KJezzball::KJezzball()
 
     // create timers
     m_nextLevelTimer = new TQTimer( this, "m_nextLevelTimer" );
-    connect( m_nextLevelTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(switchLevel()) );
+    connect( m_nextLevelTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(switchLevel()) );
 
     m_gameOverTimer = new TQTimer( this, "m_gameOverTimer" );
-    connect( m_gameOverTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(gameOverNow()) );
+    connect( m_gameOverTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(gameOverNow()) );
 
     m_timer = new TQTimer( this, "m_timer" );
-    connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(second()) );
+    connect( m_timer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(second()) );
 
     // create demo game
     createLevel( 1 );
     statusBar()->message( i18n("Press %1 to start a game!")
-                          .arg(m_newAction->shortcut().toString()) );
+                          .tqarg(m_newAction->shortcut().toString()) );
     //m_gameWidget->display( i18n("Press <Space> to start a game!") );
 
-    setFocusPolicy(TQWidget::StrongFocus);
+    setFocusPolicy(TQ_StrongFocus);
     setFocus();
     setupGUI();
 }
@@ -119,23 +119,23 @@ KJezzball::~KJezzball()
  */
 void KJezzball::initXMLUI()
 {
-    m_newAction = KStdGameAction::gameNew( this, TQT_SLOT(newGame()), actionCollection() );
+    m_newAction = KStdGameAction::gameNew( TQT_TQOBJECT(this), TQT_SLOT(newGame()), actionCollection() );
     // AB: originally KBounce/KJezzball used Space for new game - but Ctrl+N is
     // default. We solve this by providing space as an alternative key
     KShortcut s = m_newAction->shortcut();
     s.append(KKeySequence(TQKeySequence(Key_Space)));
     m_newAction->setShortcut(s);
 
-    KStdGameAction::quit(this, TQT_SLOT(close()), actionCollection() );
-    KStdGameAction::highscores(this, TQT_SLOT(showHighscore()), actionCollection() );
-    m_pauseButton = KStdGameAction::pause(this, TQT_SLOT(pauseGame()), actionCollection());
-    KStdGameAction::end(this, TQT_SLOT(closeGame()), actionCollection());
-    KStdGameAction::configureHighscores(this, TQT_SLOT(configureHighscores()),actionCollection());
+    KStdGameAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() );
+    KStdGameAction::highscores(TQT_TQOBJECT(this), TQT_SLOT(showHighscore()), actionCollection() );
+    m_pauseButton = KStdGameAction::pause(TQT_TQOBJECT(this), TQT_SLOT(pauseGame()), actionCollection());
+    KStdGameAction::end(TQT_TQOBJECT(this), TQT_SLOT(closeGame()), actionCollection());
+    KStdGameAction::configureHighscores(TQT_TQOBJECT(this), TQT_SLOT(configureHighscores()),actionCollection());
 
-    new KAction( i18n("&Select Background Folder..."), 0, this, TQT_SLOT(selectBackground()),
+    new KAction( i18n("&Select Background Folder..."), 0, TQT_TQOBJECT(this), TQT_SLOT(selectBackground()),
                        actionCollection(), "background_select" );
     m_backgroundShowAction =
-        new KToggleAction( i18n("Show &Backgrounds"), 0, this, TQT_SLOT(showBackground()),
+        new KToggleAction( i18n("Show &Backgrounds"), 0, TQT_TQOBJECT(this), TQT_SLOT(showBackground()),
                            actionCollection(), "background_show" );
     m_backgroundShowAction->setCheckedState(i18n("Hide &Backgrounds"));
     m_backgroundShowAction->setEnabled( !m_backgroundDir.isEmpty() );
@@ -177,7 +177,7 @@ void KJezzball::closeGame()
         int old_state = m_state;
         if (old_state == Running)
             pauseGame();
-        int ret = KMessageBox::questionYesNo( this, i18n("Do you really want to close the running game?"), TQString::null, KStdGuiItem::close(), KStdGuiItem::cancel() );
+        int ret = KMessageBox::questionYesNo( this, i18n("Do you really want to close the running game?"), TQString(), KStdGuiItem::close(), KStdGuiItem::cancel() );
         if ( ret==KMessageBox::Yes )
         {
             stopLevel();
@@ -206,7 +206,7 @@ void KJezzball::pauseGame()
     case Suspend:
         m_state = Running;
         statusBar()->clear();
-        //m_gameWidget->display( TQString::null );
+        //m_gameWidget->display( TQString() );
         startLevel();
         break;
 
@@ -228,7 +228,7 @@ void KJezzball::gameOverNow()
 
     TQString score;
     score.setNum( m_game.score );
-    KMessageBox::information( this, i18n("Game Over! Score: %1").arg(score) );
+    KMessageBox::information( this, i18n("Game Over! Score: %1").tqarg(score) );
     statusBar()->message(  i18n("Game over. Press <Space> for a new game") );
     //m_gameWidget->display( i18n("Game over. Press <Space> for a new game!") );
     highscore();
@@ -347,7 +347,7 @@ void KJezzball::focusInEvent ( TQFocusEvent *ev )
         m_state = Running;
         statusBar()->clear();
         m_pauseButton->setChecked(false);
-        //m_gameWidget->display( TQString::null );
+        //m_gameWidget->display( TQString() );
     }
 
     KMainWindow::focusInEvent( ev );
@@ -400,8 +400,8 @@ void KJezzball::createLevel( int level )
 
     m_gameWidget->show();
     m_layout->addWidget( m_gameWidget, 0, 0 );
-    connect( m_gameWidget, TQT_SIGNAL(died()), this, TQT_SLOT(died()) );
-    connect( m_gameWidget, TQT_SIGNAL(newPercent(int)), this, TQT_SLOT(newPercent(int)) );
+    connect( m_gameWidget, TQT_SIGNAL(died()), TQT_TQOBJECT(this), TQT_SLOT(died()) );
+    connect( m_gameWidget, TQT_SIGNAL(newPercent(int)), TQT_TQOBJECT(this), TQT_SLOT(newPercent(int)) );
     connect( m_soundAction, TQT_SIGNAL(toggled(bool)), m_gameWidget, TQT_SLOT(setSound(bool)) );
 
     // update displays
@@ -461,16 +461,16 @@ void KJezzball::switchLevel()
 
 TQString foo = TQString(
 i18n("You have successfully cleared more than 75% of the board.\n") +
-i18n("%1 points: 15 points per remaining life\n").arg(m_level.lifes*15) +
-i18n("%1 points: Bonus\n").arg((m_gameWidget->percent()-75)*2*(m_game.level+5)) +
-i18n("%1 points: Total score for this level\n").arg(score) +
-i18n("On to level %1. Remember you get %2 lives this time!")).arg(m_game.level+1).arg(m_game.level+2);
+i18n("%1 points: 15 points per remaining life\n").tqarg(m_level.lifes*15) +
+i18n("%1 points: Bonus\n").tqarg((m_gameWidget->percent()-75)*2*(m_game.level+5)) +
+i18n("%1 points: Total score for this level\n").tqarg(score) +
+i18n("On to level %1. Remember you get %2 lives this time!")).tqarg(m_game.level+1).tqarg(m_game.level+2);
 
    KMessageBox::information( this,foo );
 
 
    // KMessageBox::information( this, i18n("You've completed level %1 with "
-   //     "a score of %2.\nGet ready for the next one!").arg(level).arg(score));
+   //     "a score of %2.\nGet ready for the next one!").tqarg(level).tqarg(score));
 
     m_game.level++;
     m_levelLCD->display( m_game.level );