summaryrefslogtreecommitdiff
authorerik <erik>2007-01-24 19:50:48 (UTC)
committer erik <erik>2007-01-24 19:50:48 (UTC)
commit035bbc5bf689839c8d8e7be37f347b0dd900fccf (patch) (side-by-side diff)
treecd668db7b1fedbf6fa2d54fb312a90e6f157e82a
parenta017bf21dd89159052f2f7a3fbc043a24956c08c (diff)
downloadopie-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-reader/decompress.cpp7
-rw-r--r--noncore/games/solitaire/canvascard.cpp2
-rw-r--r--noncore/games/tetrix/ohighscoredlg.cpp9
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
@@ -13,6 +13,4 @@ size_t UnZip(UInt8* compressedbuffer, size_t reclen, UInt8* tgtbuffer, size_t bs
zstream.avail_in = reclen;
- int keylen = 0;
-
zstream.zalloc = Z_NULL;
zstream.zfree = Z_NULL;
@@ -24,9 +22,4 @@ size_t UnZip(UInt8* compressedbuffer, size_t reclen, UInt8* tgtbuffer, size_t bs
int err = 0;
do {
- if ( zstream.avail_in == 0 && 0 < keylen ) {
- zstream.next_in = compressedbuffer + keylen;
- zstream.avail_in = reclen - keylen;
- keylen = 0;
- }
zstream.next_out = tgtbuffer;
zstream.avail_out = bsize;
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
@@ -215,5 +215,5 @@ void CanvasCard::draw(QPainter &painter)
}
- if (p != &painter)
+ if (p != &painter && unscaledCard)
{
p->end();
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
@@ -175,5 +175,4 @@ void OHighscoreDialog::createHighscoreListView()
int points_ = 0;
int level_ = 0;
- QListViewItem * Prev = 0;
for ( t_playerData * Run = hs_->playerData.first();
@@ -183,12 +182,6 @@ void OHighscoreDialog::createHighscoreListView()
QListViewItem *item;
- if( Prev ) {
- // after previous
- item = new QListViewItem( list, Prev );
- Prev = item;
- } else {
- item = new QListViewItem( list );
+ item = new QListViewItem( list );
- }
item->setText( 0 , QString::number( pos ) ); //number
item->setText( 1 , Run->sName ); //name