author | erik <erik> | 2007-01-24 19:50:48 (UTC) |
---|---|---|
committer | erik <erik> | 2007-01-24 19:50:48 (UTC) |
commit | 035bbc5bf689839c8d8e7be37f347b0dd900fccf (patch) (unidiff) | |
tree | cd668db7b1fedbf6fa2d54fb312a90e6f157e82a /noncore | |
parent | a017bf21dd89159052f2f7a3fbc043a24956c08c (diff) | |
download | opie-035bbc5bf689839c8d8e7be37f347b0dd900fccf.zip opie-035bbc5bf689839c8d8e7be37f347b0dd900fccf.tar.gz opie-035bbc5bf689839c8d8e7be37f347b0dd900fccf.tar.bz2 |
Eac one the files in this commit had an instance where a code path is
never traversed because of conditionals operating on values that
never change.
-rw-r--r-- | noncore/apps/opie-reader/decompress.cpp | 7 | ||||
-rw-r--r-- | noncore/games/solitaire/canvascard.cpp | 2 | ||||
-rw-r--r-- | noncore/games/tetrix/ohighscoredlg.cpp | 9 |
3 files changed, 2 insertions, 16 deletions
diff --git a/noncore/apps/opie-reader/decompress.cpp b/noncore/apps/opie-reader/decompress.cpp index 9bfec49..6034e01 100644 --- a/noncore/apps/opie-reader/decompress.cpp +++ b/noncore/apps/opie-reader/decompress.cpp | |||
@@ -1,78 +1,71 @@ | |||
1 | #include <string.h> | 1 | #include <string.h> |
2 | #include "decompress.h" | 2 | #include "decompress.h" |
3 | #include <zlib.h> | 3 | #include <zlib.h> |
4 | #include <stdlib.h> | 4 | #include <stdlib.h> |
5 | 5 | ||
6 | size_t UnZip(UInt8* compressedbuffer, size_t reclen, UInt8* tgtbuffer, size_t bsize) | 6 | size_t UnZip(UInt8* compressedbuffer, size_t reclen, UInt8* tgtbuffer, size_t bsize) |
7 | { | 7 | { |
8 | z_stream zstream; | 8 | z_stream zstream; |
9 | memset(&zstream,sizeof(zstream),0); | 9 | memset(&zstream,sizeof(zstream),0); |
10 | zstream.next_in = compressedbuffer; | 10 | zstream.next_in = compressedbuffer; |
11 | zstream.next_out = tgtbuffer; | 11 | zstream.next_out = tgtbuffer; |
12 | zstream.avail_out = bsize; | 12 | zstream.avail_out = bsize; |
13 | zstream.avail_in = reclen; | 13 | zstream.avail_in = reclen; |
14 | 14 | ||
15 | int keylen = 0; | ||
16 | |||
17 | zstream.zalloc = Z_NULL; | 15 | zstream.zalloc = Z_NULL; |
18 | zstream.zfree = Z_NULL; | 16 | zstream.zfree = Z_NULL; |
19 | zstream.opaque = Z_NULL; | 17 | zstream.opaque = Z_NULL; |
20 | 18 | ||
21 | // printf("Initialising\n"); | 19 | // printf("Initialising\n"); |
22 | 20 | ||
23 | inflateInit(&zstream); | 21 | inflateInit(&zstream); |
24 | int err = 0; | 22 | int err = 0; |
25 | do { | 23 | do { |
26 | if ( zstream.avail_in == 0 && 0 < keylen ) { | ||
27 | zstream.next_in = compressedbuffer + keylen; | ||
28 | zstream.avail_in = reclen - keylen; | ||
29 | keylen = 0; | ||
30 | } | ||
31 | zstream.next_out = tgtbuffer; | 24 | zstream.next_out = tgtbuffer; |
32 | zstream.avail_out = bsize; | 25 | zstream.avail_out = bsize; |
33 | 26 | ||
34 | err = inflate( &zstream, Z_SYNC_FLUSH ); | 27 | err = inflate( &zstream, Z_SYNC_FLUSH ); |
35 | 28 | ||
36 | ////qDebug("err:%d - %u", err, zstream.avail_in); | 29 | ////qDebug("err:%d - %u", err, zstream.avail_in); |
37 | 30 | ||
38 | } while ( err == Z_OK ); | 31 | } while ( err == Z_OK ); |
39 | 32 | ||
40 | inflateEnd(&zstream); | 33 | inflateEnd(&zstream); |
41 | return zstream.total_out; | 34 | return zstream.total_out; |
42 | } | 35 | } |
43 | 36 | ||
44 | #if defined(__STATIC) && defined(USENEF) | 37 | #if defined(__STATIC) && defined(USENEF) |
45 | #include "Model.h" | 38 | #include "Model.h" |
46 | size_t (*getdecompressor(char* _s))(UInt8*, size_t, UInt8*, size_t) | 39 | size_t (*getdecompressor(char* _s))(UInt8*, size_t, UInt8*, size_t) |
47 | { | 40 | { |
48 | if (strcmp(_s, "PluckerDecompress3") == 0) | 41 | if (strcmp(_s, "PluckerDecompress3") == 0) |
49 | { | 42 | { |
50 | return PluckerDecompress3; | 43 | return PluckerDecompress3; |
51 | } | 44 | } |
52 | if (strcmp(_s, "PluckerDecompress4") == 0) | 45 | if (strcmp(_s, "PluckerDecompress4") == 0) |
53 | { | 46 | { |
54 | return PluckerDecompress4; | 47 | return PluckerDecompress4; |
55 | } | 48 | } |
56 | if (strcmp(_s, "RebDecompress") == 0) | 49 | if (strcmp(_s, "RebDecompress") == 0) |
57 | { | 50 | { |
58 | return RebDecompress; | 51 | return RebDecompress; |
59 | } | 52 | } |
60 | return NULL; | 53 | return NULL; |
61 | } | 54 | } |
62 | #else | 55 | #else |
63 | 56 | ||
64 | #include "qfileinfo.h" | 57 | #include "qfileinfo.h" |
65 | 58 | ||
66 | #include <dlfcn.h> | 59 | #include <dlfcn.h> |
67 | 60 | ||
68 | size_t (*getdecompressor(char* _s))(UInt8*, size_t, UInt8*, size_t) | 61 | size_t (*getdecompressor(char* _s))(UInt8*, size_t, UInt8*, size_t) |
69 | { | 62 | { |
70 | #ifdef USEQPE | 63 | #ifdef USEQPE |
71 | #ifdef OPIE | 64 | #ifdef OPIE |
72 | QString codecpath(getenv("OPIEDIR")); | 65 | QString codecpath(getenv("OPIEDIR")); |
73 | #else | 66 | #else |
74 | QString codecpath(getenv("QTDIR")); | 67 | QString codecpath(getenv("QTDIR")); |
75 | #endif | 68 | #endif |
76 | codecpath += "/plugins/reader/support/libpluckerdecompress.so"; | 69 | codecpath += "/plugins/reader/support/libpluckerdecompress.so"; |
77 | #else | 70 | #else |
78 | QString codecpath(getenv("READERDIR")); | 71 | QString codecpath(getenv("READERDIR")); |
diff --git a/noncore/games/solitaire/canvascard.cpp b/noncore/games/solitaire/canvascard.cpp index cd298ef..3ed9ea0 100644 --- a/noncore/games/solitaire/canvascard.cpp +++ b/noncore/games/solitaire/canvascard.cpp | |||
@@ -169,97 +169,97 @@ void CanvasCard::setCardBack(int b) | |||
169 | 169 | ||
170 | void CanvasCard::draw(QPainter &painter) | 170 | void CanvasCard::draw(QPainter &painter) |
171 | { | 171 | { |
172 | int ix = (int)x(), iy = (int)y(); | 172 | int ix = (int)x(), iy = (int)y(); |
173 | 173 | ||
174 | QPainter *p = &painter; | 174 | QPainter *p = &painter; |
175 | QPixmap *unscaledCard = NULL; | 175 | QPixmap *unscaledCard = NULL; |
176 | 176 | ||
177 | if ((scaleX <= 0.98) || (scaleY <= 0.98)) | 177 | if ((scaleX <= 0.98) || (scaleY <= 0.98)) |
178 | { | 178 | { |
179 | p = new QPainter(); | 179 | p = new QPainter(); |
180 | unscaledCard = new QPixmap( cardsFaces->width(), cardsFaces->height() ); | 180 | unscaledCard = new QPixmap( cardsFaces->width(), cardsFaces->height() ); |
181 | p->begin(unscaledCard); | 181 | p->begin(unscaledCard); |
182 | ix = 0; | 182 | ix = 0; |
183 | iy = 0; | 183 | iy = 0; |
184 | } | 184 | } |
185 | 185 | ||
186 | if ( isFacing() ) { | 186 | if ( isFacing() ) { |
187 | 187 | ||
188 | int w = cardsFaces->width(), h = cardsFaces->height(); | 188 | int w = cardsFaces->width(), h = cardsFaces->height(); |
189 | 189 | ||
190 | p->setBrush( QColor( 0xFF, 0xFF, 0xFF ) ); | 190 | p->setBrush( QColor( 0xFF, 0xFF, 0xFF ) ); |
191 | 191 | ||
192 | if ( isRed() == TRUE ) | 192 | if ( isRed() == TRUE ) |
193 | p->setPen( QColor( 0xFF, 0, 0 ) ); | 193 | p->setPen( QColor( 0xFF, 0, 0 ) ); |
194 | else | 194 | else |
195 | p->setPen( QColor( 0, 0, 0 ) ); | 195 | p->setPen( QColor( 0, 0, 0 ) ); |
196 | 196 | ||
197 | if ( qt_screen->deviceWidth() < 200 ) { | 197 | if ( qt_screen->deviceWidth() < 200 ) { |
198 | p->drawPixmap( ix + 0, iy + 0, *cardsFaces ); | 198 | p->drawPixmap( ix + 0, iy + 0, *cardsFaces ); |
199 | p->drawPixmap( ix + 3, iy + 3, *cardsChars, 5*(getValue()-1), 0, 5, 6 ); | 199 | p->drawPixmap( ix + 3, iy + 3, *cardsChars, 5*(getValue()-1), 0, 5, 6 ); |
200 | p->drawPixmap( ix + 11, iy + 3, *cardsSuits, 5*(getSuit()-1), 0, 5, 6 ); | 200 | p->drawPixmap( ix + 11, iy + 3, *cardsSuits, 5*(getSuit()-1), 0, 5, 6 ); |
201 | p->drawPixmap( ix + w-3-5, iy + h-3-6, *cardsCharsUpsideDown, 5*(12-getValue()+1), 0, 5, 6 ); | 201 | p->drawPixmap( ix + w-3-5, iy + h-3-6, *cardsCharsUpsideDown, 5*(12-getValue()+1), 0, 5, 6 ); |
202 | p->drawPixmap( ix + w-11-5, iy + h-3-6, *cardsSuitsUpsideDown, 5*(3-getSuit()+1), 0, 5, 6 ); | 202 | p->drawPixmap( ix + w-11-5, iy + h-3-6, *cardsSuitsUpsideDown, 5*(3-getSuit()+1), 0, 5, 6 ); |
203 | } else { | 203 | } else { |
204 | p->drawPixmap( ix + 0, iy + 0, *cardsFaces ); | 204 | p->drawPixmap( ix + 0, iy + 0, *cardsFaces ); |
205 | p->drawPixmap( ix + 4, iy + 4, *cardsChars, 7*(getValue()-1), 0, 7, 7 ); | 205 | p->drawPixmap( ix + 4, iy + 4, *cardsChars, 7*(getValue()-1), 0, 7, 7 ); |
206 | p->drawPixmap( ix + 12, iy + 4, *cardsSuits, 7*(getSuit()-1), 0, 7, 8 ); | 206 | p->drawPixmap( ix + 12, iy + 4, *cardsSuits, 7*(getSuit()-1), 0, 7, 8 ); |
207 | p->drawPixmap( ix + w-4-7, iy + h-4-7, *cardsCharsUpsideDown, 7*(12-getValue()+1), 0, 7, 7 ); | 207 | p->drawPixmap( ix + w-4-7, iy + h-4-7, *cardsCharsUpsideDown, 7*(12-getValue()+1), 0, 7, 7 ); |
208 | p->drawPixmap( ix + w-12-7, iy + h-5-7, *cardsSuitsUpsideDown, 7*(3-getSuit()+1), 0, 7, 8 ); | 208 | p->drawPixmap( ix + w-12-7, iy + h-5-7, *cardsSuitsUpsideDown, 7*(3-getSuit()+1), 0, 7, 8 ); |
209 | } | 209 | } |
210 | 210 | ||
211 | } else { | 211 | } else { |
212 | 212 | ||
213 | p->drawPixmap( ix, iy, *cardsBacks ); | 213 | p->drawPixmap( ix, iy, *cardsBacks ); |
214 | 214 | ||
215 | } | 215 | } |
216 | 216 | ||
217 | if (p != &painter) | 217 | if (p != &painter && unscaledCard) |
218 | { | 218 | { |
219 | p->end(); | 219 | p->end(); |
220 | QPixmap *scaledCard = CreateScaledPixmap( unscaledCard, scaleX, scaleY ); | 220 | QPixmap *scaledCard = CreateScaledPixmap( unscaledCard, scaleX, scaleY ); |
221 | int xoff = scaledCard->width() / 2; | 221 | int xoff = scaledCard->width() / 2; |
222 | int yoff = scaledCard->height() / 2; | 222 | int yoff = scaledCard->height() / 2; |
223 | painter.drawPixmap( (int)x() + xOff - xoff, (int)y() + yOff - yoff, *scaledCard ); | 223 | painter.drawPixmap( (int)x() + xOff - xoff, (int)y() + yOff - yoff, *scaledCard ); |
224 | delete p; | 224 | delete p; |
225 | delete unscaledCard; | 225 | delete unscaledCard; |
226 | delete scaledCard; | 226 | delete scaledCard; |
227 | } | 227 | } |
228 | } | 228 | } |
229 | 229 | ||
230 | 230 | ||
231 | static const double flipLift = 1.5; | 231 | static const double flipLift = 1.5; |
232 | 232 | ||
233 | 233 | ||
234 | void CanvasCard::flipTo(int x2, int y2, int steps) | 234 | void CanvasCard::flipTo(int x2, int y2, int steps) |
235 | { | 235 | { |
236 | flipSteps = steps; | 236 | flipSteps = steps; |
237 | 237 | ||
238 | #ifdef SLOW_HARDWARE | 238 | #ifdef SLOW_HARDWARE |
239 | move(x2,y2); | 239 | move(x2,y2); |
240 | Card::flipTo(x2,y2,steps); | 240 | Card::flipTo(x2,y2,steps); |
241 | #else | 241 | #else |
242 | int x1 = (int)x(); | 242 | int x1 = (int)x(); |
243 | int y1 = (int)y(); | 243 | int y1 = (int)y(); |
244 | double dx = x2 - x1; | 244 | double dx = x2 - x1; |
245 | double dy = y2 - y1; | 245 | double dy = y2 - y1; |
246 | 246 | ||
247 | flipping = TRUE; | 247 | flipping = TRUE; |
248 | destX = x2; | 248 | destX = x2; |
249 | destY = y2; | 249 | destY = y2; |
250 | animSteps = flipSteps; | 250 | animSteps = flipSteps; |
251 | setVelocity(dx/animSteps, dy/animSteps-flipLift); | 251 | setVelocity(dx/animSteps, dy/animSteps-flipLift); |
252 | setAnimated(TRUE); | 252 | setAnimated(TRUE); |
253 | #endif | 253 | #endif |
254 | } | 254 | } |
255 | 255 | ||
256 | 256 | ||
257 | void CanvasCard::advance(int stage) | 257 | void CanvasCard::advance(int stage) |
258 | { | 258 | { |
259 | if ( stage==1 ) { | 259 | if ( stage==1 ) { |
260 | if ( animSteps-- <= 0 ) { | 260 | if ( animSteps-- <= 0 ) { |
261 | scaleX = 1.0; | 261 | scaleX = 1.0; |
262 | scaleY = 1.0; | 262 | scaleY = 1.0; |
263 | flipping = FALSE; | 263 | flipping = FALSE; |
264 | setVelocity(0,0); | 264 | setVelocity(0,0); |
265 | setAnimated(FALSE); | 265 | setAnimated(FALSE); |
diff --git a/noncore/games/tetrix/ohighscoredlg.cpp b/noncore/games/tetrix/ohighscoredlg.cpp index 66f4917..504385f 100644 --- a/noncore/games/tetrix/ohighscoredlg.cpp +++ b/noncore/games/tetrix/ohighscoredlg.cpp | |||
@@ -129,78 +129,71 @@ void OHighscore::insertData( QString name , int punkte , int playerLevel ) | |||
129 | entryNumber++; | 129 | entryNumber++; |
130 | } | 130 | } |
131 | //////////////////////////////////////// | 131 | //////////////////////////////////////// |
132 | 132 | ||
133 | return; | 133 | return; |
134 | } | 134 | } |
135 | } | 135 | } |
136 | } | 136 | } |
137 | 137 | ||
138 | QString OHighscore::getName() | 138 | QString OHighscore::getName() |
139 | { | 139 | { |
140 | QString name; | 140 | QString name; |
141 | QDialog *d = new QDialog ( this, 0, true ); | 141 | QDialog *d = new QDialog ( this, 0, true ); |
142 | d->setCaption( tr( "Enter your name!" )); | 142 | d->setCaption( tr( "Enter your name!" )); |
143 | QLineEdit *ed = new QLineEdit ( d ); | 143 | QLineEdit *ed = new QLineEdit ( d ); |
144 | ( new QVBoxLayout ( d, 3, 3 ))->addWidget ( ed ); | 144 | ( new QVBoxLayout ( d, 3, 3 ))->addWidget ( ed ); |
145 | ed->setFocus ( ); | 145 | ed->setFocus ( ); |
146 | 146 | ||
147 | if ( d->exec() == QDialog::Accepted ) { | 147 | if ( d->exec() == QDialog::Accepted ) { |
148 | name = ed->text(); | 148 | name = ed->text(); |
149 | } | 149 | } |
150 | //delete d; | 150 | //delete d; |
151 | return name; | 151 | return name; |
152 | } | 152 | } |
153 | 153 | ||
154 | OHighscoreDialog::OHighscoreDialog(OHighscore *highscore, QWidget *parent, const char *name, bool modal) : QDialog(parent, name, modal) | 154 | OHighscoreDialog::OHighscoreDialog(OHighscore *highscore, QWidget *parent, const char *name, bool modal) : QDialog(parent, name, modal) |
155 | { | 155 | { |
156 | hs_ = highscore; | 156 | hs_ = highscore; |
157 | setCaption( tr( "Highscores" ) ); | 157 | setCaption( tr( "Highscores" ) ); |
158 | vbox_layout = new QVBoxLayout( this, 4 , 4 ); | 158 | vbox_layout = new QVBoxLayout( this, 4 , 4 ); |
159 | list = new QListView( this ); | 159 | list = new QListView( this ); |
160 | list->setSorting( -1 ); | 160 | list->setSorting( -1 ); |
161 | list->addColumn( tr( "#" )); | 161 | list->addColumn( tr( "#" )); |
162 | list->addColumn( tr( "Name" )); | 162 | list->addColumn( tr( "Name" )); |
163 | list->addColumn( tr( "Points" )); | 163 | list->addColumn( tr( "Points" )); |
164 | list->addColumn( tr( "Level" )); | 164 | list->addColumn( tr( "Level" )); |
165 | 165 | ||
166 | createHighscoreListView(); | 166 | createHighscoreListView(); |
167 | 167 | ||
168 | vbox_layout->addWidget( list ); | 168 | vbox_layout->addWidget( list ); |
169 | QPEApplication::showDialog( this ); | 169 | QPEApplication::showDialog( this ); |
170 | } | 170 | } |
171 | 171 | ||
172 | void OHighscoreDialog::createHighscoreListView() | 172 | void OHighscoreDialog::createHighscoreListView() |
173 | { | 173 | { |
174 | int pos = 10; | 174 | int pos = 10; |
175 | int points_ = 0; | 175 | int points_ = 0; |
176 | int level_ = 0; | 176 | int level_ = 0; |
177 | QListViewItem * Prev = 0; | ||
178 | 177 | ||
179 | for ( t_playerData * Run = hs_->playerData.first(); | 178 | for ( t_playerData * Run = hs_->playerData.first(); |
180 | Run != 0; | 179 | Run != 0; |
181 | Run=hs_->playerData.next() ) | 180 | Run=hs_->playerData.next() ) |
182 | { | 181 | { |
183 | QListViewItem *item; | 182 | QListViewItem *item; |
184 | 183 | ||
185 | if( Prev ) { | 184 | item = new QListViewItem( list ); |
186 | // after previous | ||
187 | item = new QListViewItem( list, Prev ); | ||
188 | Prev = item; | ||
189 | } else { | ||
190 | item = new QListViewItem( list ); | ||
191 | 185 | ||
192 | } | ||
193 | item->setText( 0 , QString::number( pos ) ); //number | 186 | item->setText( 0 , QString::number( pos ) ); //number |
194 | item->setText( 1 , Run->sName ); //name | 187 | item->setText( 1 , Run->sName ); //name |
195 | if ( Run->points == -1 ) | 188 | if ( Run->points == -1 ) |
196 | points_ = 0; | 189 | points_ = 0; |
197 | else points_ = Run->points; | 190 | else points_ = Run->points; |
198 | if ( Run->level == -1 ) | 191 | if ( Run->level == -1 ) |
199 | level_ = 0; | 192 | level_ = 0; |
200 | else level_ = Run->level; | 193 | else level_ = Run->level; |
201 | item->setText( 2 , QString::number( points_ ) ); //points | 194 | item->setText( 2 , QString::number( points_ ) ); //points |
202 | item->setText( 3 , QString::number( level_ ) ); //level | 195 | item->setText( 3 , QString::number( level_ ) ); //level |
203 | pos--; | 196 | pos--; |
204 | } | 197 | } |
205 | } | 198 | } |
206 | 199 | ||