diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:45:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:45:16 -0600 |
| commit | f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7 (patch) | |
| tree | b312fd7d5b7a34b88941b2fc50661431637b78b4 /kasteroids | |
| parent | 23a5c62758c4898e3afc1b8bb4c3ae78f4b526ac (diff) | |
| download | tdegames-f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7.tar.gz tdegames-f3141fbf4b9ff6dd0f37e08aa552ab71e8f391c7.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kasteroids')
| -rw-r--r-- | kasteroids/main.cpp | 6 | ||||
| -rw-r--r-- | kasteroids/toplevel.cpp | 10 | ||||
| -rw-r--r-- | kasteroids/view.cpp | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/kasteroids/main.cpp b/kasteroids/main.cpp index 8cf87921..24992bf2 100644 --- a/kasteroids/main.cpp +++ b/kasteroids/main.cpp @@ -30,9 +30,9 @@ int main( int argc, char *argv[] ) TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication app; - KGlobal::locale()->insertCatalogue("libtdegames"); - KGlobal::dirs()->addResourceType("sprite", KStandardDirs::kde_default("data") + "kasteroids/sprites/"); - KGlobal::dirs()->addResourceType("sounds", KStandardDirs::kde_default("data") + "kasteroids/sounds/"); + TDEGlobal::locale()->insertCatalogue("libtdegames"); + TDEGlobal::dirs()->addResourceType("sprite", KStandardDirs::kde_default("data") + "kasteroids/sprites/"); + TDEGlobal::dirs()->addResourceType("sounds", KStandardDirs::kde_default("data") + "kasteroids/sounds/"); #ifdef KA_ENABLE_SOUND // setup mcop communication diff --git a/kasteroids/toplevel.cpp b/kasteroids/toplevel.cpp index c9bde61b..cf9c5795 100644 --- a/kasteroids/toplevel.cpp +++ b/kasteroids/toplevel.cpp @@ -89,7 +89,7 @@ KAstTopLevel::KAstTopLevel() TQHBoxLayout *hbd = new TQHBoxLayout; vb->addLayout( hb ); - TQFont labelFont( KGlobalSettings::generalFont().family(), 24 ); + TQFont labelFont( TDEGlobalSettings::generalFont().family(), 24 ); TQColorGroup grp( darkGreen, black, TQColor( 128, 128, 128 ), TQColor( 64, 64, 64 ), black, darkGreen, black ); TQPalette pal( grp, grp, grp ); @@ -160,11 +160,11 @@ KAstTopLevel::KAstTopLevel() vb->addLayout( hbd ); - TQFont smallFont( KGlobalSettings::generalFont().family(), 14 ); + TQFont smallFont( TDEGlobalSettings::generalFont().family(), 14 ); hbd->addSpacing( 10 ); TQString sprites_prefix = - KGlobal::dirs()->findResourceDir("sprite", "rock1/rock10000.png"); + TDEGlobal::dirs()->findResourceDir("sprite", "rock1/rock10000.png"); /* label = new TQLabel( i18n( "T" ), mainWin ); label->setFont( smallFont ); @@ -627,10 +627,10 @@ void KAstTopLevel::doStats() { TQString r; if ( view->shots() ) - r = KGlobal::locale()->formatNumber(( (float)view->hits() / + r = TDEGlobal::locale()->formatNumber(( (float)view->hits() / (float)view->shots() ) * 100, 2 ); else - r = KGlobal::locale()->formatNumber( 0.0, 2 ); + r = TDEGlobal::locale()->formatNumber( 0.0, 2 ); TQString s = i18n( "Game Over\n\n" "Shots fired:\t%1\n" diff --git a/kasteroids/view.cpp b/kasteroids/view.cpp index e203ffb5..3d886d7d 100644 --- a/kasteroids/view.cpp +++ b/kasteroids/view.cpp @@ -81,7 +81,7 @@ KAsteroidsView::KAsteroidsView( TQWidget *parent, const char *name ) field.setBackgroundPixmap( pm ); textSprite = new TQCanvasText( &field ); - TQFont font( KGlobalSettings::generalFont().family(), 18 ); + TQFont font( TDEGlobalSettings::generalFont().family(), 18 ); textSprite->setFont( font ); shield = 0; @@ -230,7 +230,7 @@ void KAsteroidsView::brake( bool b ) void KAsteroidsView::readSprites() { TQString sprites_prefix = - KGlobal::dirs()->findResourceDir("sprite", "rock1/rock10000.png"); + TDEGlobal::dirs()->findResourceDir("sprite", "rock1/rock10000.png"); int i = 0; while ( kas_animations[i].id ) |