From 70e2a5d3b338e4455bbbbfbdf2106d5b90565dbe Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Mon, 15 Dec 2008 19:24:10 +0000
Subject: [PATCH] - Fixed compilation warning in main.cpp - Removed use of Qt3
 backport headers in ico.cpp

---
 src/ico.cpp  | 12 ++----------
 src/main.cpp |  3 +--
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/ico.cpp b/src/ico.cpp
index ad87ba264..99d883d0d 100644
--- a/src/ico.cpp
+++ b/src/ico.cpp
@@ -6,13 +6,6 @@
  *
  */
 
-// remove when QImage::jumpTable is ported
-#define QT3_SUPPORT
-#define QT3_SUPPORT_WARNINGS
-#ifdef __GNUC__
-#warning TODO: remove QT3_SUPPORT
-#endif
-
 #include "ico.h"
 
 #include <cstring>
@@ -185,12 +178,11 @@ namespace
         unsigned bpl = ( rec.width * header.biBitCount + 31 ) / 32 * 4;
 
         unsigned char* buf = new unsigned char[ bpl ];
-        unsigned char** lines = icon.jumpTable();
         for ( unsigned y = rec.height; !stream.atEnd() && y--; )
         {
             stream.readRawData( reinterpret_cast< char* >( buf ), bpl );
             unsigned char* pixel = buf;
-            QRgb* p = reinterpret_cast< QRgb* >( lines[ y ] );
+            QRgb* p = reinterpret_cast< QRgb* >( icon.scanLine(y));
             switch ( header.biBitCount )
             {
                 case 1:
@@ -232,7 +224,7 @@ namespace
             for ( unsigned y = rec.height; y--; )
             {
                 stream.readRawData( reinterpret_cast< char* >( buf ), bpl );
-                QRgb* p = reinterpret_cast< QRgb* >( lines[ y ] );
+                QRgb* p = reinterpret_cast< QRgb* >(icon.scanLine(y));
                 for ( unsigned x = 0; x < rec.width; ++x, ++p )
                     if ( ( ( buf[ x / 8 ] >> ( 7 - ( x & 0x07 ) ) ) & 1 ) )
                         *p &= RGB_MASK;
diff --git a/src/main.cpp b/src/main.cpp
index 02515c3f7..41e86035a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -45,7 +45,6 @@
 #endif
 
 #include <stdlib.h>
-
 #include "GUI.h"
 #include "misc.h"
 #include "ico.h"
@@ -96,7 +95,7 @@ int main(int argc, char *argv[]){
     }
   }
   // Set environment variable
-  if(putenv("QBITTORRENT="VERSION)){
+  if(putenv((char*)"QBITTORRENT="VERSION)) {
     std::cerr << "Couldn't set environment variable...\n";
   }
   QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));