summaryrefslogtreecommitdiff
path: root/noncore
Side-by-side diff
Diffstat (limited to 'noncore') (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
@@ -29,28 +29,24 @@
#include "categoryfilterimpl.h"
/* OPIE */
#include <qpe/qpeapplication.h>
/* QT */
#include <qgroupbox.h>
#include <qlayout.h>
#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 )
{
setCaption( tr( "Category Filter" ) );
QVBoxLayout *layout = new QVBoxLayout( this );
layout->setMargin( 2 );
layout->setSpacing( 4 );
QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Select one or more groups" ), this );
grpbox->layout()->setSpacing( 2 );
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
@@ -21,27 +21,24 @@
 :     =  ...= . :.=- You should have received a copy of the GNU
 -.   .:....=;==+<; General Public License along with this file;
  -_. . .   )=.  = see the file COPYING. If not, write to the
    --        :-=` Free Software Foundation, Inc.,
59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef DATAMGR_H
#define DATAMGR_H
-#include <map>
-using namespace std;
-
#include <qlist.h>
#include <qobject.h>
#include <qstring.h>
#include "server.h"
#include "destination.h"
//#define LOCAL_SERVER "Installed Pkgs"
//#define LOCAL_IPKGS "local IPKG"
extern QString LOCAL_SERVER;
extern QString LOCAL_IPKGS;
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
@@ -21,26 +21,24 @@
 :     =  ...= . :.=- You should have received a copy of the GNU
 -.   .:....=;==+<; General Public License along with this file;
  -_. . .   )=.  = see the file COPYING. If not, write to the
    --        :-=` Free Software Foundation, Inc.,
59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef INSTALLDLGIMPL_H
#define INSTALLDLGIMPL_H
-using namespace std;
-
#include <qlist.h>
#include <qstring.h>
#include <qwidget.h>
class QComboBox;
class QLabel;
class QMultiLineEdit;
class QPushButton;
class DataManager;
class Destination;
class Ipkg;
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
@@ -19,26 +19,28 @@
..}^=.=       =       ; Public License for more details.
++=   -.     .`     .:
 :     =  ...= . :.=- You should have received a copy of the GNU
 -.   .:....=;==+<; General Public License along with this file;
  -_. . .   )=.  = see the file COPYING. If not, write to the
    --        :-=` Free Software Foundation, Inc.,
59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include <stdio.h>
-#include <list>
-using namespace std;
+#include <stdlib.h>
+#include <string.h>
+
+#include <qvaluelist.h>
#define __MEMFILE_C
#include "global.h"
#ifdef _DEBUG
void __cdecl *operator new( unsigned int size, const char *file, int line )
{
void *ptr = (void *)malloc(size);
AddTrack((long)ptr, size, file, line);
return(ptr);
}
@@ -50,61 +52,61 @@ void operator delete(void *p)
}
#endif
typedef struct {
long address;
long size;
char file[64];
long line;
} ALLOC_INFO;
-typedef list<ALLOC_INFO*> AllocList;
+typedef QValueList<ALLOC_INFO*> AllocList;
AllocList allocList;
void AddTrack(long addr, long asize, const char *fname, long lnum)
{
ALLOC_INFO *info;
info = (ALLOC_INFO *)malloc(sizeof( ALLOC_INFO ));
info->address = addr;
strncpy(info->file, fname, 63);
info->line = lnum;
info->size = asize;
allocList.insert(allocList.begin(), info);
};
void RemoveTrack(long addr)
{
- AllocList::iterator i;
+ AllocList::Iterator i;
bool found = false;
for(i = allocList.begin(); i != allocList.end(); i++)
{
if((*i)->address == addr)
{
allocList.remove((*i));
found = true;
break;
}
}
}
void DumpUnfreed()
{
- AllocList::iterator i;
+ AllocList::Iterator i;
long totalSize = 0;
char buf[1024];
// Debug output, okay to leave untranslated
for(i = allocList.begin(); i != allocList.end(); i++) {
sprintf(buf, "%-15s: LINE %ld, ADDRESS %ld %ld unfreed",
(*i)->file, (*i)->line, (*i)->address, (*i)->size);
totalSize += (*i)->size;
}
sprintf(buf, "-----------------------------------------------------------\n");
sprintf(buf, "Total Unfreed: %ld bytes\n", totalSize);
};
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
@@ -24,26 +24,24 @@
    --        :-=` Free Software Foundation, Inc.,
59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef SERVER_H
#define SERVER_H
#include <qlist.h>
#include <qstring.h>
-using namespace std;
-
#include "package.h"
#include "destination.h"
class Server
{
public:
Server() {}
Server( const char *name, const char *url );
Server( const char *name, const char *url, const char *file );
~Server();
void cleanUp();