summaryrefslogtreecommitdiff
authorsimon <simon>2002-04-30 14:49:30 (UTC)
committer simon <simon>2002-04-30 14:49:30 (UTC)
commitc959b0c2170d2c12f93f5fa04ff02ca4c7c0ef4a (patch) (side-by-side diff)
treee85e8136aeb87c582e958a48f8428765ef7b99be
parenta0cdb6f85e270e20bd5383e980df9dcf862a93ce (diff)
downloadopie-c959b0c2170d2c12f93f5fa04ff02ca4c7c0ef4a.zip
opie-c959b0c2170d2c12f93f5fa04ff02ca4c7c0ef4a.tar.gz
opie-c959b0c2170d2c12f93f5fa04ff02ca4c7c0ef4a.tar.bz2
- resolved clash between const char *name and struct utsname name
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/qasteroids/toplevel.cpp4
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
@@ -75,26 +75,26 @@ const char *soundEvents[] =
"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 );