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
@@ -35,16 +35,12 @@
35/* QT */ 35/* QT */
36#include <qgroupbox.h> 36#include <qgroupbox.h>
37#include <qlayout.h> 37#include <qlayout.h>
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 )
48{ 44{
49 setCaption( tr( "Category Filter" ) ); 45 setCaption( tr( "Category Filter" ) );
50 46
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
@@ -27,15 +27,12 @@
27 27
28*/ 28*/
29 29
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>
39 36
40#include "server.h" 37#include "server.h"
41#include "destination.h" 38#include "destination.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
@@ -27,14 +27,12 @@
27 27
28*/ 28*/
29 29
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>
38 36
39class QComboBox; 37class QComboBox;
40class QLabel; 38class QLabel;
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
@@ -25,14 +25,16 @@
25 59 Temple Place - Suite 330, 25 59 Temple Place - Suite 330,
26 Boston, MA 02111-1307, USA. 26 Boston, MA 02111-1307, USA.
27 27
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"
36 38
37#ifdef _DEBUG 39#ifdef _DEBUG
38 40
@@ -56,13 +58,13 @@ typedef struct {
56 longaddress; 58 longaddress;
57 longsize; 59 longsize;
58 charfile[64]; 60 charfile[64];
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
66 68
67 69
68void AddTrack(long addr, long asize, const char *fname, long lnum) 70void AddTrack(long addr, long asize, const char *fname, long lnum)
@@ -77,13 +79,13 @@ void AddTrack(long addr, long asize, const char *fname, long lnum)
77 info->size = asize; 79 info->size = asize;
78 allocList.insert(allocList.begin(), info); 80 allocList.insert(allocList.begin(), info);
79}; 81};
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++)
87 { 89 {
88 if((*i)->address == addr) 90 if((*i)->address == addr)
89 { 91 {
@@ -93,13 +95,13 @@ void RemoveTrack(long addr)
93 } 95 }
94 } 96 }
95} 97}
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
103 for(i = allocList.begin(); i != allocList.end(); i++) { 105 for(i = allocList.begin(); i != allocList.end(); i++) {
104 sprintf(buf, "%-15s: LINE %ld, ADDRESS %ld %ld unfreed", 106 sprintf(buf, "%-15s: LINE %ld, ADDRESS %ld %ld unfreed",
105 (*i)->file, (*i)->line, (*i)->address, (*i)->size); 107 (*i)->file, (*i)->line, (*i)->address, (*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
@@ -30,14 +30,12 @@
30#ifndef SERVER_H 30#ifndef SERVER_H
31#define SERVER_H 31#define SERVER_H
32 32
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
41class Server 39class Server
42{ 40{
43public: 41public: