author | zecke <zecke> | 2004-10-12 00:38:29 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-10-12 00:38:29 (UTC) |
commit | c4471939b0b1a187646a85c04d3290c23db78c9d (patch) (unidiff) | |
tree | 569d5408cde7f96a89ab7be339ec7256bac604ef /noncore/settings | |
parent | 7541d90e82392e5e727d8bdc818c5ec2f7b2bd3e (diff) | |
download | opie-c4471939b0b1a187646a85c04d3290c23db78c9d.zip opie-c4471939b0b1a187646a85c04d3290c23db78c9d.tar.gz opie-c4471939b0b1a187646a85c04d3290c23db78c9d.tar.bz2 |
Try harder to remove stdc++ need
-Remove using namespace std;
-Remove include <iostream>
-Replace std::list with QValueList
-rw-r--r-- | noncore/settings/aqpkg/categoryfilterimpl.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/aqpkg/datamgr.h | 3 | ||||
-rw-r--r-- | noncore/settings/aqpkg/installdlgimpl.h | 2 | ||||
-rw-r--r-- | noncore/settings/aqpkg/mem.cpp | 12 | ||||
-rw-r--r-- | noncore/settings/aqpkg/server.h | 2 |
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 | |||
@@ -39,8 +39,4 @@ | |||
39 | #include <qstring.h> | 39 | #include <qstring.h> |
40 | 40 | ||
41 | /* STD */ | ||
42 | #include <iostream> | ||
43 | using namespace std; | ||
44 | |||
45 | 41 | ||
46 | CategoryFilterImpl :: CategoryFilterImpl(const QString &categories, const QString &selectedCategories, QWidget *parent, const char *name ) | 42 | CategoryFilterImpl :: CategoryFilterImpl(const QString &categories, const QString &selectedCategories, QWidget *parent, const char *name ) |
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 | |||
@@ -31,7 +31,4 @@ | |||
31 | #define DATAMGR_H | 31 | #define DATAMGR_H |
32 | 32 | ||
33 | #include <map> | ||
34 | using namespace std; | ||
35 | |||
36 | #include <qlist.h> | 33 | #include <qlist.h> |
37 | #include <qobject.h> | 34 | #include <qobject.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 | |||
@@ -31,6 +31,4 @@ | |||
31 | #define INSTALLDLGIMPL_H | 31 | #define INSTALLDLGIMPL_H |
32 | 32 | ||
33 | using namespace std; | ||
34 | |||
35 | #include <qlist.h> | 33 | #include <qlist.h> |
36 | #include <qstring.h> | 34 | #include <qstring.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 | |||
@@ -29,6 +29,8 @@ | |||
29 | 29 | ||
30 | #include <stdio.h> | 30 | #include <stdio.h> |
31 | #include <list> | 31 | #include <stdlib.h> |
32 | using namespace std; | 32 | #include <string.h> |
33 | |||
34 | #include <qvaluelist.h> | ||
33 | 35 | ||
34 | #define __MEMFILE_C | 36 | #define __MEMFILE_C |
@@ -60,5 +62,5 @@ typedef struct { | |||
60 | } ALLOC_INFO; | 62 | } ALLOC_INFO; |
61 | 63 | ||
62 | typedef list<ALLOC_INFO*> AllocList; | 64 | typedef QValueList<ALLOC_INFO*> AllocList; |
63 | 65 | ||
64 | AllocList allocList; | 66 | AllocList allocList; |
@@ -81,5 +83,5 @@ void AddTrack(long addr, long asize, const char *fname, long lnum) | |||
81 | void RemoveTrack(long addr) | 83 | void RemoveTrack(long addr) |
82 | { | 84 | { |
83 | AllocList::iterator i; | 85 | AllocList::Iterator i; |
84 | 86 | ||
85 | bool found = false; | 87 | bool found = false; |
@@ -97,5 +99,5 @@ void RemoveTrack(long addr) | |||
97 | void DumpUnfreed() | 99 | void 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]; |
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 | |||
@@ -34,6 +34,4 @@ | |||
34 | #include <qstring.h> | 34 | #include <qstring.h> |
35 | 35 | ||
36 | using namespace std; | ||
37 | |||
38 | #include "package.h" | 36 | #include "package.h" |
39 | #include "destination.h" | 37 | #include "destination.h" |