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
@@ -33,20 +33,16 @@
 #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 );
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
@@ -25,19 +25,16 @@
                              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"
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
@@ -25,18 +25,16 @@
                              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;
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
@@ -23,18 +23,20 @@
   -_. . .   )=.  =           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 )
 {
@@ -54,17 +56,17 @@ void operator delete(void *p)
 
 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;
@@ -75,33 +77,33 @@ void AddTrack(long addr,  long asize,  const char *fname, long lnum)
       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;
       }
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
@@ -28,18 +28,16 @@
 */
 
 #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 );