author | zecke <zecke> | 2004-10-17 18:38:39 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-10-17 18:38:39 (UTC) |
commit | e95fcb09fc069a83b3c10c19c081873daba49831 (patch) (unidiff) | |
tree | 13d13bac82d5bcf2489075e4f2962685ff3c897d /noncore | |
parent | 7e28835e246e06e157d760a40754b6257f2ad6b3 (diff) | |
download | opie-e95fcb09fc069a83b3c10c19c081873daba49831.zip opie-e95fcb09fc069a83b3c10c19c081873daba49831.tar.gz opie-e95fcb09fc069a83b3c10c19c081873daba49831.tar.bz2 |
G++ 4.0 compiler fixes
-Remove anonymous structures and name them
-Include 'card.h' to cardpile to make 'Card' known to QList
so deleteItem will work
-cast 'enum' to char in event.cpp and opimevent.cpp
-rw-r--r-- | noncore/applets/zkbapplet/keyzcfg/zkbnames.cpp | 26 | ||||
-rw-r--r-- | noncore/games/qasteroids/view.cpp | 7 | ||||
-rw-r--r-- | noncore/games/solitaire/cardpile.h | 2 |
3 files changed, 22 insertions, 13 deletions
diff --git a/noncore/applets/zkbapplet/keyzcfg/zkbnames.cpp b/noncore/applets/zkbapplet/keyzcfg/zkbnames.cpp index b2180ba..a47bf6c 100644 --- a/noncore/applets/zkbapplet/keyzcfg/zkbnames.cpp +++ b/noncore/applets/zkbapplet/keyzcfg/zkbnames.cpp | |||
@@ -1,35 +1,37 @@ | |||
1 | #include <qmap.h> | 1 | #include <qmap.h> |
2 | 2 | ||
3 | #include "zkbnames.h" | 3 | #include "zkbnames.h" |
4 | 4 | ||
5 | QString Null_String((const char*) 0); | 5 | QString Null_String((const char*) 0); |
6 | 6 | ||
7 | // Implementation of KeyNames | 7 | // Implementation of KeyNames |
8 | static struct { | 8 | struct Key_Names_t { |
9 | int key; | 9 | int key; |
10 | char *name; | 10 | char *name; |
11 | } Key_Names[] = { | 11 | }; |
12 | |||
13 | static const Key_Names_t Key_Names[] = { | ||
12 | { 32, "Space" }, | 14 | { 32, "Space" }, |
13 | { 39, "Apostrophe" }, | 15 | { 39, "Apostrophe" }, |
14 | { 44, "Comma" }, | 16 | { 44, "Comma" }, |
15 | { 46, "Period" }, | 17 | { 46, "Period" }, |
16 | { 47, "Slash" }, | 18 | { 47, "Slash" }, |
17 | { 65, "A" }, | 19 | { 65, "A" }, |
18 | { 66, "B" }, | 20 | { 66, "B" }, |
19 | { 67, "C" }, | 21 | { 67, "C" }, |
20 | { 68, "D" }, | 22 | { 68, "D" }, |
21 | { 69, "E" }, | 23 | { 69, "E" }, |
22 | { 70, "F" }, | 24 | { 70, "F" }, |
23 | { 71, "G" }, | 25 | { 71, "G" }, |
24 | { 72, "H" }, | 26 | { 72, "H" }, |
25 | { 73, "I" }, | 27 | { 73, "I" }, |
26 | { 74, "J" }, | 28 | { 74, "J" }, |
27 | { 75, "K" }, | 29 | { 75, "K" }, |
28 | { 76, "L" }, | 30 | { 76, "L" }, |
29 | { 77, "M" }, | 31 | { 77, "M" }, |
30 | { 78, "N" }, | 32 | { 78, "N" }, |
31 | { 79, "O" }, | 33 | { 79, "O" }, |
32 | { 80, "P" }, | 34 | { 80, "P" }, |
33 | { 81, "Q" }, | 35 | { 81, "Q" }, |
34 | { 82, "R" }, | 36 | { 82, "R" }, |
35 | { 83, "S" }, | 37 | { 83, "S" }, |
@@ -84,52 +86,54 @@ int KeyNames::find(const QString& key) { | |||
84 | } | 86 | } |
85 | 87 | ||
86 | QMap<QString, int>::Iterator it = kn_map.find(key); | 88 | QMap<QString, int>::Iterator it = kn_map.find(key); |
87 | if (it == kn_map.end()) { | 89 | if (it == kn_map.end()) { |
88 | return -1; | 90 | return -1; |
89 | } else { | 91 | } else { |
90 | return it.data(); | 92 | return it.data(); |
91 | } | 93 | } |
92 | } | 94 | } |
93 | 95 | ||
94 | const QString& KeyNames::find(int k) { | 96 | const QString& KeyNames::find(int k) { |
95 | if (kn_map.isEmpty()) { | 97 | if (kn_map.isEmpty()) { |
96 | init_kn_maps(); | 98 | init_kn_maps(); |
97 | } | 99 | } |
98 | 100 | ||
99 | QMap<int, QString>::Iterator it = kn_rmap.find(k); | 101 | QMap<int, QString>::Iterator it = kn_rmap.find(k); |
100 | if (it == kn_rmap.end()) { | 102 | if (it == kn_rmap.end()) { |
101 | return Null_String; | 103 | return Null_String; |
102 | } else { | 104 | } else { |
103 | return it.data(); | 105 | return it.data(); |
104 | } | 106 | } |
105 | } | 107 | } |
106 | 108 | ||
107 | // Implementation of ModifierNames | 109 | // Implementation of ModifierNames |
108 | struct { | 110 | struct Modifier_Names_t { |
109 | int value; | 111 | int value; |
110 | char* name; | 112 | char* name; |
111 | } Modifier_Names[] = { | 113 | }; |
114 | |||
115 | static const Modifier_Names_t Modifier_Names[] = { | ||
112 | { 8, "Shift" }, | 116 | { 8, "Shift" }, |
113 | { 16, "Control" }, | 117 | { 16, "Control" }, |
114 | { 32, "Alt" }, | 118 | { 32, "Alt" }, |
115 | { 0x4000, "Keypad" }, | 119 | { 0x4000, "Keypad" }, |
116 | { 0, 0 } | 120 | { 0, 0 } |
117 | }; | 121 | }; |
118 | 122 | ||
119 | static QMap<QString, int> mn_map; | 123 | static QMap<QString, int> mn_map; |
120 | static QMap<int, QString> mn_rmap; | 124 | static QMap<int, QString> mn_rmap; |
121 | 125 | ||
122 | void init_mn_maps() { | 126 | void init_mn_maps() { |
123 | int i = 0; | 127 | int i = 0; |
124 | while (Modifier_Names[i].name != 0) { | 128 | while (Modifier_Names[i].name != 0) { |
125 | int value = Modifier_Names[i].value; | 129 | int value = Modifier_Names[i].value; |
126 | QString name(Modifier_Names[i].name); | 130 | QString name(Modifier_Names[i].name); |
127 | 131 | ||
128 | mn_map.insert(name, value); | 132 | mn_map.insert(name, value); |
129 | mn_rmap.insert(value, name); | 133 | mn_rmap.insert(value, name); |
130 | i++; | 134 | i++; |
131 | } | 135 | } |
132 | } | 136 | } |
133 | 137 | ||
134 | int ModifierNames::find(const QString& key) { | 138 | int ModifierNames::find(const QString& key) { |
135 | if (mn_map.isEmpty()) { | 139 | if (mn_map.isEmpty()) { |
@@ -138,73 +142,75 @@ int ModifierNames::find(const QString& key) { | |||
138 | 142 | ||
139 | QMap<QString, int>::Iterator it = mn_map.find(key); | 143 | QMap<QString, int>::Iterator it = mn_map.find(key); |
140 | if (it == mn_map.end()) { | 144 | if (it == mn_map.end()) { |
141 | return -1; | 145 | return -1; |
142 | } else { | 146 | } else { |
143 | return it.data(); | 147 | return it.data(); |
144 | } | 148 | } |
145 | } | 149 | } |
146 | 150 | ||
147 | const QString& ModifierNames::find(int k) { | 151 | const QString& ModifierNames::find(int k) { |
148 | if (mn_map.isEmpty()) { | 152 | if (mn_map.isEmpty()) { |
149 | init_mn_maps(); | 153 | init_mn_maps(); |
150 | } | 154 | } |
151 | 155 | ||
152 | QMap<int, QString>::Iterator it = mn_rmap.find(k); | 156 | QMap<int, QString>::Iterator it = mn_rmap.find(k); |
153 | if (it == mn_rmap.end()) { | 157 | if (it == mn_rmap.end()) { |
154 | return Null_String; | 158 | return Null_String; |
155 | } else { | 159 | } else { |
156 | return it.data(); | 160 | return it.data(); |
157 | } | 161 | } |
158 | } | 162 | } |
159 | 163 | ||
160 | // Implementation of KeycodeNames | 164 | // Implementation of KeycodeNames |
161 | 165 | ||
162 | struct { | 166 | struct Keycode_Names_t { |
163 | char* name; | 167 | char* name; |
164 | int keycode; | 168 | int keycode; |
165 | } Keycode_Names[] = { | 169 | }; |
170 | |||
171 | static const Keycode_Names_t Keycode_Names[] = { | ||
166 | { "Escape", 0x1000 }, | 172 | { "Escape", 0x1000 }, |
167 | { "Tab", 0x1001 }, | 173 | { "Tab", 0x1001 }, |
168 | { "Backtab", 0x1002 }, | 174 | { "Backtab", 0x1002 }, |
169 | { "Backspace", 0x1003 }, | 175 | { "Backspace", 0x1003 }, |
170 | { "BackSpace", 0x1003 }, | 176 | { "BackSpace", 0x1003 }, |
171 | { "Return", 0x1004 }, | 177 | { "Return", 0x1004 }, |
172 | { "Enter", 0x1005 }, | 178 | { "Enter", 0x1005 }, |
173 | { "Insert", 0x1006 }, | 179 | { "Insert", 0x1006 }, |
174 | { "Delete", 0x1007 }, | 180 | { "Delete", 0x1007 }, |
175 | { "Pause", 0x1008 }, | 181 | { "Pause", 0x1008 }, |
176 | { "Print", 0x1009 }, | 182 | { "Print", 0x1009 }, |
177 | { "SysReq", 0x100a }, | 183 | { "SysReq", 0x100a }, |
178 | { "Home", 0x1010 }, | 184 | { "Home", 0x1010 }, |
179 | { "End", 0x1011 }, | 185 | { "End", 0x1011 }, |
180 | { "Left", 0x1012 }, | 186 | { "Left", 0x1012 }, |
181 | { "Up", 0x1013 }, | 187 | { "Up", 0x1013 }, |
182 | { "Right", 0x1014 }, | 188 | { "Right", 0x1014 }, |
183 | { "Down", 0x1015 }, | 189 | { "Down", 0x1015 }, |
184 | { "Prior", 0x1016 }, | 190 | { "Prior", 0x1016 }, |
185 | { "PageUp", 0x1016 }, | 191 | { "PageUp", 0x1016 }, |
186 | { "Next", 0x1017 }, | 192 | { "Next", 0x1017 }, |
187 | { "PageDown", 0x1017 }, | 193 | { "PageDown", 0x1017 }, |
188 | { "Shift", 0x1020 }, | 194 | { "Shift", 0x1020 }, |
189 | { "Control", 0x1021 }, | 195 | { "Control", 0x1021 }, |
190 | { "Meta", 0x1022 }, | 196 | { "Meta", 0x1022 }, |
191 | { "Alt", 0x1023 }, | 197 | { "Alt", 0x1023 }, |
192 | { "CapsLock", 0x1024 }, | 198 | { "CapsLock", 0x1024 }, |
193 | { "NumLock", 0x1025 }, | 199 | { "NumLock", 0x1025 }, |
194 | { "ScrollLock", 0x1026 }, | 200 | { "ScrollLock", 0x1026 }, |
195 | { "F1", 0x1030 }, | 201 | { "F1", 0x1030 }, |
196 | { "F2", 0x1031 }, | 202 | { "F2", 0x1031 }, |
197 | { "F3", 0x1032 }, | 203 | { "F3", 0x1032 }, |
198 | { "F4", 0x1033 }, | 204 | { "F4", 0x1033 }, |
199 | { "F5", 0x1034 }, | 205 | { "F5", 0x1034 }, |
200 | { "F6", 0x1035 }, | 206 | { "F6", 0x1035 }, |
201 | { "F7", 0x1036 }, | 207 | { "F7", 0x1036 }, |
202 | { "F8", 0x1037 }, | 208 | { "F8", 0x1037 }, |
203 | { "F9", 0x1038 }, | 209 | { "F9", 0x1038 }, |
204 | { "F10", 0x1039 }, | 210 | { "F10", 0x1039 }, |
205 | { "F11", 0x103a }, | 211 | { "F11", 0x103a }, |
206 | { "F12", 0x103b }, | 212 | { "F12", 0x103b }, |
207 | { "F13", 0x103c }, | 213 | { "F13", 0x103c }, |
208 | { "F14", 0x103d }, | 214 | { "F14", 0x103d }, |
209 | { "F15", 0x103e }, | 215 | { "F15", 0x103e }, |
210 | { "F16", 0x103f }, | 216 | { "F16", 0x103f }, |
diff --git a/noncore/games/qasteroids/view.cpp b/noncore/games/qasteroids/view.cpp index 352c63b..3a4d410 100644 --- a/noncore/games/qasteroids/view.cpp +++ b/noncore/games/qasteroids/view.cpp | |||
@@ -34,55 +34,56 @@ | |||
34 | 34 | ||
35 | #define REFRESH_DELAY 33 | 35 | #define REFRESH_DELAY 33 |
36 | #define SHIP_SPEED 0.3 | 36 | #define SHIP_SPEED 0.3 |
37 | #define MISSILE_SPEED 10.0 | 37 | #define MISSILE_SPEED 10.0 |
38 | #define SHIP_STEPS 64 | 38 | #define SHIP_STEPS 64 |
39 | #define ROTATE_RATE 2 | 39 | #define ROTATE_RATE 2 |
40 | #define SHIELD_ON_COST 1 | 40 | #define SHIELD_ON_COST 1 |
41 | #define SHIELD_HIT_COST 30 | 41 | #define SHIELD_HIT_COST 30 |
42 | #define BRAKE_ON_COST 4 | 42 | #define BRAKE_ON_COST 4 |
43 | 43 | ||
44 | #define MAX_ROCK_SPEED 2.5 | 44 | #define MAX_ROCK_SPEED 2.5 |
45 | #define MAX_POWERUP_SPEED 1.5 | 45 | #define MAX_POWERUP_SPEED 1.5 |
46 | #define MAX_SHIP_SPEED 8 | 46 | #define MAX_SHIP_SPEED 8 |
47 | #define MAX_BRAKES 5 | 47 | #define MAX_BRAKES 5 |
48 | #define MAX_SHIELDS 5 | 48 | #define MAX_SHIELDS 5 |
49 | #define MAX_FIREPOWER 5 | 49 | #define MAX_FIREPOWER 5 |
50 | 50 | ||
51 | #define TEXT_SPEED 4 | 51 | #define TEXT_SPEED 4 |
52 | 52 | ||
53 | #define PI_X_2 6.283185307 | 53 | #define PI_X_2 6.283185307 |
54 | #ifndef M_PI | 54 | #ifndef M_PI |
55 | #define M_PI 3.141592654 | 55 | #define M_PI 3.141592654 |
56 | #endif | 56 | #endif |
57 | 57 | ||
58 | struct | 58 | struct kas_animations_t |
59 | { | 59 | { |
60 | int id; | 60 | int id; |
61 | const char *path; | 61 | const char *path; |
62 | int frames; | 62 | int frames; |
63 | } | 63 | }; |
64 | kas_animations [] = | 64 | |
65 | static const kas_animations_t kas_animations [] = | ||
65 | { | 66 | { |
66 | // { ID_ROCK_LARGE, "rock1/rock1\%1.png", 32 }, | 67 | // { ID_ROCK_LARGE, "rock1/rock1\%1.png", 32 }, |
67 | { ID_ROCK_MEDIUM, "rock2/rock2\%1.png", 32 }, | 68 | { ID_ROCK_MEDIUM, "rock2/rock2\%1.png", 32 }, |
68 | { ID_ROCK_SMALL, "rock3/rock3\%1.png", 32 }, | 69 | { ID_ROCK_SMALL, "rock3/rock3\%1.png", 32 }, |
69 | { ID_SHIP, "ship/ship\%1.png", 32 }, | 70 | { ID_SHIP, "ship/ship\%1.png", 32 }, |
70 | { ID_MISSILE, "missile/missile.png", 0 }, | 71 | { ID_MISSILE, "missile/missile.png", 0 }, |
71 | { ID_BIT, "bits/bits\%1.png", 16 }, | 72 | { ID_BIT, "bits/bits\%1.png", 16 }, |
72 | { ID_EXHAUST, "exhaust/exhaust.png", 0 }, | 73 | { ID_EXHAUST, "exhaust/exhaust.png", 0 }, |
73 | { ID_ENERGY_POWERUP, "powerups/energy.png", 0 }, | 74 | { ID_ENERGY_POWERUP, "powerups/energy.png", 0 }, |
74 | // { ID_TELEPORT_POWERUP, "powerups/teleport%1.png", 12 }, | 75 | // { ID_TELEPORT_POWERUP, "powerups/teleport%1.png", 12 }, |
75 | { ID_BRAKE_POWERUP, "powerups/brake.png", 0 }, | 76 | { ID_BRAKE_POWERUP, "powerups/brake.png", 0 }, |
76 | { ID_SHIELD_POWERUP, "powerups/shield.png", 0 }, | 77 | { ID_SHIELD_POWERUP, "powerups/shield.png", 0 }, |
77 | { ID_SHOOT_POWERUP, "powerups/shoot.png", 0 }, | 78 | { ID_SHOOT_POWERUP, "powerups/shoot.png", 0 }, |
78 | { ID_SHIELD, "shield/shield\%1.png", 6 }, | 79 | { ID_SHIELD, "shield/shield\%1.png", 6 }, |
79 | { 0, 0, 0 } | 80 | { 0, 0, 0 } |
80 | }; | 81 | }; |
81 | 82 | ||
82 | 83 | ||
83 | 84 | ||
84 | KAsteroidsView::KAsteroidsView( QWidget *parent, const char *name ) | 85 | KAsteroidsView::KAsteroidsView( QWidget *parent, const char *name ) |
85 | : QWidget( parent, name ), | 86 | : QWidget( parent, name ), |
86 | field(200, 200), | 87 | field(200, 200), |
87 | view(&field,this) | 88 | view(&field,this) |
88 | { | 89 | { |
diff --git a/noncore/games/solitaire/cardpile.h b/noncore/games/solitaire/cardpile.h index 1eb2499..757e6b3 100644 --- a/noncore/games/solitaire/cardpile.h +++ b/noncore/games/solitaire/cardpile.h | |||
@@ -1,46 +1,48 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of 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 |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef CARD_PILE_H | 20 | #ifndef CARD_PILE_H |
21 | #define CARD_PILE_H | 21 | #define CARD_PILE_H |
22 | 22 | ||
23 | #include "card.h" | ||
24 | |||
23 | 25 | ||
24 | #include <qpoint.h> | 26 | #include <qpoint.h> |
25 | #include <qlist.h> | 27 | #include <qlist.h> |
26 | 28 | ||
27 | 29 | ||
28 | enum ePileStackingType { | 30 | enum ePileStackingType { |
29 | pileCascades = 0, pileStacks, pileCascadesOrStacks | 31 | pileCascades = 0, pileStacks, pileCascadesOrStacks |
30 | }; | 32 | }; |
31 | 33 | ||
32 | 34 | ||
33 | enum ePileFaceingType { | 35 | enum ePileFaceingType { |
34 | pileFaceUp = 0, pileFaceDown, pileFaceUpOrDown | 36 | pileFaceUp = 0, pileFaceDown, pileFaceUpOrDown |
35 | }; | 37 | }; |
36 | 38 | ||
37 | 39 | ||
38 | class Card; | 40 | class Card; |
39 | class Config; | 41 | class Config; |
40 | 42 | ||
41 | 43 | ||
42 | class CardPile : public QList<Card> | 44 | class CardPile : public QList<Card> |
43 | { | 45 | { |
44 | public: | 46 | public: |
45 | CardPile(int x, int y); | 47 | CardPile(int x, int y); |
46 | virtual ~CardPile() { } | 48 | virtual ~CardPile() { } |