1 files changed, 38 insertions, 31 deletions

diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp
index fc5ed12..04f5ab7 100644
--- a/noncore/settings/aqpkg/server.cpp
+++ b/noncore/settings/aqpkg/server.cpp
@@ -61,3 +61,3 @@ void Server :: cleanUp()
 
-void Server :: readStatusFile(  vector<Destination> &destList )
+void Server :: readStatusFile(  QList<Destination> &destList )
 {
@@ -65,9 +65,11 @@ void Server :: readStatusFile(  vector<Destination> &destList )
 
-    vector<Destination>::iterator dit;
+    Destination *dest;
+    QListIterator<Destination> dit( destList );
     bool rootRead = false;
-    for ( dit = destList.begin() ; dit != destList.end() ; ++dit )
+    for ( ; dit.current(); ++dit )
     {
+        dest = dit.current();
         bool installingToRoot = false;
         
-        QString path = dit->getDestinationPath();
+        QString path = dest->getDestinationPath();
         if ( path.right( 1 ) != "/" )
@@ -82,3 +84,3 @@ void Server :: readStatusFile(  vector<Destination> &destList )
         packageFile = path + "usr/lib/ipkg/status";
-        readPackageFile( 0, false, installingToRoot, &( *dit ) );
+        readPackageFile( 0, false, installingToRoot, &( *dest ) );
     }
@@ -117,7 +119,7 @@ void Server :: readLocalIpks( Server *local )
         QString ver = Utils::getPackageVersionFromIpkFilename( file );
-        packageList.push_back( Package( packageName ) );
-        packageList.back().setVersion( ver );
-        packageList.back().setFilename( file );
-        packageList.back().setPackageStoredLocally( true );
-        
+        Package *package = new Package( packageName );
+        package->setVersion( ver );
+        package->setFilename( file );
+        package->setPackageStoredLocally( true );
+        packageList.append( package );
         }
@@ -182,6 +184,6 @@ void Server :: readPackageFile( Server *local, bool clearAll, bool installingToR
             {
-                        packageList.push_back( Package( value ) );
-                        currPackage = &(packageList.back());
+                Package *package = new Package( value );
+                packageList.append( package );
+                currPackage = package;
                 currPackage->setInstalledTo( dest );
-
                 if ( installingToRoot )
@@ -241,5 +243,8 @@ void Server :: buildLocalPackages( Server *local )
 {
-    for ( unsigned int i = 0 ; i < packageList.size() ; ++i )
+    Package *curr;
+    QListIterator<Package> it( packageList );
+    for ( ; it.current(); ++it )
     {
-                QString name = packageList[i].getPackageName();
+        curr = it.current();
+        QString name = curr->getPackageName();
 
@@ -247,3 +252,3 @@ void Server :: buildLocalPackages( Server *local )
         if ( name.find( ".ipk" ) != -1 )
-            name = Utils::getPackageNameFromIpkFilename( packageList[i].getFilename() );
+            name = Utils::getPackageNameFromIpkFilename( curr->getFilename() );
 
@@ -252,3 +257,3 @@ void Server :: buildLocalPackages( Server *local )
             Package *p = local->getPackage( name );
-            packageList[i].setLocalPackage( p );
+            curr->setLocalPackage( p );
             if ( p )
@@ -256,7 +261,7 @@ void Server :: buildLocalPackages( Server *local )
                 // Set some default stuff like size and things
-                if ( p->getInstalledVersion() == packageList[i].getVersion() )
+                if ( p->getInstalledVersion() == curr->getVersion() )
                 {
-                    p->setPackageSize( packageList[i].getPackageSize() );
-                    p->setSection( packageList[i].getSection() );
-                    p->setDescription( packageList[i].getDescription() );
+                    p->setPackageSize( curr->getPackageSize() );
+                    p->setSection( curr->getSection() );
+                    p->setDescription( curr->getDescription() );
                 }
@@ -266,3 +271,3 @@ void Server :: buildLocalPackages( Server *local )
         else
-            packageList[i].setLocalPackage( 0 );
+            curr->setLocalPackage( 0 );
     }
@@ -280,6 +285,7 @@ Package *Server :: getPackage( const char *name )
 
-    for ( unsigned int i = 0 ; i < packageList.size() && ret == 0; ++i )
+    QListIterator<Package> it( packageList );
+    for ( ; it.current(); ++it )
     {
-                if ( packageList[i].getPackageName() == name )
-                        ret = &packageList[i];
+                if ( it.current()->getPackageName() == name )
+                        ret = it.current();
         }
@@ -291,8 +297,9 @@ QString Server :: toString()
 {
-    QString ret = "Server\n   name - " + serverName +
-                       "\n   url - " + serverUrl +
-                       "\n";
+    QString ret = QString( "Server\n   name - %1\n   url - %2\n" ).arg( serverName ).arg( serverUrl );
 
-    for ( unsigned int i = 0 ; i < packageList.size() ; ++i )
-        ret += "\n   " + packageList[i].toString();
+    QListIterator<Package> it( packageList );
+    for ( ; it.current(); ++it )
+    {
+        ret.append( QString( "\n   %1" ).arg( it.current()->toString() ) );
+    }
 
@@ -302,3 +309,3 @@ QString Server :: toString()
 
-vector<Package> &Server::getPackageList()
+QList<Package> &Server::getPackageList()
 {