summaryrefslogtreecommitdiff
authorzecke <zecke>2004-10-17 18:38:39 (UTC)
committer zecke <zecke>2004-10-17 18:38:39 (UTC)
commite95fcb09fc069a83b3c10c19c081873daba49831 (patch) (unidiff)
tree13d13bac82d5bcf2489075e4f2962685ff3c897d
parent7e28835e246e06e157d760a40754b6257f2ad6b3 (diff)
downloadopie-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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/firstuse.cpp9
-rw-r--r--libopie2/opiepim/core/opimevent.cpp2
-rw-r--r--library/backend/event.cpp2
-rw-r--r--noncore/applets/zkbapplet/keyzcfg/zkbnames.cpp26
-rw-r--r--noncore/games/qasteroids/view.cpp7
-rw-r--r--noncore/games/solitaire/cardpile.h2
6 files changed, 29 insertions, 19 deletions
diff --git a/core/launcher/firstuse.cpp b/core/launcher/firstuse.cpp
index acddeea..8344787 100644
--- a/core/launcher/firstuse.cpp
+++ b/core/launcher/firstuse.cpp
@@ -40,56 +40,57 @@
40#include <qtopia/fontmanager.h> 40#include <qtopia/fontmanager.h>
41using namespace Opie::Core; 41using namespace Opie::Core;
42 42
43/* QT */ 43/* QT */
44#include <qfile.h> 44#include <qfile.h>
45#include <qpainter.h> 45#include <qpainter.h>
46#include <qsimplerichtext.h> 46#include <qsimplerichtext.h>
47#include <qpushbutton.h> 47#include <qpushbutton.h>
48#include <qlabel.h> 48#include <qlabel.h>
49#include <qtimer.h> 49#include <qtimer.h>
50 50
51#if defined( Q_WS_QWS ) 51#if defined( Q_WS_QWS )
52#include <qwsdisplay_qws.h> 52#include <qwsdisplay_qws.h>
53#include <qgfx_qws.h> 53#include <qgfx_qws.h>
54#endif 54#endif
55 55
56/* STD */ 56/* STD */
57#include <stdlib.h> 57#include <stdlib.h>
58#include <sys/types.h> 58#include <sys/types.h>
59#if defined(Q_OS_LINUX) || defined(_OS_LINUX_) 59#if defined(Q_OS_LINUX) || defined(_OS_LINUX_)
60#include <unistd.h> 60#include <unistd.h>
61#endif 61#endif
62 62
63 63
64struct { 64struct settingsTable_t {
65 bool enabled; 65 bool enabled : 1;
66 const char *app; 66 const char *app;
67 const char *start; 67 const char *start;
68 const char *stop; 68 const char *stop;
69 const char *desc; 69 const char *desc;
70} 70};
71settingsTable [] = 71
72static settingsTable_t settingsTable [] =
72{ 73{
73 { FALSE, "language", "raise()", "accept()", // No tr 74 { FALSE, "language", "raise()", "accept()", // No tr
74 QT_TR_NOOP("Language") }, 75 QT_TR_NOOP("Language") },
75 { FALSE, "doctab", "raise()", "accept()", // No tr 76 { FALSE, "doctab", "raise()", "accept()", // No tr
76 QT_TR_NOOP("DocTab") }, 77 QT_TR_NOOP("DocTab") },
77#ifndef Q_OS_WIN32 78#ifndef Q_OS_WIN32
78 { FALSE, "systemtime", "raise()", "accept()", // No tr 79 { FALSE, "systemtime", "raise()", "accept()", // No tr
79 QT_TR_NOOP("Time and Date") }, 80 QT_TR_NOOP("Time and Date") },
80#endif 81#endif
81 { FALSE, "addressbook", "editPersonalAndClose()", "accept()", // No tr 82 { FALSE, "addressbook", "editPersonalAndClose()", "accept()", // No tr
82 QT_TR_NOOP("Personal Information") }, 83 QT_TR_NOOP("Personal Information") },
83 { FALSE, 0, 0, 0, 0 } 84 { FALSE, 0, 0, 0, 0 }
84}; 85};
85 86
86 87
87FirstUse::FirstUse(QWidget* parent, const char * name, WFlags wf) : 88FirstUse::FirstUse(QWidget* parent, const char * name, WFlags wf) :
88 QDialog( parent, name, TRUE, wf), 89 QDialog( parent, name, TRUE, wf),
89 transApp(0), transLib(0), needCalibrate(FALSE), currApp(-1), 90 transApp(0), transLib(0), needCalibrate(FALSE), currApp(-1),
90 waitForExit(-1), waitingForLaunch(FALSE), needRestart(FALSE) 91 waitForExit(-1), waitingForLaunch(FALSE), needRestart(FALSE)
91{ 92{
92 ServerApplication::allowRestart = FALSE; 93 ServerApplication::allowRestart = FALSE;
93 // we force our height beyound the maximum (which we set anyway) 94 // we force our height beyound the maximum (which we set anyway)
94 QRect desk = qApp->desktop()->geometry(); 95 QRect desk = qApp->desktop()->geometry();
95 setGeometry( 0, 0, desk.width(), desk.height() ); 96 setGeometry( 0, 0, desk.width(), desk.height() );
diff --git a/libopie2/opiepim/core/opimevent.cpp b/libopie2/opiepim/core/opimevent.cpp
index c656c3d..7bc6c32 100644
--- a/libopie2/opiepim/core/opimevent.cpp
+++ b/libopie2/opiepim/core/opimevent.cpp
@@ -49,49 +49,49 @@ int OCalendarHelper::week( const QDate& date )
49 // month. Equals the "row" is is in in the month view 49 // month. Equals the "row" is is in in the month view
50 int week = 1; 50 int week = 1;
51 QDate tmp( date.year(), date.month(), 1 ); 51 QDate tmp( date.year(), date.month(), 1 );
52 if ( date.dayOfWeek() < tmp.dayOfWeek() ) 52 if ( date.dayOfWeek() < tmp.dayOfWeek() )
53 ++week; 53 ++week;
54 54
55 week += ( date.day() - 1 ) / 7; 55 week += ( date.day() - 1 ) / 7;
56 56
57 return week; 57 return week;
58} 58}
59 59
60 60
61int OCalendarHelper::ocurrence( const QDate& date ) 61int OCalendarHelper::ocurrence( const QDate& date )
62{ 62{
63 // calculates the number of occurrances of this day of the 63 // calculates the number of occurrances of this day of the
64 // week till the given date (e.g 3rd Wednesday of the month) 64 // week till the given date (e.g 3rd Wednesday of the month)
65 return ( date.day() - 1 ) / 7 + 1; 65 return ( date.day() - 1 ) / 7 + 1;
66} 66}
67 67
68 68
69int OCalendarHelper::dayOfWeek( char day ) 69int OCalendarHelper::dayOfWeek( char day )
70{ 70{
71 int dayOfWeek = 1; 71 int dayOfWeek = 1;
72 char i = OPimRecurrence::MON; 72 char i = OPimRecurrence::MON;
73 while ( !( i & day ) && i <= OPimRecurrence::SUN ) 73 while ( !( i & day ) && i <= static_cast<char>(OPimRecurrence::SUN) )
74 { 74 {
75 i <<= 1; 75 i <<= 1;
76 ++dayOfWeek; 76 ++dayOfWeek;
77 } 77 }
78 return dayOfWeek; 78 return dayOfWeek;
79} 79}
80 80
81 81
82int OCalendarHelper::monthDiff( const QDate& first, const QDate& second ) 82int OCalendarHelper::monthDiff( const QDate& first, const QDate& second )
83{ 83{
84 return ( second.year() - first.year() ) * 12 + 84 return ( second.year() - first.year() ) * 12 +
85 second.month() - first.month(); 85 second.month() - first.month();
86} 86}
87 87
88 88
89struct OPimEvent::Data : public QShared 89struct OPimEvent::Data : public QShared
90{ 90{
91 Data() : QShared() 91 Data() : QShared()
92 { 92 {
93 child = 0; 93 child = 0;
94 recur = 0; 94 recur = 0;
95 manager = 0; 95 manager = 0;
96 isAllDay = false; 96 isAllDay = false;
97 parent = 0; 97 parent = 0;
diff --git a/library/backend/event.cpp b/library/backend/event.cpp
index 90860e8..abc420b 100644
--- a/library/backend/event.cpp
+++ b/library/backend/event.cpp
@@ -378,49 +378,49 @@ int Event::week( const QDate& date )
378 if ( date.dayOfWeek() < tmp.dayOfWeek() ) 378 if ( date.dayOfWeek() < tmp.dayOfWeek() )
379 ++week; 379 ++week;
380 380
381 week += ( date.day() - 1 ) / 7; 381 week += ( date.day() - 1 ) / 7;
382 return week; 382 return week;
383} 383}
384 384
385/*! 385/*!
386 \internal 386 \internal
387*/ 387*/
388int Event::occurrence( const QDate& date ) 388int Event::occurrence( const QDate& date )
389{ 389{
390 // calculates the number of occurrances of this day of the 390 // calculates the number of occurrances of this day of the
391 // week till the given date (e.g 3rd Wednesday of the month) 391 // week till the given date (e.g 3rd Wednesday of the month)
392 return ( date.day() - 1 ) / 7 + 1; 392 return ( date.day() - 1 ) / 7 + 1;
393} 393}
394 394
395/*! 395/*!
396 \internal 396 \internal
397*/ 397*/
398int Event::dayOfWeek( char day ) 398int Event::dayOfWeek( char day )
399{ 399{
400 int dayOfWeek = 1; 400 int dayOfWeek = 1;
401 char i = Event::MON; 401 char i = Event::MON;
402 while ( !( i & day ) && i <= Event::SUN ) { 402 while ( !( i & day ) && i <= static_cast<char>(Event::SUN) ) {
403 i <<= 1; 403 i <<= 1;
404 ++dayOfWeek; 404 ++dayOfWeek;
405 } 405 }
406 return dayOfWeek; 406 return dayOfWeek;
407} 407}
408 408
409/*! 409/*!
410 \internal 410 \internal
411*/ 411*/
412int Event::monthDiff( const QDate& first, const QDate& second ) 412int Event::monthDiff( const QDate& first, const QDate& second )
413{ 413{
414 return ( second.year() - first.year() ) * 12 + 414 return ( second.year() - first.year() ) * 12 +
415 second.month() - first.month(); 415 second.month() - first.month();
416} 416}
417 417
418/*! 418/*!
419 \internal 419 \internal
420*/ 420*/
421QMap<int, QString> Event::toMap() const 421QMap<int, QString> Event::toMap() const
422{ 422{
423 QMap<int, QString> m; 423 QMap<int, QString> m;
424 424
425 if ( !description().isEmpty() ) 425 if ( !description().isEmpty() )
426 m.insert( DatebookDescription, description() ); 426 m.insert( DatebookDescription, description() );
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
5QString Null_String((const char*) 0); 5QString Null_String((const char*) 0);
6 6
7// Implementation of KeyNames 7// Implementation of KeyNames
8static struct { 8struct Key_Names_t {
9 int key; 9 int key;
10 char *name; 10 char *name;
11} Key_Names[] = { 11};
12
13static 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
94const QString& KeyNames::find(int k) { 96const 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
108struct { 110struct Modifier_Names_t {
109 int value; 111 int value;
110 char* name; 112 char* name;
111} Modifier_Names[] = { 113};
114
115static 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
119static QMap<QString, int> mn_map; 123static QMap<QString, int> mn_map;
120static QMap<int, QString> mn_rmap; 124static QMap<int, QString> mn_rmap;
121 125
122void init_mn_maps() { 126void 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
134int ModifierNames::find(const QString& key) { 138int 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
147const QString& ModifierNames::find(int k) { 151const 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
162struct { 166struct Keycode_Names_t {
163 char* name; 167 char* name;
164 int keycode; 168 int keycode;
165} Keycode_Names[] = { 169};
170
171static 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
58struct 58struct 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};
64kas_animations [] = 64
65static 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
84KAsteroidsView::KAsteroidsView( QWidget *parent, const char *name ) 85KAsteroidsView::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
28enum ePileStackingType { 30enum ePileStackingType {
29 pileCascades = 0, pileStacks, pileCascadesOrStacks 31 pileCascades = 0, pileStacks, pileCascadesOrStacks
30}; 32};
31 33
32 34
33enum ePileFaceingType { 35enum ePileFaceingType {
34 pileFaceUp = 0, pileFaceDown, pileFaceUpOrDown 36 pileFaceUp = 0, pileFaceDown, pileFaceUpOrDown
35}; 37};
36 38
37 39
38class Card; 40class Card;
39class Config; 41class Config;
40 42
41 43
42class CardPile : public QList<Card> 44class CardPile : public QList<Card>
43{ 45{
44public: 46public:
45 CardPile(int x, int y); 47 CardPile(int x, int y);
46 virtual ~CardPile() { } 48 virtual ~CardPile() { }