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
@@ -37,12 +37,8 @@
 #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 )
 {
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
@@ -29,11 +29,8 @@
 
 #ifndef DATAMGR_H
 #define DATAMGR_H
 
-#include <map>
-using namespace std;
-
 #include <qlist.h>
 #include <qobject.h>
 #include <qstring.h>
 
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
@@ -29,10 +29,8 @@
 
 #ifndef INSTALLDLGIMPL_H
 #define INSTALLDLGIMPL_H
 
-using namespace std;
-
 #include <qlist.h>
 #include <qstring.h>
 #include <qwidget.h>
 
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
@@ -27,10 +27,12 @@
 
 */
 
 #include <stdio.h>
-#include <list>
-using namespace std;
+#include <stdlib.h>
+#include <string.h>
+
+#include <qvaluelist.h>
 
 #define __MEMFILE_C
 #include "global.h"
 
@@ -58,9 +60,9 @@ typedef struct {
       char	file[64];
       long	line;
 } ALLOC_INFO;
 
-typedef list<ALLOC_INFO*> AllocList;
+typedef QValueList<ALLOC_INFO*> AllocList;
 
 AllocList allocList;
 
 
@@ -79,9 +81,9 @@ void AddTrack(long addr,  long asize,  const char *fname, long lnum)
 };
 
 void RemoveTrack(long addr)
 {
-      AllocList::iterator i;
+      AllocList::Iterator i;
 
       bool found = false;
       for(i = allocList.begin(); i != allocList.end(); i++)
       {
@@ -95,9 +97,9 @@ void RemoveTrack(long addr)
 }
 
 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++) {
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
@@ -32,10 +32,8 @@
 
 #include <qlist.h>
 #include <qstring.h>
 
-using namespace std;
-
 #include "package.h"
 #include "destination.h"
 
 class Server