- resolved clash between const char *name and struct utsname name

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
@@ -39,98 +39,98 @@
 
 
 #define SB_SCORE	1
 #define SB_LEVEL	2
 #define SB_SHIPS	3
 
 struct SLevel
 {
     int    nrocks;
     double rockSpeed;
 };
 
 #define MAX_LEVELS	16
 
 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() );