3 files changed, 52 insertions, 62 deletions

diff --git a/noncore/settings/aqpkg/aqpkg.pro b/noncore/settings/aqpkg/aqpkg.pro
index 882cfd4..a24f036 100644
--- a/noncore/settings/aqpkg/aqpkg.pro
+++ b/noncore/settings/aqpkg/aqpkg.pro
@@ -36,3 +36,3 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS        += -lqpe -lopie -lstdc++
+LIBS        += -lqpe -lopie
 
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index 43eaaae..2a9c576 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -29,10 +29,2 @@
 
-#include <fstream>
-#include <iostream>
-#include <vector>
-using namespace std;
-
-#include <stdio.h>
-#include <unistd.h>
-
 #ifdef QWS
@@ -43,2 +35,3 @@ using namespace std;
 #include <qdir.h>
+#include <qfile.h>
 #include <qtextstream.h>
@@ -205,5 +198,6 @@ void Ipkg :: removeStatusEntry()
 
-    ifstream in( statusFile );
-    ofstream out( outStatusFile );
-    if ( !in.is_open() )
+    QFile readFile( statusFile );
+    QFile writeFile( outStatusFile );
+
+    if ( !readFile.open( IO_ReadOnly ) )
     {
@@ -215,3 +209,3 @@ void Ipkg :: removeStatusEntry()
 
-    if ( !out.is_open() )
+    if ( !writeFile.open( IO_WriteOnly ) )
     {
@@ -223,3 +217,8 @@ void Ipkg :: removeStatusEntry()
 
-    char line[1001];
+    int i = 0;
+
+    QTextStream readStream( &readFile );
+    QTextStream writeStream( &writeFile );
+    QString line;
+
     char k[21];
@@ -228,52 +227,44 @@ void Ipkg :: removeStatusEntry()
     QString value;
-    vector<QString> lines;
-    int i = 0;
-    do
+
+    while ( !readStream.atEnd() )
     {
-        in.getline( line, 1000 );
-        if ( in.eof() )
-            continue;
-
-        k[0] = '\0';
-        v[0] = '\0';
-
-        sscanf( line, "%[^:]: %[^\n]", k, v );
-        key = k;
-        value = v;
-        key = key.stripWhiteSpace();
-        value = value.stripWhiteSpace();
-        if ( key == "Package" && value == package )
+        //read new line
+        line = readStream.readLine();
+
+        if ( line.contains( ":", TRUE ) )
         {
-            // Ignore all lines up to next empty
-            do
-            {
-                in.getline( line, 1000 );
-                if ( in.eof() || QString( line ).stripWhiteSpace() == "" )
-                    continue;
-            } while ( !in.eof() && QString( line ).stripWhiteSpace() != "" );
+            //grep key and value from line
+            k[0] = '\0';
+            v[0] = '\0';
+            sscanf( line, "%[^:]: %[^\n]", k, v );
+            key = k;
+            value = v;
+            key = key.stripWhiteSpace();
+            value = value.stripWhiteSpace();
+        } else {
+            key = "";
+            value = "";
         }
 
-        lines.push_back( QString( line ) );
-        out << line << endl;
-
-        // Improve UI responsiveness
-        i++;
-        if ( ( i % 50 ) == 0 )
-            qApp->processEvents();
-    } while ( !in.eof() );
+        if ( key == "Package" && value == package )
+        {
+            //skip lines from the deleted package
+            while ( ( !readStream.atEnd() ) && ( line.stripWhiteSpace() != "" ) )
+            {
+                line = readStream.readLine();
+            }
+        } else {
 
-    // Write lines out
-    vector<QString>::iterator it;
-    for ( it = lines.begin() ; it != lines.end() ; ++it )
-    {
-        out << (const char *)(*it) << endl;
+            //write other lines into the tempfile
+            writeStream << line << "\n";
 
-        // Improve UI responsiveness
-        i++;
-        if ( ( i % 50 ) == 0 )
-            qApp->processEvents();
+            // Improve UI responsiveness
+            i++;
+            if ( ( i % 50 ) == 0 )
+                qApp->processEvents();
+        }
     }
 
-    in.close();
-    out.close();
+    readFile.close();
+    writeFile.close();
 
@@ -282,3 +273,3 @@ void Ipkg :: removeStatusEntry()
     rename( outStatusFile, statusFile );
-}
+ }
 
diff --git a/noncore/settings/aqpkg/utils.cpp b/noncore/settings/aqpkg/utils.cpp
index 00607dd..be02b3a 100644
--- a/noncore/settings/aqpkg/utils.cpp
+++ b/noncore/settings/aqpkg/utils.cpp
@@ -2,3 +2,3 @@
                              This file is part of the OPIE Project
-                             
+
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
@@ -29,5 +29,4 @@
 
-#include <stdio.h>
 #include <sys/vfs.h>
- 
+
 #include "utils.h"
@@ -51,3 +50,3 @@ QString Utils :: getPathfromIpkFilename( const QString &file )
     return path;
-    
+
 }
@@ -60,3 +59,3 @@ QString Utils :: getFilenameFromIpkFilename( const QString &file )
             name = name.mid( p + 1 );
-     
+