summaryrefslogtreecommitdiffstats
path: root/kbounce
diff options
context:
space:
mode:
Diffstat (limited to 'kbounce')
-rw-r--r--kbounce/game.cpp6
-rw-r--r--kbounce/kbounce.cpp26
2 files changed, 16 insertions, 16 deletions
diff --git a/kbounce/game.cpp b/kbounce/game.cpp
index 4b2f14b3..2d4c9721 100644
--- a/kbounce/game.cpp
+++ b/kbounce/game.cpp
@@ -363,7 +363,7 @@ JezzGame::JezzGame( const TQPixmap &background, int ballNum, TQWidget *parent, c
"kbounce/sounds/";
// create field
- m_field = new JezzField( tiles, background, TQT_TQOBJECT(this), "m_field" );
+ m_field = new JezzField( tiles, background, this, "m_field" );
m_field->resize( TILE_SIZE*FIELD_WIDTH, TILE_SIZE*FIELD_HEIGHT );
for ( int x=0; x<FIELD_WIDTH; x++ )
@@ -617,7 +617,7 @@ void JezzGame::buildWall( int x, int y, bool vertical )
m_wall1 = new Wall( m_field, x, y,
vertical? Wall::Up : Wall::Left,
vertical? TILE_WALLUP : TILE_WALLLEFT,
- TQT_TQOBJECT(this), "m_wall1" );
+ this, "m_wall1" );
connect( m_wall1, TQT_SIGNAL(finished(Wall *, int)),
this, TQT_SLOT(wallFinished(Wall *, int)) ); }
@@ -626,7 +626,7 @@ void JezzGame::buildWall( int x, int y, bool vertical )
m_wall2 = new Wall( m_field, x, y,
vertical? Wall::Down: Wall::Right,
vertical? TILE_WALLDOWN : TILE_WALLRIGHT,
- TQT_TQOBJECT(this), "m_wall2" );
+ this, "m_wall2" );
connect( m_wall2, TQT_SIGNAL(finished(Wall *, int)),
this, TQT_SLOT(wallFinished(Wall *, int)) );
}
diff --git a/kbounce/kbounce.cpp b/kbounce/kbounce.cpp
index d3450bf9..64b51f0a 100644
--- a/kbounce/kbounce.cpp
+++ b/kbounce/kbounce.cpp
@@ -89,13 +89,13 @@ KJezzball::KJezzball()
// create timers
m_nextLevelTimer = new TQTimer( this, "m_nextLevelTimer" );
- connect( m_nextLevelTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(switchLevel()) );
+ connect( m_nextLevelTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(switchLevel()) );
m_gameOverTimer = new TQTimer( this, "m_gameOverTimer" );
- connect( m_gameOverTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(gameOverNow()) );
+ connect( m_gameOverTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(gameOverNow()) );
m_timer = new TQTimer( this, "m_timer" );
- connect( m_timer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(second()) );
+ connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(second()) );
// create demo game
createLevel( 1 );
@@ -119,23 +119,23 @@ KJezzball::~KJezzball()
*/
void KJezzball::initXMLUI()
{
- m_newAction = KStdGameAction::gameNew( TQT_TQOBJECT(this), TQT_SLOT(newGame()), actionCollection() );
+ m_newAction = KStdGameAction::gameNew( 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
TDEShortcut s = m_newAction->shortcut();
s.append(KKeySequence(TQKeySequence(Key_Space)));
m_newAction->setShortcut(s);
- 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());
+ 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());
- new TDEAction( i18n("&Select Background Folder..."), 0, TQT_TQOBJECT(this), TQT_SLOT(selectBackground()),
+ new TDEAction( i18n("&Select Background Folder..."), 0, this, TQT_SLOT(selectBackground()),
actionCollection(), "background_select" );
m_backgroundShowAction =
- new TDEToggleAction( i18n("Show &Backgrounds"), 0, TQT_TQOBJECT(this), TQT_SLOT(showBackground()),
+ new TDEToggleAction( i18n("Show &Backgrounds"), 0, this, TQT_SLOT(showBackground()),
actionCollection(), "background_show" );
m_backgroundShowAction->setCheckedState(i18n("Hide &Backgrounds"));
m_backgroundShowAction->setEnabled( !m_backgroundDir.isEmpty() );
@@ -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()), TQT_TQOBJECT(this), TQT_SLOT(died()) );
- connect( m_gameWidget, TQT_SIGNAL(newPercent(int)), TQT_TQOBJECT(this), TQT_SLOT(newPercent(int)) );
+ connect( m_gameWidget, TQT_SIGNAL(died()), this, TQT_SLOT(died()) );
+ connect( m_gameWidget, TQT_SIGNAL(newPercent(int)), this, TQT_SLOT(newPercent(int)) );
connect( m_soundAction, TQT_SIGNAL(toggled(bool)), m_gameWidget, TQT_SLOT(setSound(bool)) );
// update displays