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
@@ -9,28 +9,21 @@ size_t UnZip(UInt8* compressedbuffer, size_t reclen, UInt8* tgtbuffer, size_t bs
   memset(&zstream,sizeof(zstream),0);
   zstream.next_in = compressedbuffer;
   zstream.next_out = tgtbuffer;
   zstream.avail_out = bsize;
   zstream.avail_in = reclen;
 
-  int keylen = 0;
-
   zstream.zalloc = Z_NULL;
   zstream.zfree = Z_NULL;
   zstream.opaque = Z_NULL;
   
   //  printf("Initialising\n");
   
   inflateInit(&zstream);
   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;
 
     err = inflate( &zstream, Z_SYNC_FLUSH );
 
     //	//qDebug("err:%d - %u", err, zstream.avail_in);
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
@@ -211,13 +211,13 @@ void CanvasCard::draw(QPainter &painter)
     } else {
 	
 	p->drawPixmap( ix, iy, *cardsBacks );
 
     }
 
-    if (p != &painter)
+    if (p != &painter && unscaledCard)
     {
 	p->end();
 	QPixmap *scaledCard = CreateScaledPixmap( unscaledCard, scaleX, scaleY );
 	int xoff = scaledCard->width() / 2;
 	int yoff = scaledCard->height() / 2;
 	painter.drawPixmap( (int)x() + xOff - xoff, (int)y() + yOff - yoff, *scaledCard );
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
@@ -171,28 +171,21 @@ OHighscoreDialog::OHighscoreDialog(OHighscore *highscore, QWidget *parent, const
 
 void OHighscoreDialog::createHighscoreListView()
 {
 	int pos = 10;
 	int points_ = 0;
 	int level_ = 0;
-	QListViewItem * Prev = 0;
 
         for ( t_playerData * Run = hs_->playerData.first(); 
               Run != 0; 
               Run=hs_->playerData.next() )
         {
                 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
 		if ( Run->points  == -1 )
 			points_ = 0;
 		else points_ =  Run->points;
 		if ( Run->level  == -1 )