summaryrefslogtreecommitdiff
authorzecke <zecke>2004-10-12 00:38:29 (UTC)
committer zecke <zecke>2004-10-12 00:38:29 (UTC)
commitc4471939b0b1a187646a85c04d3290c23db78c9d (patch) (side-by-side diff)
tree569d5408cde7f96a89ab7be339ec7256bac604ef
parent7541d90e82392e5e727d8bdc818c5ec2f7b2bd3e (diff)
downloadopie-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
Diffstat (more/less context) (show 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 @@
#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
@@ -30,9 +30,6 @@
#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
@@ -30,8 +30,6 @@
#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
@@ -28,8 +28,10 @@
*/
#include <stdio.h>
-#include <list>
-using namespace std;
+#include <stdlib.h>
+#include <string.h>
+
+#include <qvaluelist.h>
#define __MEMFILE_C
#include "global.h"
@@ -59,7 +61,7 @@ typedef struct {
long line;
} ALLOC_INFO;
-typedef list<ALLOC_INFO*> AllocList;
+typedef QValueList<ALLOC_INFO*> AllocList;
AllocList allocList;
@@ -80,7 +82,7 @@ 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++)
@@ -96,7 +98,7 @@ void RemoveTrack(long addr)
void DumpUnfreed()
{
- AllocList::iterator i;
+ AllocList::Iterator i;
long totalSize = 0;
char buf[1024];
// 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 @@
#include <qlist.h>
#include <qstring.h>
-using namespace std;
-
#include "package.h"
#include "destination.h"