Re-applied patch for gcc3.2

10 files changed, 37 insertions, 41 deletions

diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp
index e7fb75a..96c28c0 100644
--- a/noncore/settings/aqpkg/datamgr.cpp
+++ b/noncore/settings/aqpkg/datamgr.cpp
@@ -39,34 +39,32 @@ DataManager::~DataManager()
 {
 }
 
-Server *DataManager :: getServer( const char *name )
+vector<Server>::iterator DataManager :: getServer( const char *name )
 {
-        Server *s = 0;
-        vector<Server>::iterator it = serverList.begin();
-    while ( it != serverList.end() && s == 0 )
+    vector<Server>::iterator it = serverList.begin();
+    while ( it != serverList.end() )
     {
                 if ( it->getServerName() == name )
-                        s = &(*it);
+                        return it;
 
                 ++it;
         }
 
-        return s;
+        return serverList.end();
 }
 
-Destination *DataManager :: getDestination( const char *name )
+vector<Destination>::iterator DataManager :: getDestination( const char *name )
 {
-        Destination *d = 0;
         vector<Destination>::iterator it = destList.begin();
-    while ( it != destList.end() && d == 0 )
+    while ( it != destList.end() )
     {
                 if ( it->getDestinationName() == name )
-                        d = &(*it);
+                        return it;
 
                 ++it;
         }
 
-        return d;
+        return destList.end();
 }
 
 void DataManager :: loadServers()
@@ -150,11 +148,6 @@ void DataManager :: loadServers()
     }
     fclose( fp );
 
-    cout << "httpProxy = " << httpProxy << endl;
-    cout << "ftpProxy = " << ftpProxy << endl;
-    cout << "proxyUsername = " << proxyUsername << endl;
-    cout << "proxyPassword = " << proxyPassword << endl;
-
     reloadServerData( );
 }
 
@@ -171,9 +164,9 @@ void DataManager :: reloadServerData( )
             if ( it->getServerName() == LOCAL_SERVER )
                 it->readStatusFile( destList );
             else if ( it->getServerName() == LOCAL_IPKGS )
-                it->readLocalIpks( getServer( LOCAL_SERVER ) );
+            it->readLocalIpks( &( *getServer( LOCAL_SERVER ) ) );
             else
-                it->readPackageFile( getServer( LOCAL_SERVER ) );
+            it->readPackageFile( &( *getServer( LOCAL_SERVER ) ) );     
         }
 }
 
diff --git a/noncore/settings/aqpkg/datamgr.h b/noncore/settings/aqpkg/datamgr.h
index 14b0b2f..41833df 100644
--- a/noncore/settings/aqpkg/datamgr.h
+++ b/noncore/settings/aqpkg/datamgr.h
@@ -38,17 +38,17 @@ class DataManager
 {
 public:
     DataManager();
-        ~DataManager();
+    ~DataManager();
 
     void setActiveServer( const QString &act )      { activeServer = act; }
             QString &getActiveServer( )                         { return activeServer; }
 
-            Server *getLocalServer()                                    { return getServer( LOCAL_SERVER ); }
+            Server *getLocalServer()                                    { return &( *getServer( LOCAL_SERVER ) ); }
             vector<Server> &getServerList()                     { return serverList; }
-    Server *getServer( const char *name );
+    vector<Server>::iterator getServer( const char *name );
 
             vector<Destination> &getDestinationList()           { return destList; }
-    Destination *getDestination( const char *name );
+    vector<Destination>::iterator getDestination( const char *name );
 
     void loadServers();
     void reloadServerData( );
diff --git a/noncore/settings/aqpkg/global.h b/noncore/settings/aqpkg/global.h
index fcec643..ddfb3ac 100644
--- a/noncore/settings/aqpkg/global.h
+++ b/noncore/settings/aqpkg/global.h
@@ -18,7 +18,7 @@
 #ifndef __GLOBAL_H
 #define __GLOBAL_H
 
-#define VERSION_TEXT "AQPkg Version 1.3"
+#define VERSION_TEXT "AQPkg Version 1.4"
 
 // Uncomment the below line to run on a Linux box rather than a Zaurus
 // box this allows you to change where root is, and where to load config files from
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index b297437..db9a259 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -165,7 +165,7 @@ void InstallDlgImpl :: installSelected()
     else
     {
         output->setText( "" );
-        Destination *d = dataMgr->getDestination( destination->currentText() );
+        vector<Destination>::iterator d = dataMgr->getDestination( destination->currentText() );
         QString dest = d->getDestinationName();
         QString destDir = d->getDestinationPath();
         int instFlags = flags;
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index 452eca3..8de3c48 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include <fstream>
+#include <iostream>
 using namespace std;
 
 #include <stdio.h>
diff --git a/noncore/settings/aqpkg/letterpushbutton.cpp b/noncore/settings/aqpkg/letterpushbutton.cpp
index afe25d8..ca96c6c 100644
--- a/noncore/settings/aqpkg/letterpushbutton.cpp
+++ b/noncore/settings/aqpkg/letterpushbutton.cpp
@@ -17,7 +17,7 @@
 
 #include "letterpushbutton.h"
 
-LetterPushButton :: LetterPushButton( const QString &text, QWidget *parent, const char *name=0 )
+LetterPushButton :: LetterPushButton( const QString &text, QWidget *parent, const char *name )
    : QPushButton( text, parent, name )
 {
    connect( this, SIGNAL(released()), this, SLOT(released_emmitor()) );
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 0141359..3ddc582 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include <iostream>
+using namespace std;
 
 #include <qmenubar.h>
 #include <qpopupmenu.h>
@@ -51,7 +52,7 @@ MainWindow :: MainWindow( QWidget *p, char *name )
         edit->insertItem( "Find &Next", this, SLOT(repeatSearchForPackage()), Qt::CTRL+Qt::Key_N );
 
     filter = new QPopupMenu( this );
-        mnuShowUninstalledPkgsId = filter->insertItem( "Show &Uninstalled Packages", this, SLOT(filterUninstalledPackages()), Qt::CTRL+Qt::Key_U );
+        mnuShowUninstalledPkgsId = filter->insertItem( "Show &Non-Installed Packages", this, SLOT(filterUninstalledPackages()), Qt::CTRL+Qt::Key_U );
         mnuShowInstalledPkgsId = filter->insertItem( "Show In&stalled Packages", this, SLOT(filterInstalledPackages()), Qt::CTRL+Qt::Key_S );
         mnuShowUpgradedPkgsId = filter->insertItem( "Show U&pdated Packages", this, SLOT(filterUpgradedPackages()), Qt::CTRL+Qt::Key_P );
     filter->insertSeparator();
@@ -206,4 +207,4 @@ void MainWindow :: filterCategory()
         if ( networkPkgWindow->filterByCategory( true ) )
             filter->setItemChecked( mnuFilterByCategory, true );
     }
-}
\ No newline at end of file
+}
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index d9e62b6..79a380e 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -217,7 +217,7 @@ void NetworkPackageManager :: serverSelected( int )
         cfg.writeEntry( "selectedServer", currentlySelectedServer );
 #endif
 
-    Server *s = dataMgr->getServer( serverName );
+    vector<Server>::iterator s = dataMgr->getServer( serverName );
 
     vector<Package> &list = s->getPackageList();
     vector<Package>::iterator it;
@@ -612,7 +612,7 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item )
         name.truncate( pos - 1 );
 
     // Get package
-    Server *s = dataMgr->getServer( serversList->currentText() );
+    vector<Server>::iterator s = dataMgr->getServer( serversList->currentText() );
     Package *p = s->getPackage( name );
 
     // If the package has a filename then it is a local file
diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp
index 58407d5..2cb0533 100644
--- a/noncore/settings/aqpkg/server.cpp
+++ b/noncore/settings/aqpkg/server.cpp
@@ -80,7 +80,7 @@ void Server :: readStatusFile(  vector<Destination> &destList )
         }   
         
         packageFile = path + "usr/lib/ipkg/status";
-        readPackageFile( 0, false, installingToRoot, dit );
+        readPackageFile( 0, false, installingToRoot, &( *dit ) );
     }
 
     // Ensure that the root status file is read
diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp
index a18a178..9dd2206 100644
--- a/noncore/settings/aqpkg/settingsimpl.cpp
+++ b/noncore/settings/aqpkg/settingsimpl.cpp
@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include <fstream>
+#include <algorithm>
 using namespace std;
 
 #include <qlistbox.h>
@@ -91,7 +92,7 @@ void SettingsImpl :: setupData()
 void SettingsImpl :: editServer( int sel )
 {
         currentSelectedServer = sel;
-    Server *s = dataMgr->getServer( servers->currentText() );
+    vector<Server>::iterator s = dataMgr->getServer( servers->currentText() );
     serverName = s->getServerName();
     servername->setText( s->getServerName() );
     serverurl->setText( s->getServerUrl() );
@@ -109,10 +110,10 @@ void SettingsImpl :: newServer()
 
 void SettingsImpl :: removeServer()
 {
-        changed = true;
-    Server *s = dataMgr->getServer( servers->currentText() );
-        dataMgr->getServerList().erase( s );
-        servers->removeItem( currentSelectedServer );
+    changed = true;
+    vector<Server>::iterator s = dataMgr->getServer( servers->currentText() );
+    dataMgr->getServerList().erase( s );
+    servers->removeItem( currentSelectedServer );
 }
 
 void SettingsImpl :: changeServerDetails()
@@ -122,7 +123,7 @@ void SettingsImpl :: changeServerDetails()
         QString newName = servername->text();
         if ( !newserver )
         {
-                Server *s = dataMgr->getServer( serverName );
+                vector<Server>::iterator s = dataMgr->getServer( servers->currentText() );
 
                 // Update url
                 s->setServerUrl( serverurl->text() );
@@ -159,7 +160,7 @@ void SettingsImpl :: changeServerDetails()
 void SettingsImpl :: editDestination( int sel )
 {
         currentSelectedDestination = sel;
-    Destination *d = dataMgr->getDestination( destinations->currentText() );
+    vector<Destination>::iterator d = dataMgr->getDestination( destinations->currentText() );
     destinationName = d->getDestinationName();
     destinationname->setText( d->getDestinationName() );
     destinationurl->setText( d->getDestinationPath() );
@@ -177,9 +178,9 @@ void SettingsImpl :: newDestination()
 
 void SettingsImpl :: removeDestination()
 {
-        changed = true;
-    Destination *d = dataMgr->getDestination( destinations->currentText() );
-        dataMgr->getDestinationList().erase( d );
+    changed = true;
+    vector<Destination>::iterator d = dataMgr->getDestination( destinations->currentText() );
+    dataMgr->getDestinationList().erase( d );
         destinations->removeItem( currentSelectedDestination );
 }
 
@@ -195,7 +196,7 @@ void SettingsImpl :: changeDestinationDetails()
     QString newName = destinationname->text();
         if ( !newdestination )
         {
-                Destination *d = dataMgr->getDestination( destinationName );
+                vector<Destination>::iterator d = dataMgr->getDestination( destinations->currentText() );
 
                 // Update url
                 d->setDestinationPath( destinationurl->text() );