author | zecke <zecke> | 2004-02-06 14:32:10 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-02-06 14:32:10 (UTC) |
commit | b033733924e5d3454bb0a810c6a70d4ff0531d2b (patch) (unidiff) | |
tree | cafe130296468840db062af4a3335572804ee1f3 /noncore/games/parashoot/interface.h | |
parent | f60cbb888e72b3eaf49af6f72fa183e6d44ae389 (diff) | |
download | opie-b033733924e5d3454bb0a810c6a70d4ff0531d2b.zip opie-b033733924e5d3454bb0a810c6a70d4ff0531d2b.tar.gz opie-b033733924e5d3454bb0a810c6a70d4ff0531d2b.tar.bz2 |
Funny how much bugs one can introduce when importing Qtopia stuff.
Fixed a couple of possible sigsegv, uninitialized variables
Diffstat (limited to 'noncore/games/parashoot/interface.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/games/parashoot/interface.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/noncore/games/parashoot/interface.h b/noncore/games/parashoot/interface.h index 5abbe0b..dd73f53 100644 --- a/noncore/games/parashoot/interface.h +++ b/noncore/games/parashoot/interface.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
@@ -22,7 +22,7 @@ | |||
22 | #include "base.h" | 22 | #include "base.h" |
23 | #include "helicopter.h" | 23 | #include "helicopter.h" |
24 | 24 | ||
25 | #include <qpe/sound.h> | 25 | #include <qtopia/sound.h> |
26 | 26 | ||
27 | #include <qmainwindow.h> | 27 | #include <qmainwindow.h> |
28 | #include <qtimer.h> | 28 | #include <qtimer.h> |
@@ -32,15 +32,16 @@ class QCanvas; | |||
32 | class Helicopter; | 32 | class Helicopter; |
33 | 33 | ||
34 | //enum Direction{ | 34 | //enum Direction{ |
35 | // left, right, up, down }; | 35 | // left, right, up, down }; |
36 | 36 | ||
37 | class ParaShoot : public QMainWindow { | 37 | class ParaShoot : public QMainWindow { |
38 | Q_OBJECT | 38 | Q_OBJECT |
39 | 39 | ||
40 | public: | 40 | public: |
41 | static QString appName() { return QString::fromLatin1("parashoot"); } | ||
42 | ParaShoot(QWidget* parent=0, const char* name=0, WFlags f=0); | 41 | ParaShoot(QWidget* parent=0, const char* name=0, WFlags f=0); |
43 | 42 | static QString appName() { | |
43 | return QString::fromLatin1("parashoot"); | ||
44 | } | ||
44 | void clear(); | 45 | void clear(); |
45 | void gameOver(); | 46 | void gameOver(); |
46 | int mancount; | 47 | int mancount; |
@@ -51,7 +52,9 @@ protected: | |||
51 | virtual void keyPressEvent(QKeyEvent*); | 52 | virtual void keyPressEvent(QKeyEvent*); |
52 | virtual void keyReleaseEvent(QKeyEvent*); | 53 | virtual void keyReleaseEvent(QKeyEvent*); |
53 | virtual void resizeEvent(QResizeEvent *e); | 54 | virtual void resizeEvent(QResizeEvent *e); |
54 | 55 | virtual void focusOutEvent(QFocusEvent *); | |
56 | virtual void focusInEvent(QFocusEvent *); | ||
57 | |||
55 | private slots: | 58 | private slots: |
56 | void increaseScore(int); | 59 | void increaseScore(int); |
57 | void newGame(); | 60 | void newGame(); |
@@ -64,7 +67,6 @@ private: | |||
64 | QCanvas canvas; | 67 | QCanvas canvas; |
65 | Cannon* cannon; | 68 | Cannon* cannon; |
66 | Base* base; | 69 | Base* base; |
67 | QCanvasText* gameover; | ||
68 | QLabel* levelscore; | 70 | QLabel* levelscore; |
69 | int nomen; | 71 | int nomen; |
70 | int level; | 72 | int level; |
@@ -77,4 +79,4 @@ private: | |||
77 | Sound fanfare; | 79 | Sound fanfare; |
78 | int score; | 80 | int score; |
79 | int lastcannonkey; | 81 | int lastcannonkey; |
80 | }; | 82 | }; |