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 --- kasteroids/ledmeter.cpp | 2 +- kasteroids/sprites/rock1/rock1.pov | 2 +- kasteroids/sprites/rock2/rock2.pov | 2 +- kasteroids/sprites/rock3/rock3.pov | 2 +- kasteroids/toplevel.cpp | 32 ++++++++++++++++---------------- kasteroids/view.cpp | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) (limited to 'kasteroids') diff --git a/kasteroids/ledmeter.cpp b/kasteroids/ledmeter.cpp index e323d6fd..1d807d18 100644 --- a/kasteroids/ledmeter.cpp +++ b/kasteroids/ledmeter.cpp @@ -76,7 +76,7 @@ void KALedMeter::drawContents( TQPainter *p ) unsigned cidx = 0; int ncol = mCount; - TQColor col = tqcolorGroup().foreground(); + TQColor col = colorGroup().foreground(); if ( !mCRanges.isEmpty() ) { diff --git a/kasteroids/sprites/rock1/rock1.pov b/kasteroids/sprites/rock1/rock1.pov index bcf4c8a7..58298c05 100644 --- a/kasteroids/sprites/rock1/rock1.pov +++ b/kasteroids/sprites/rock1/rock1.pov @@ -1,5 +1,5 @@ #include "colors.inc" -#include "tqshapes.inc" +#include "shapes.inc" #include "textures.inc" // #include "stones.inc" diff --git a/kasteroids/sprites/rock2/rock2.pov b/kasteroids/sprites/rock2/rock2.pov index 625c7854..2f37a206 100644 --- a/kasteroids/sprites/rock2/rock2.pov +++ b/kasteroids/sprites/rock2/rock2.pov @@ -1,5 +1,5 @@ #include "colors.inc" -#include "tqshapes.inc" +#include "shapes.inc" #include "textures.inc" // #include "stones.inc" diff --git a/kasteroids/sprites/rock3/rock3.pov b/kasteroids/sprites/rock3/rock3.pov index 625c7854..2f37a206 100644 --- a/kasteroids/sprites/rock3/rock3.pov +++ b/kasteroids/sprites/rock3/rock3.pov @@ -1,5 +1,5 @@ #include "colors.inc" -#include "tqshapes.inc" +#include "shapes.inc" #include "textures.inc" // #include "stones.inc" diff --git a/kasteroids/toplevel.cpp b/kasteroids/toplevel.cpp index ffc6b8e2..c90ae813 100644 --- a/kasteroids/toplevel.cpp +++ b/kasteroids/toplevel.cpp @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include #include @@ -102,7 +102,7 @@ KAstTopLevel::KAstTopLevel() label = new TQLabel( i18n("Score"), mainWin ); label->setFont( labelFont ); label->setPalette( pal ); - label->setFixedWidth( label->tqsizeHint().width() ); + label->setFixedWidth( label->sizeHint().width() ); hb->addWidget( label ); scoreLCD = new TQLCDNumber( 6, mainWin ); @@ -116,7 +116,7 @@ KAstTopLevel::KAstTopLevel() label = new TQLabel( i18n("Level"), mainWin ); label->setFont( labelFont ); label->setPalette( pal ); - label->setFixedWidth( label->tqsizeHint().width() ); + label->setFixedWidth( label->sizeHint().width() ); hb->addWidget( label ); levelLCD = new TQLCDNumber( 2, mainWin ); @@ -129,7 +129,7 @@ KAstTopLevel::KAstTopLevel() label = new TQLabel( i18n("Ships"), mainWin ); label->setFont( labelFont ); - label->setFixedWidth( label->tqsizeHint().width() ); + label->setFixedWidth( label->sizeHint().width() ); label->setPalette( pal ); hb->addWidget( label ); @@ -151,7 +151,7 @@ KAstTopLevel::KAstTopLevel() vb->addWidget( view, 10 ); -// -- bottom tqlayout: +// -- bottom layout: TQFrame *sep2 = new TQFrame( mainWin ); sep2->setMaximumHeight( 1 ); sep2->setFrameStyle( TQFrame::HLine | TQFrame::Raised ); @@ -168,7 +168,7 @@ KAstTopLevel::KAstTopLevel() /* label = new TQLabel( i18n( "T" ), mainWin ); label->setFont( smallFont ); - label->setFixedWidth( label->tqsizeHint().width() ); + label->setFixedWidth( label->sizeHint().width() ); label->setPalette( pal ); hbd->addWidget( label ); @@ -184,7 +184,7 @@ KAstTopLevel::KAstTopLevel() TQPixmap pm( sprites_prefix + "powerups/brake.png" ); label = new TQLabel( mainWin ); label->setPixmap( pm ); - label->setFixedWidth( label->tqsizeHint().width() ); + label->setFixedWidth( label->sizeHint().width() ); label->setPalette( pal ); hbd->addWidget( label ); @@ -200,7 +200,7 @@ KAstTopLevel::KAstTopLevel() pm.load( sprites_prefix + "powerups/shield.png" ); label = new TQLabel( mainWin ); label->setPixmap( pm ); - label->setFixedWidth( label->tqsizeHint().width() ); + label->setFixedWidth( label->sizeHint().width() ); label->setPalette( pal ); hbd->addWidget( label ); @@ -216,7 +216,7 @@ KAstTopLevel::KAstTopLevel() pm.load( sprites_prefix + "powerups/shoot.png" ); label = new TQLabel( mainWin ); label->setPixmap( pm ); - label->setFixedWidth( label->tqsizeHint().width() ); + label->setFixedWidth( label->sizeHint().width() ); label->setPalette( pal ); hbd->addWidget( label ); @@ -231,7 +231,7 @@ KAstTopLevel::KAstTopLevel() label = new TQLabel( i18n( "Fuel" ), mainWin ); label->setFont( smallFont ); - label->setFixedWidth( label->tqsizeHint().width() + 10 ); + label->setFixedWidth( label->sizeHint().width() + 10 ); label->setPalette( pal ); hbd->addWidget( label ); @@ -484,7 +484,7 @@ void KAstTopLevel::slotNewGame() view->setRockSpeed( levels[0].rockSpeed ); view->addRocks( levels[0].nrocks ); view->showText( i18n( "Press %1 to launch." ) - .tqarg(launchAction->shortcut().seq(0).toString()), + .arg(launchAction->shortcut().seq(0).toString()), yellow ); waitShip = true; gameOver = false; @@ -509,7 +509,7 @@ void KAstTopLevel::slotShipKilled() { waitShip = true; view->showText( i18n( "Ship Destroyed. Press %1 to launch.") - .tqarg(launchAction->shortcut().seq(0).toString()), + .arg(launchAction->shortcut().seq(0).toString()), yellow ); } else @@ -577,7 +577,7 @@ void KAstTopLevel::slotKeyConfig() { KKeyDialog::configure( actionCollection(), this ); if ( waitShip ) view->showText( i18n( "Press %1 to launch." ) - .tqarg(launchAction->shortcut().seq(0).toString()), + .arg(launchAction->shortcut().seq(0).toString()), yellow, false ); } @@ -637,9 +637,9 @@ void KAstTopLevel::doStats() " Hit:\t%2\n" " Missed:\t%3\n" "Hit ratio:\t%4 %\t\t") - .tqarg(view->shots()).tqarg(view->hits()) - .tqarg(view->shots() - view->hits()) - .tqarg(r); + .arg(view->shots()).arg(view->hits()) + .arg(view->shots() - view->hits()) + .arg(r); view->showText( s, green, FALSE ); } diff --git a/kasteroids/view.cpp b/kasteroids/view.cpp index 8b90aa9c..e203ffb5 100644 --- a/kasteroids/view.cpp +++ b/kasteroids/view.cpp @@ -78,7 +78,7 @@ KAsteroidsView::KAsteroidsView( TQWidget *parent, const char *name ) field.setBackgroundColor(black); TQPixmap pm( locate("sprite", IMG_BACKGROUND) ); - field.tqsetBackgroundPixmap( pm ); + field.setBackgroundPixmap( pm ); textSprite = new TQCanvasText( &field ); TQFont font( KGlobalSettings::generalFont().family(), 18 ); -- cgit v1.2.1