author | simon <simon> | 2002-04-30 14:49:30 (UTC) |
---|---|---|
committer | simon <simon> | 2002-04-30 14:49:30 (UTC) |
commit | c959b0c2170d2c12f93f5fa04ff02ca4c7c0ef4a (patch) (unidiff) | |
tree | e85e8136aeb87c582e958a48f8428765ef7b99be | |
parent | a0cdb6f85e270e20bd5383e980df9dcf862a93ce (diff) | |
download | opie-c959b0c2170d2c12f93f5fa04ff02ca4c7c0ef4a.zip opie-c959b0c2170d2c12f93f5fa04ff02ca4c7c0ef4a.tar.gz opie-c959b0c2170d2c12f93f5fa04ff02ca4c7c0ef4a.tar.bz2 |
- resolved clash between const char *name and struct utsname name
-rw-r--r-- | noncore/games/qasteroids/toplevel.cpp | 4 |
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[] = | |||
75 | "RockDestroyed", | 75 | "RockDestroyed", |
76 | 0 | 76 | 0 |
77 | }; | 77 | }; |
78 | 78 | ||
79 | const char *soundDefaults[] = | 79 | const char *soundDefaults[] = |
80 | { | 80 | { |
81 | "Explosion.wav", | 81 | "Explosion.wav", |
82 | "ploop.wav", | 82 | "ploop.wav", |
83 | 0 | 83 | 0 |
84 | }; | 84 | }; |
85 | 85 | ||
86 | 86 | ||
87 | KAstTopLevel::KAstTopLevel( QWidget *parent, const char *name ) | 87 | KAstTopLevel::KAstTopLevel( QWidget *parent, const char *_name ) |
88 | : QMainWindow( parent, name ) | 88 | : QMainWindow( parent, _name ) |
89 | { | 89 | { |
90 | setCaption( tr("Asteroids") ); | 90 | setCaption( tr("Asteroids") ); |
91 | QWidget *border = new QWidget( this ); | 91 | QWidget *border = new QWidget( this ); |
92 | border->setBackgroundColor( black ); | 92 | border->setBackgroundColor( black ); |
93 | setCentralWidget( border ); | 93 | setCentralWidget( border ); |
94 | 94 | ||
95 | QVBoxLayout *borderLayout = new QVBoxLayout( border ); | 95 | QVBoxLayout *borderLayout = new QVBoxLayout( border ); |
96 | 96 | ||
97 | QWidget *mainWin = new QWidget( border ); | 97 | QWidget *mainWin = new QWidget( border ); |
98 | borderLayout->addWidget( mainWin, 2, AlignHCenter ); | 98 | borderLayout->addWidget( mainWin, 2, AlignHCenter ); |
99 | 99 | ||
100 | view = new KAsteroidsView( mainWin ); | 100 | view = new KAsteroidsView( mainWin ); |