Try harder to remove stdc++ need

-Remove using namespace std;
-Remove include <iostream>
-Replace std::list with QValueList

5 files changed, 7 insertions, 16 deletions

diff --git a/noncore/settings/aqpkg/categoryfilterimpl.cpp b/noncore/settings/aqpkg/categoryfilterimpl.cpp
index 217d2c9..bb0af77 100644
--- a/noncore/settings/aqpkg/categoryfilterimpl.cpp
+++ b/noncore/settings/aqpkg/categoryfilterimpl.cpp
@@ -1,108 +1,104 @@
 /*
                              This file is part of the OPIE Project
                              
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
              .=l.                                Dan Williams <drw@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "categoryfilterimpl.h"
 
 /* OPIE */
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qgroupbox.h>
 #include <qlayout.h>
 #include <qlistbox.h>
 #include <qstring.h>
 
-/* STD */
-#include <iostream>
-using namespace std;
-
 
 CategoryFilterImpl :: CategoryFilterImpl(const QString &categories, const QString &selectedCategories, QWidget *parent, const char *name )
         : QDialog( parent, name, true )
 {
     setCaption( tr( "Category Filter" ) );
 
     QVBoxLayout *layout = new QVBoxLayout( this );
     layout->setMargin( 2 );
     layout->setSpacing( 4 );
 
     QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Select one or more groups" ), this );
     grpbox->layout()->setSpacing( 2 );
     grpbox->layout()->setMargin( 4 );
     layout->addWidget( grpbox );
 
     QVBoxLayout *grplayout = new QVBoxLayout( grpbox->layout() );
 
     lstCategories = new QListBox( grpbox );
     lstCategories->setSelectionMode( QListBox::Multi );
     grplayout->addWidget( lstCategories );
 
     // Split up categories and add them to the listbox
     int start = 1;
 
     QString item;
     int end;
     QString finditem;
     do
     {
         end = categories.find( "#", start );
         item = categories.mid( start, end - start );
         if ( item != "" )
         {
             lstCategories->insertItem( item );
             finditem = QString( "#%1#" ).arg( item );
             if ( selectedCategories.find( finditem ) != -1 )
                 lstCategories->setSelected( lstCategories->count()-1, true );
         }
 
         start = end + 1;
     }
     while ( start < (int)categories.length() );
 
     lstCategories->sort( true );
 
     QPEApplication::showDialog( this );
 }
 
 CategoryFilterImpl :: ~CategoryFilterImpl()
 {}
 
 QString CategoryFilterImpl :: getSelectedFilter()
 {
     // Grab cetegories from listbox
     QString ret = "#";
 
     for ( int i = 0 ; i < (int)lstCategories->count() ; ++i )
     {
         if ( lstCategories->isSelected( i ) )
         {
             ret.append( lstCategories->text( i ) );
             ret.append( "#" );
         }
     }
diff --git a/noncore/settings/aqpkg/datamgr.h b/noncore/settings/aqpkg/datamgr.h
index 9f8920d..5a79267 100644
--- a/noncore/settings/aqpkg/datamgr.h
+++ b/noncore/settings/aqpkg/datamgr.h
@@ -1,99 +1,96 @@
 /*
                              This file is part of the OPIE Project
 
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
              .=l.                                Dan Williams <drw@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef DATAMGR_H
 #define DATAMGR_H
 
-#include <map>
-using namespace std;
-
 #include <qlist.h>
 #include <qobject.h>
 #include <qstring.h>
 
 #include "server.h"
 #include "destination.h"
 
 //#define LOCAL_SERVER			"Installed Pkgs"
 //#define LOCAL_IPKGS				"local IPKG"
 extern QString LOCAL_SERVER;
 extern QString LOCAL_IPKGS;
 
 /**
   *@author Andy Qua
   */
 
 
 class DataManager : public QObject
 {
     Q_OBJECT
 public:
     DataManager();
     ~DataManager();
 
     void setActiveServer( const QString &act )      { activeServer = act; }
     QString &getActiveServer( )      				{ return activeServer; }
 
     Server *getLocalServer()    					{ return ( getServer( LOCAL_SERVER ) ); }
     QList<Server> &getServerList()   				{ return serverList; }
     Server *getServer( const char *name );
 
     QList<Destination> &getDestinationList()  		{ return destList; }
     Destination *getDestination( const char *name );
 
     void loadServers();
     void reloadServerData( );
 
     void writeOutIpkgConf();
 
     static QString getAvailableCategories() { return availableCategories; }
     static void setAvailableCategories( QString section );
 
     QString getHttpProxy()                          { return httpProxy; }
     QString getFtpProxy()                           { return ftpProxy; }
     QString getProxyUsername()                      { return proxyUsername; }
     QString getProxyPassword()                      { return proxyPassword; }
 
     bool getHttpProxyEnabled()                      { return httpProxyEnabled; }
     bool getFtpProxyEnabled()                       { return ftpProxyEnabled; }
 
     void setHttpProxy( QString proxy )              { httpProxy = proxy; }
     void setFtpProxy( QString proxy )               { ftpProxy = proxy; }
     void setProxyUsername( QString name )           { proxyUsername = name; }
     void setProxyPassword( QString pword )          { proxyPassword = pword; }
 
     void setHttpProxyEnabled( bool val )            { httpProxyEnabled = val; }
     void setFtpProxyEnabled( bool val )            { ftpProxyEnabled = val; }
 private:
     static QString availableCategories;
     QString activeServer;
     QString httpProxy;
     QString ftpProxy;
     QString proxyUsername;
     QString proxyPassword;
diff --git a/noncore/settings/aqpkg/installdlgimpl.h b/noncore/settings/aqpkg/installdlgimpl.h
index 894465a..b38c345 100644
--- a/noncore/settings/aqpkg/installdlgimpl.h
+++ b/noncore/settings/aqpkg/installdlgimpl.h
@@ -1,98 +1,96 @@
 /*
                              This file is part of the OPIE Project
                              
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
              .=l.                                Dan Williams <drw@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef INSTALLDLGIMPL_H
 #define INSTALLDLGIMPL_H
 
-using namespace std;
-
 #include <qlist.h>
 #include <qstring.h>
 #include <qwidget.h>
 
 class QComboBox;
 class QLabel;
 class QMultiLineEdit;
 class QPushButton;
 
 class DataManager;
 class Destination;
 class Ipkg;
 
 class InstallData
 {
 public:
     QString option;            // I - install, D - delete, R- reinstall U - upgrade
     QString packageName;
     Destination *destination;
     bool recreateLinks;
 };
 
 class InstallDlgImpl : public QWidget
 {
     Q_OBJECT
 public:
     InstallDlgImpl( const QList<InstallData> &packageList, DataManager *dataManager, const char *title = 0 );
     InstallDlgImpl( Ipkg *ipkg, QString initialText, const char *title = 0 );
     ~InstallDlgImpl();
 
 	bool upgradeServer( QString &server );
 
 protected:
 
 private:
     DataManager *dataMgr;
     QList<InstallData> packages;
 	bool firstPackage;
     int flags;
     int infoLevel;
     Ipkg *pIpkg;
     bool upgradePackages;
     
     QComboBox      *destination;
     QPushButton    *btnInstall;
     QPushButton    *btnOptions;
     QMultiLineEdit *output;
     QLabel         *txtAvailableSpace;
 
     void init( bool );
     
     bool runIpkg( QString &option, const QString& package, const QString& dest, int flags );
 
 signals:
     void reloadData( InstallDlgImpl * );
         
 public slots:
     void optionsSelected();
     void installSelected();
     void displayText(const QString &text );
     void displayAvailableSpace( const QString &text);
 	void ipkgFinished();
 };
 
diff --git a/noncore/settings/aqpkg/mem.cpp b/noncore/settings/aqpkg/mem.cpp
index 4c6117b..d8de09f 100644
--- a/noncore/settings/aqpkg/mem.cpp
+++ b/noncore/settings/aqpkg/mem.cpp
@@ -1,110 +1,112 @@
 /*
                              This file is part of the OPIE Project
                              
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
              .=l.                                Dan Williams <drw@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <stdio.h>
-#include <list>
-using namespace std;
+#include <stdlib.h>
+#include <string.h>
+
+#include <qvaluelist.h>
 
 #define __MEMFILE_C
 #include "global.h"
 
 #ifdef _DEBUG
 
 void __cdecl *operator new( unsigned int size, const char *file, int line )
 {
       void *ptr = (void *)malloc(size);
       AddTrack((long)ptr, size, file, line);
       return(ptr);
 }
 
 void operator delete(void *p)
 {
       RemoveTrack((long)p);
       free(p);
 }
 
 #endif
 
 
 typedef struct {
       long	address;
       long	size;
       char	file[64];
       long	line;
 } ALLOC_INFO;
 
-typedef list<ALLOC_INFO*> AllocList;
+typedef QValueList<ALLOC_INFO*> AllocList;
 
 AllocList allocList;
 
 
 
 void AddTrack(long addr,  long asize,  const char *fname, long lnum)
 {
       ALLOC_INFO *info;
 
 
       info = (ALLOC_INFO *)malloc(sizeof( ALLOC_INFO ));
       info->address = addr;
       strncpy(info->file, fname, 63);
       info->line = lnum;
       info->size = asize;
       allocList.insert(allocList.begin(), info);
 };
 
 void RemoveTrack(long addr)
 {
-      AllocList::iterator i;
+      AllocList::Iterator i;
 
       bool found = false;
       for(i = allocList.begin(); i != allocList.end(); i++)
       {
 	      if((*i)->address == addr)
 	      {
 		      allocList.remove((*i));
 		      found = true;
 		      break;
 	      }
       }
 }
 
 void DumpUnfreed()
 {
-      AllocList::iterator i;
+      AllocList::Iterator i;
       long totalSize = 0;
       char buf[1024];
       // Debug output, okay to leave untranslated
       for(i = allocList.begin(); i != allocList.end(); i++) {
 	      sprintf(buf, "%-15s:  LINE %ld,  ADDRESS %ld %ld unfreed",
 		      (*i)->file, (*i)->line, (*i)->address, (*i)->size);
 	      totalSize += (*i)->size;
       }
       sprintf(buf, "-----------------------------------------------------------\n");
       sprintf(buf, "Total Unfreed: %ld bytes\n", totalSize);
 };
diff --git a/noncore/settings/aqpkg/server.h b/noncore/settings/aqpkg/server.h
index f524ed6..b62f1f2 100644
--- a/noncore/settings/aqpkg/server.h
+++ b/noncore/settings/aqpkg/server.h
@@ -1,79 +1,77 @@
 /*
                              This file is part of the OPIE Project
                              
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
              .=l.                                Dan Williams <drw@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef SERVER_H
 #define SERVER_H
 
 #include <qlist.h>
 #include <qstring.h>
 
-using namespace std;
-
 #include "package.h"
 #include "destination.h"
 
 class Server
 {
 public:
     Server() {}
     Server( const char *name, const char *url );
     Server( const char *name, const char *url, const char *file );
     ~Server();
 
     void cleanUp();
 
     void readStatusFile( QList<Destination> &v );
     void readLocalIpks( Server *local );
     void readPackageFile( Server *local = 0, bool clearAll = true, bool installedToRoot= false, Destination *dest = 0 );
     void buildLocalPackages( Server *local );
     Package *getPackage( const char *name );
     Package *getPackage( QString &name );
     QString toString();
     QList<Package> &getPackageList();
     bool isServerActive() { return active; }
     
     void setServerName( const QString &name ) { serverName = name; }
     void setServerUrl( const QString &url )   { serverUrl = url; }
     void setActive( bool val )             { active = val; }
     QString &getServerName() { return serverName; }
     QString &getServerUrl()  { return serverUrl; }
 
 protected:
 
 private:
   QString serverName;
   QString serverUrl;
   QString packageFile;
   bool active;
 
 
   QList<Package> packageList;
 };
 
 #endif