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
@@ -40,6 +40,2 @@
 
-/* STD */
-#include <iostream>
-using namespace std;
-
 
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
@@ -32,5 +32,2 @@
 
-#include <map>
-using namespace std;
-
 #include <qlist.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
@@ -32,4 +32,2 @@
 
-using namespace std;
-
 #include <qlist.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
@@ -30,4 +30,6 @@
 #include <stdio.h>
-#include <list>
-using namespace std;
+#include <stdlib.h>
+#include <string.h>
+
+#include <qvaluelist.h>
 
@@ -61,3 +63,3 @@ typedef struct {
 
-typedef list<ALLOC_INFO*> AllocList;
+typedef QValueList<ALLOC_INFO*> AllocList;
 
@@ -82,3 +84,3 @@ void RemoveTrack(long addr)
 {
-      AllocList::iterator i;
+      AllocList::Iterator i;
 
@@ -98,3 +100,3 @@ void DumpUnfreed()
 {
-      AllocList::iterator i;
+      AllocList::Iterator i;
       long totalSize = 0;
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
@@ -35,4 +35,2 @@
 
-using namespace std;
-
 #include "package.h"