summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/categoryfilterimpl.cpp4
-rw-r--r--noncore/settings/aqpkg/datamgr.h3
-rw-r--r--noncore/settings/aqpkg/installdlgimpl.h2
-rw-r--r--noncore/settings/aqpkg/mem.cpp12
-rw-r--r--noncore/settings/aqpkg/server.h2
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
@@ -38,10 +38,6 @@
38#include <qlistbox.h> 38#include <qlistbox.h>
39#include <qstring.h> 39#include <qstring.h>
40 40
41/* STD */
42#include <iostream>
43using namespace std;
44
45 41
46CategoryFilterImpl :: CategoryFilterImpl(const QString &categories, const QString &selectedCategories, QWidget *parent, const char *name ) 42CategoryFilterImpl :: CategoryFilterImpl(const QString &categories, const QString &selectedCategories, QWidget *parent, const char *name )
47 : QDialog( parent, name, true ) 43 : 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
@@ -30,9 +30,6 @@
30#ifndef DATAMGR_H 30#ifndef DATAMGR_H
31#define DATAMGR_H 31#define DATAMGR_H
32 32
33#include <map>
34using namespace std;
35
36#include <qlist.h> 33#include <qlist.h>
37#include <qobject.h> 34#include <qobject.h>
38#include <qstring.h> 35#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
@@ -30,8 +30,6 @@
30#ifndef INSTALLDLGIMPL_H 30#ifndef INSTALLDLGIMPL_H
31#define INSTALLDLGIMPL_H 31#define INSTALLDLGIMPL_H
32 32
33using namespace std;
34
35#include <qlist.h> 33#include <qlist.h>
36#include <qstring.h> 34#include <qstring.h>
37#include <qwidget.h> 35#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
@@ -28,8 +28,10 @@
28*/ 28*/
29 29
30#include <stdio.h> 30#include <stdio.h>
31#include <list> 31#include <stdlib.h>
32using namespace std; 32#include <string.h>
33
34#include <qvaluelist.h>
33 35
34#define __MEMFILE_C 36#define __MEMFILE_C
35#include "global.h" 37#include "global.h"
@@ -59,7 +61,7 @@ typedef struct {
59 longline; 61 longline;
60} ALLOC_INFO; 62} ALLOC_INFO;
61 63
62typedef list<ALLOC_INFO*> AllocList; 64typedef QValueList<ALLOC_INFO*> AllocList;
63 65
64AllocList allocList; 66AllocList allocList;
65 67
@@ -80,7 +82,7 @@ void AddTrack(long addr, long asize, const char *fname, long lnum)
80 82
81void RemoveTrack(long addr) 83void RemoveTrack(long addr)
82{ 84{
83 AllocList::iterator i; 85 AllocList::Iterator i;
84 86
85 bool found = false; 87 bool found = false;
86 for(i = allocList.begin(); i != allocList.end(); i++) 88 for(i = allocList.begin(); i != allocList.end(); i++)
@@ -96,7 +98,7 @@ void RemoveTrack(long addr)
96 98
97void DumpUnfreed() 99void DumpUnfreed()
98{ 100{
99 AllocList::iterator i; 101 AllocList::Iterator i;
100 long totalSize = 0; 102 long totalSize = 0;
101 char buf[1024]; 103 char buf[1024];
102 // Debug output, okay to leave untranslated 104 // Debug output, okay to leave untranslated
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
@@ -33,8 +33,6 @@
33#include <qlist.h> 33#include <qlist.h>
34#include <qstring.h> 34#include <qstring.h>
35 35
36using namespace std;
37
38#include "package.h" 36#include "package.h"
39#include "destination.h" 37#include "destination.h"
40 38