From 97d1732e257f8700488d7ca1660ae7eba8fc6065 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:47:36 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kbounce/game.cpp | 8 ++++---- kbounce/kbounce.cpp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'kbounce') diff --git a/kbounce/game.cpp b/kbounce/game.cpp index 065b2657..a223fea8 100644 --- a/kbounce/game.cpp +++ b/kbounce/game.cpp @@ -406,7 +406,7 @@ JezzGame::JezzGame( const TQPixmap &background, int ballNum, TQWidget *parent, c connect( m_clock, TQT_SIGNAL(timeout()), this, TQT_SLOT(tick()) ); m_clock->start( GAME_DELAY ); - // setup tqgeometry + // setup geometry setFixedSize( m_view->size() ); } @@ -500,7 +500,7 @@ void JezzGame::makeBlack() } m_field->update(); - m_view->tqrepaint(); + m_view->repaint(); // count percent value of occupied area int p = percent(); @@ -586,7 +586,7 @@ void JezzGame::ballCollision( Ball */*ball*/, int /*x*/, int /*y*/, int tile ) // update view m_field->update(); - m_view->tqrepaint(); + m_view->repaint(); // send death msg emit died(); @@ -671,7 +671,7 @@ void JezzGame::wallFinished( Wall *wall, int tile ) } m_field->update(); - m_view->tqrepaint(); + m_view->repaint(); makeBlack(); } diff --git a/kbounce/kbounce.cpp b/kbounce/kbounce.cpp index 2d4fe887..158786a4 100644 --- a/kbounce/kbounce.cpp +++ b/kbounce/kbounce.cpp @@ -16,7 +16,7 @@ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include #include #include @@ -100,7 +100,7 @@ KJezzball::KJezzball() // create demo game createLevel( 1 ); statusBar()->message( i18n("Press %1 to start a game!") - .tqarg(m_newAction->shortcut().toString()) ); + .arg(m_newAction->shortcut().toString()) ); //m_gameWidget->display( i18n("Press to start a game!") ); setFocusPolicy(TQ_StrongFocus); @@ -228,7 +228,7 @@ void KJezzball::gameOverNow() TQString score; score.setNum( m_game.score ); - KMessageBox::information( this, i18n("Game Over! Score: %1").tqarg(score) ); + KMessageBox::information( this, i18n("Game Over! Score: %1").arg(score) ); statusBar()->message( i18n("Game over. Press for a new game") ); //m_gameWidget->display( i18n("Game over. Press for a new game!") ); highscore(); @@ -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").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); +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); KMessageBox::information( this,foo ); // KMessageBox::information( this, i18n("You've completed level %1 with " - // "a score of %2.\nGet ready for the next one!").tqarg(level).tqarg(score)); + // "a score of %2.\nGet ready for the next one!").arg(level).arg(score)); m_game.level++; m_levelLCD->display( m_game.level ); -- cgit v1.2.1