1 files changed, 2 insertions, 2 deletions

diff --git a/noncore/games/qasteroids/toplevel.cpp b/noncore/games/qasteroids/toplevel.cpp
index 090099f..71daf60 100644
--- a/noncore/games/qasteroids/toplevel.cpp
+++ b/noncore/games/qasteroids/toplevel.cpp
@@ -1,280 +1,280 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************//*
  * KAsteroids - Copyright (c) Martin R. Jones 1997
  *
  * Part of the KDE project
  */
         //--- toplevel.cpp ---
 
 #include "toplevel.h"
 #include "ledmeter.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 
 #include <qaccel.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlcdnumber.h>
 #include <qpushbutton.h>
 
 #include <sys/utsname.h>
 
 
         #define SB_SCORE1
         #define SB_LEVEL2
         #define SB_SHIPS3
 
 struct SLevel
 {
     int    nrocks;
     double rockSpeed;
 };
 
         #define MAX_LEVELS16
 
 SLevel levels[MAX_LEVELS] =
 {
     { 1, 0.4 },
     { 1, 0.6 },
     { 2, 0.5 },
     { 2, 0.7 },
     { 2, 0.8 },
     { 3, 0.6 },
     { 3, 0.7 },
     { 3, 0.8 },
     { 4, 0.6 },
     { 4, 0.7 },
     { 4, 0.8 },
     { 5, 0.7 },
     { 5, 0.8 },
     { 5, 0.9 },
     { 5, 1.0 }
 };
 
 const char *soundEvents[] = 
 {
     "ShipDestroyed",
     "RockDestroyed",
     0
 };
 
 const char *soundDefaults[] = 
 {
     "Explosion.wav",
     "ploop.wav",
     0
 };
 
  
-KAstTopLevel::KAstTopLevel( QWidget *parent, const char *name )
-    : QMainWindow( parent, name )
+KAstTopLevel::KAstTopLevel( QWidget *parent, const char *_name )
+    : QMainWindow( parent, _name )
 {
     setCaption( tr("Asteroids") );
     QWidget *border = new QWidget( this );
     border->setBackgroundColor( black );
     setCentralWidget( border );
 
     QVBoxLayout *borderLayout = new QVBoxLayout( border );
     
     QWidget *mainWin = new QWidget( border );
     borderLayout->addWidget( mainWin, 2, AlignHCenter );
 
     view = new KAsteroidsView( mainWin );
     connect( view, SIGNAL( shipKilled() ), SLOT( slotShipKilled() ) );
     connect( view, SIGNAL( rockHit(int) ), SLOT( slotRockHit(int) ) );
     connect( view, SIGNAL( rocksRemoved() ), SLOT( slotRocksRemoved() ) );
     connect( view, SIGNAL( updateVitals() ), SLOT( slotUpdateVitals() ) );
 
     QVBoxLayout *vb = new QVBoxLayout( mainWin );
     QHBoxLayout *hb = new QHBoxLayout;
     QHBoxLayout *hbd = new QHBoxLayout;
     vb->addLayout( hb );
 
     QFont labelFont( "helvetica", 12 );
     QColorGroup grp( darkGreen, black, QColor( 128, 128, 128 ),
             QColor( 64, 64, 64 ), black, darkGreen, black );
     QPalette pal( grp, grp, grp );
 
     mainWin->setPalette( pal );
 
     QLabel *label;
     label = new QLabel( tr("Score"), mainWin );
     label->setFont( labelFont );
     label->setPalette( pal );
 //    label->setFixedWidth( label->sizeHint().width() );
     hb->addWidget( label );
 
     scoreLCD = new QLCDNumber( 5, mainWin );
     scoreLCD->setFrameStyle( QFrame::NoFrame );
     scoreLCD->setSegmentStyle( QLCDNumber::Flat );
     scoreLCD->setFixedHeight( 16 );
     scoreLCD->setPalette( pal );
     hb->addWidget( scoreLCD );
     hb->addStretch( 1 );
 
     label = new QLabel( tr("Level"), mainWin );
     label->setFont( labelFont );
     label->setPalette( pal );
 //    label->setFixedWidth( label->sizeHint().width() );
     hb->addWidget( label );
 
     levelLCD = new QLCDNumber( 2, mainWin );
     levelLCD->setFrameStyle( QFrame::NoFrame );
     levelLCD->setSegmentStyle( QLCDNumber::Flat );
     levelLCD->setFixedHeight( 16 );
     levelLCD->setPalette( pal );
     hb->addWidget( levelLCD );
     hb->addStretch( 1 );
 
     label = new QLabel( tr("Ships"), mainWin );
     label->setFont( labelFont );
 //    label->setFixedWidth( label->sizeHint().width() );
     label->setPalette( pal );
     hb->addWidget( label );
 
     shipsLCD = new QLCDNumber( 1, mainWin );
     shipsLCD->setFrameStyle( QFrame::NoFrame );
     shipsLCD->setSegmentStyle( QLCDNumber::Flat );
     shipsLCD->setFixedHeight( 16 );
     shipsLCD->setPalette( pal );
     hb->addWidget( shipsLCD );
 
 //    hb->addStrut( 14 );
 
     vb->addWidget( view, 10 );
 
 // -- bottom layout:
     vb->addLayout( hbd );
 
     QFont smallFont( "helvetica", 12 );
     hbd->addSpacing( 5 );
 
 /*
     label = new QLabel( tr( "T" ), mainWin );
     label->setFont( smallFont );
     label->setFixedWidth( label->sizeHint().width() );
     label->setPalette( pal );
     hbd->addWidget( label );
 
     teleportsLCD = new QLCDNumber( 1, mainWin );
     teleportsLCD->setFrameStyle( QFrame::NoFrame );
     teleportsLCD->setSegmentStyle( QLCDNumber::Flat );
     teleportsLCD->setPalette( pal );
     teleportsLCD->setFixedHeight( 18 );
     hbd->addWidget( teleportsLCD );
 
     hbd->addSpacing( 10 );
 */
     label = new QLabel( mainWin );
     label->setPixmap( Resource::loadPixmap("qasteroids/powerups/brake.png") );
     label->setFixedWidth( 16 );
     label->setPalette( pal );
     hbd->addWidget( label );
 
     brakesLCD = new QLCDNumber( 1, mainWin );
     brakesLCD->setFrameStyle( QFrame::NoFrame );
     brakesLCD->setSegmentStyle( QLCDNumber::Flat );
     brakesLCD->setPalette( pal );
     brakesLCD->setFixedHeight( 16 );
     hbd->addWidget( brakesLCD );
 
     hbd->addSpacing( 5 );
 
     label = new QLabel( mainWin );
     label->setPixmap( Resource::loadPixmap("qasteroids/powerups/shield.png") );
     label->setFixedWidth( 16 );
     label->setPalette( pal );
     hbd->addWidget( label );
 
     shieldLCD = new QLCDNumber( 1, mainWin );
     shieldLCD->setFrameStyle( QFrame::NoFrame );
     shieldLCD->setSegmentStyle( QLCDNumber::Flat );
     shieldLCD->setPalette( pal );
     shieldLCD->setFixedHeight( 16 );
     hbd->addWidget( shieldLCD );
 
     hbd->addSpacing( 5 );
 
     label = new QLabel( mainWin );
     label->setPixmap( Resource::loadPixmap("qasteroids/powerups/shoot.png") );
     label->setFixedWidth( 16 );
     label->setPalette( pal );
     hbd->addWidget( label );
 
     shootLCD = new QLCDNumber( 1, mainWin );
     shootLCD->setFrameStyle( QFrame::NoFrame );
     shootLCD->setSegmentStyle( QLCDNumber::Flat );
     shootLCD->setPalette( pal );
     shootLCD->setFixedHeight( 16 );
     hbd->addWidget( shootLCD );
 
     hbd->addStretch( 1 );
 
     label = new QLabel( tr( "Fuel" ), mainWin );
     label->setFont( smallFont );
     label->setFixedWidth( label->sizeHint().width() + 5 );
     label->setPalette( pal );
     hbd->addWidget( label );
 
     powerMeter = new KALedMeter( mainWin );
     powerMeter->setFrameStyle( QFrame::Box | QFrame::Plain );
     powerMeter->setRange( MAX_POWER_LEVEL );
     powerMeter->addColorRange( 10, darkRed );
     powerMeter->addColorRange( 20, QColor(160, 96, 0) );
     powerMeter->addColorRange( 70, darkGreen );
     powerMeter->setCount( 15 );
     powerMeter->setPalette( pal );
     powerMeter->setFixedSize( 60, 12 );
     hbd->addWidget( powerMeter );
 
     shipsRemain = 3;
     showHiscores = FALSE;
 
     actions.insert( Qt::Key_Up, Thrust );
     actions.insert( Qt::Key_Left, RotateLeft );
     actions.insert( Qt::Key_Right, RotateRight );
     actions.insert( Qt::Key_Enter, Shoot );
     actions.insert( Qt::Key_Z, Teleport );
     actions.insert( Qt::Key_Down, Brake );
     actions.insert( Qt::Key_P, Pause );
 
 
     struct utsname name; /* check for embedix kernel running on the zaurus, if 
                             lineo change string, this break
                          */
     if (uname(&name) != -1) {
         QString release=name.release;
         if(release.find("embedix",0,TRUE) !=-1) {
           actions.insert( Key_F12, Launch );
           actions.insert( Key_F11, Shield );
           actions.insert( Key_F9, NewGame );
         } else {
           // ipaq
           actions.insert( Key_F12, Shoot );
           actions.insert( Key_F11, Shield );
           actions.insert( Key_F10, Launch );
           actions.insert( Key_F9, NewGame );
         }
       }
 
 //    actions.insert( Qt::Key_S, Shield );
 //    actions.insert( Qt::Key_X, Brake );
 //    actions.insert( Qt::Key_L, Launch );