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
@@ -17,52 +17,48 @@
17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
19..}^=.=       =       ; Public License for more details. 19..}^=.=       =       ; Public License for more details.
20++=   -.     .`     .: 20++=   -.     .`     .:
21 :     =  ...= . :.=- You should have received a copy of the GNU 21 :     =  ...= . :.=- You should have received a copy of the GNU
22 -.   .:....=;==+<; General Public License along with this file; 22 -.   .:....=;==+<; General Public License along with this file;
23  -_. . .   )=.  = see the file COPYING. If not, write to the 23  -_. . .   )=.  = see the file COPYING. If not, write to the
24    --        :-=` Free Software Foundation, Inc., 24    --        :-=` Free Software Foundation, Inc.,
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 "categoryfilterimpl.h" 30#include "categoryfilterimpl.h"
31 31
32/* OPIE */ 32/* OPIE */
33#include <qpe/qpeapplication.h> 33#include <qpe/qpeapplication.h>
34 34
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
51 QVBoxLayout *layout = new QVBoxLayout( this ); 47 QVBoxLayout *layout = new QVBoxLayout( this );
52 layout->setMargin( 2 ); 48 layout->setMargin( 2 );
53 layout->setSpacing( 4 ); 49 layout->setSpacing( 4 );
54 50
55 QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Select one or more groups" ), this ); 51 QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Select one or more groups" ), this );
56 grpbox->layout()->setSpacing( 2 ); 52 grpbox->layout()->setSpacing( 2 );
57 grpbox->layout()->setMargin( 4 ); 53 grpbox->layout()->setMargin( 4 );
58 layout->addWidget( grpbox ); 54 layout->addWidget( grpbox );
59 55
60 QVBoxLayout *grplayout = new QVBoxLayout( grpbox->layout() ); 56 QVBoxLayout *grplayout = new QVBoxLayout( grpbox->layout() );
61 57
62 lstCategories = new QListBox( grpbox ); 58 lstCategories = new QListBox( grpbox );
63 lstCategories->setSelectionMode( QListBox::Multi ); 59 lstCategories->setSelectionMode( QListBox::Multi );
64 grplayout->addWidget( lstCategories ); 60 grplayout->addWidget( lstCategories );
65 61
66 // Split up categories and add them to the listbox 62 // Split up categories and add them to the listbox
67 int start = 1; 63 int start = 1;
68 64
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
@@ -9,51 +9,48 @@
9:`=1 )Y*s>-.--   : the terms of the GNU General Public 9:`=1 )Y*s>-.--   : the terms of the GNU General Public
10.="- .-=="i,     .._ License as published by the Free Software 10.="- .-=="i,     .._ License as published by the Free Software
11 - .   .-<_>     .<> Foundation; either version 2 of the License, 11 - .   .-<_>     .<> Foundation; either version 2 of the License,
12     ._= =}       : or (at your option) any later version. 12     ._= =}       : or (at your option) any later version.
13    .%`+i>       _;_. 13    .%`+i>       _;_.
14    .i_,=:_.      -<s. This file is distributed in the hope that 14    .i_,=:_.      -<s. This file is distributed in the hope that
15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
16    : ..    .:,     . . . without even the implied warranty of 16    : ..    .:,     . . . without even the implied warranty of
17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
19..}^=.=       =       ; Public License for more details. 19..}^=.=       =       ; Public License for more details.
20++=   -.     .`     .: 20++=   -.     .`     .:
21 :     =  ...= . :.=- You should have received a copy of the GNU 21 :     =  ...= . :.=- You should have received a copy of the GNU
22 -.   .:....=;==+<; General Public License along with this file; 22 -.   .:....=;==+<; General Public License along with this file;
23  -_. . .   )=.  = see the file COPYING. If not, write to the 23  -_. . .   )=.  = see the file COPYING. If not, write to the
24    --        :-=` Free Software Foundation, Inc., 24    --        :-=` Free Software Foundation, Inc.,
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#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"
42 39
43 //#define LOCAL_SERVER "Installed Pkgs" 40 //#define LOCAL_SERVER "Installed Pkgs"
44 //#define LOCAL_IPKGS "local IPKG" 41 //#define LOCAL_IPKGS "local IPKG"
45extern QString LOCAL_SERVER; 42extern QString LOCAL_SERVER;
46extern QString LOCAL_IPKGS; 43extern QString LOCAL_IPKGS;
47 44
48/** 45/**
49 *@author Andy Qua 46 *@author Andy Qua
50 */ 47 */
51 48
52 49
53class DataManager : public QObject 50class DataManager : public QObject
54{ 51{
55 Q_OBJECT 52 Q_OBJECT
56public: 53public:
57 DataManager(); 54 DataManager();
58 ~DataManager(); 55 ~DataManager();
59 56
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
@@ -9,50 +9,48 @@
9:`=1 )Y*s>-.--   : the terms of the GNU General Public 9:`=1 )Y*s>-.--   : the terms of the GNU General Public
10.="- .-=="i,     .._ License as published by the Free Software 10.="- .-=="i,     .._ License as published by the Free Software
11 - .   .-<_>     .<> Foundation; either version 2 of the License, 11 - .   .-<_>     .<> Foundation; either version 2 of the License,
12     ._= =}       : or (at your option) any later version. 12     ._= =}       : or (at your option) any later version.
13    .%`+i>       _;_. 13    .%`+i>       _;_.
14    .i_,=:_.      -<s. This file is distributed in the hope that 14    .i_,=:_.      -<s. This file is distributed in the hope that
15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
16    : ..    .:,     . . . without even the implied warranty of 16    : ..    .:,     . . . without even the implied warranty of
17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
19..}^=.=       =       ; Public License for more details. 19..}^=.=       =       ; Public License for more details.
20++=   -.     .`     .: 20++=   -.     .`     .:
21 :     =  ...= . :.=- You should have received a copy of the GNU 21 :     =  ...= . :.=- You should have received a copy of the GNU
22 -.   .:....=;==+<; General Public License along with this file; 22 -.   .:....=;==+<; General Public License along with this file;
23  -_. . .   )=.  = see the file COPYING. If not, write to the 23  -_. . .   )=.  = see the file COPYING. If not, write to the
24    --        :-=` Free Software Foundation, Inc., 24    --        :-=` Free Software Foundation, Inc.,
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#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;
41class QMultiLineEdit; 39class QMultiLineEdit;
42class QPushButton; 40class QPushButton;
43 41
44class DataManager; 42class DataManager;
45class Destination; 43class Destination;
46class Ipkg; 44class Ipkg;
47 45
48class InstallData 46class InstallData
49{ 47{
50public: 48public:
51 QString option; // I - install, D - delete, R- reinstall U - upgrade 49 QString option; // I - install, D - delete, R- reinstall U - upgrade
52 QString packageName; 50 QString packageName;
53 Destination *destination; 51 Destination *destination;
54 bool recreateLinks; 52 bool recreateLinks;
55}; 53};
56 54
57class InstallDlgImpl : public QWidget 55class InstallDlgImpl : public QWidget
58{ 56{
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
@@ -7,104 +7,106 @@
7 _;:,     .>    :=|. This file is free software; you can 7 _;:,     .>    :=|. This file is free software; you can
8.> <`_,   >  .   <= redistribute it and/or modify it under 8.> <`_,   >  .   <= redistribute it and/or modify it under
9:`=1 )Y*s>-.--   : the terms of the GNU General Public 9:`=1 )Y*s>-.--   : the terms of the GNU General Public
10.="- .-=="i,     .._ License as published by the Free Software 10.="- .-=="i,     .._ License as published by the Free Software
11 - .   .-<_>     .<> Foundation; either version 2 of the License, 11 - .   .-<_>     .<> Foundation; either version 2 of the License,
12     ._= =}       : or (at your option) any later version. 12     ._= =}       : or (at your option) any later version.
13    .%`+i>       _;_. 13    .%`+i>       _;_.
14    .i_,=:_.      -<s. This file is distributed in the hope that 14    .i_,=:_.      -<s. This file is distributed in the hope that
15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
16    : ..    .:,     . . . without even the implied warranty of 16    : ..    .:,     . . . without even the implied warranty of
17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
19..}^=.=       =       ; Public License for more details. 19..}^=.=       =       ; Public License for more details.
20++=   -.     .`     .: 20++=   -.     .`     .:
21 :     =  ...= . :.=- You should have received a copy of the GNU 21 :     =  ...= . :.=- You should have received a copy of the GNU
22 -.   .:....=;==+<; General Public License along with this file; 22 -.   .:....=;==+<; General Public License along with this file;
23  -_. . .   )=.  = see the file COPYING. If not, write to the 23  -_. . .   )=.  = see the file COPYING. If not, write to the
24    --        :-=` Free Software Foundation, Inc., 24    --        :-=` Free Software Foundation, Inc.,
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
39void __cdecl *operator new( unsigned int size, const char *file, int line ) 41void __cdecl *operator new( unsigned int size, const char *file, int line )
40{ 42{
41 void *ptr = (void *)malloc(size); 43 void *ptr = (void *)malloc(size);
42 AddTrack((long)ptr, size, file, line); 44 AddTrack((long)ptr, size, file, line);
43 return(ptr); 45 return(ptr);
44} 46}
45 47
46void operator delete(void *p) 48void operator delete(void *p)
47{ 49{
48 RemoveTrack((long)p); 50 RemoveTrack((long)p);
49 free(p); 51 free(p);
50} 52}
51 53
52#endif 54#endif
53 55
54 56
55typedef struct { 57typedef 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)
69{ 71{
70 ALLOC_INFO *info; 72 ALLOC_INFO *info;
71 73
72 74
73 info = (ALLOC_INFO *)malloc(sizeof( ALLOC_INFO )); 75 info = (ALLOC_INFO *)malloc(sizeof( ALLOC_INFO ));
74 info->address = addr; 76 info->address = addr;
75 strncpy(info->file, fname, 63); 77 strncpy(info->file, fname, 63);
76 info->line = lnum; 78 info->line = 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 {
90 allocList.remove((*i)); 92 allocList.remove((*i));
91 found = true; 93 found = true;
92 break; 94 break;
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);
106 totalSize += (*i)->size; 108 totalSize += (*i)->size;
107 } 109 }
108 sprintf(buf, "-----------------------------------------------------------\n"); 110 sprintf(buf, "-----------------------------------------------------------\n");
109 sprintf(buf, "Total Unfreed: %ld bytes\n", totalSize); 111 sprintf(buf, "Total Unfreed: %ld bytes\n", totalSize);
110}; 112};
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
@@ -12,50 +12,48 @@
12     ._= =}       : or (at your option) any later version. 12     ._= =}       : or (at your option) any later version.
13    .%`+i>       _;_. 13    .%`+i>       _;_.
14    .i_,=:_.      -<s. This file is distributed in the hope that 14    .i_,=:_.      -<s. This file is distributed in the hope that
15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
16    : ..    .:,     . . . without even the implied warranty of 16    : ..    .:,     . . . without even the implied warranty of
17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
19..}^=.=       =       ; Public License for more details. 19..}^=.=       =       ; Public License for more details.
20++=   -.     .`     .: 20++=   -.     .`     .:
21 :     =  ...= . :.=- You should have received a copy of the GNU 21 :     =  ...= . :.=- You should have received a copy of the GNU
22 -.   .:....=;==+<; General Public License along with this file; 22 -.   .:....=;==+<; General Public License along with this file;
23  -_. . .   )=.  = see the file COPYING. If not, write to the 23  -_. . .   )=.  = see the file COPYING. If not, write to the
24    --        :-=` Free Software Foundation, Inc., 24    --        :-=` Free Software Foundation, Inc.,
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#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:
44 Server() {} 42 Server() {}
45 Server( const char *name, const char *url ); 43 Server( const char *name, const char *url );
46 Server( const char *name, const char *url, const char *file ); 44 Server( const char *name, const char *url, const char *file );
47 ~Server(); 45 ~Server();
48 46
49 void cleanUp(); 47 void cleanUp();
50 48
51 void readStatusFile( QList<Destination> &v ); 49 void readStatusFile( QList<Destination> &v );
52 void readLocalIpks( Server *local ); 50 void readLocalIpks( Server *local );
53 void readPackageFile( Server *local = 0, bool clearAll = true, bool installedToRoot= false, Destination *dest = 0 ); 51 void readPackageFile( Server *local = 0, bool clearAll = true, bool installedToRoot= false, Destination *dest = 0 );
54 void buildLocalPackages( Server *local ); 52 void buildLocalPackages( Server *local );
55 Package *getPackage( const char *name ); 53 Package *getPackage( const char *name );
56 Package *getPackage( QString &name ); 54 Package *getPackage( QString &name );
57 QString toString(); 55 QString toString();
58 QList<Package> &getPackageList(); 56 QList<Package> &getPackageList();
59 bool isServerActive() { return active; } 57 bool isServerActive() { return active; }
60 58
61 void setServerName( const QString &name ) { serverName = name; } 59 void setServerName( const QString &name ) { serverName = name; }