summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/package.cpp30
-rw-r--r--noncore/unsupported/oipkg/package.h5
-rw-r--r--noncore/unsupported/oipkg/packagelist.cpp1
-rw-r--r--noncore/unsupported/oipkg/packagelistitem.cpp5
4 files changed, 27 insertions, 14 deletions
diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp
index e020601..190b3fb 100644
--- a/noncore/unsupported/oipkg/package.cpp
+++ b/noncore/unsupported/oipkg/package.cpp
@@ -16,30 +16,37 @@
16#include <stdlib.h> 16#include <stdlib.h>
17#include <unistd.h> 17#include <unistd.h>
18 18
19#include "debug.h" 19#include "debug.h"
20 20
21OipkgPackage::OipkgPackage( QObject *parent, const char *name ) 21OipkgPackage::OipkgPackage( QObject *parent, const char *name )
22 : QObject(parent,name) 22 : QObject(parent,name)
23{ 23{
24 24 init();
25} 25}
26 26
27OipkgPackage::~OipkgPackage() 27OipkgPackage::~OipkgPackage()
28{ 28{
29
29} 30}
30 31
31OipkgPackage::OipkgPackage( PackageManagerSettings *s, QObject *parent, const char *name ) 32OipkgPackage::OipkgPackage( PackageManagerSettings *s, QObject *parent, const char *name )
32 : QObject(parent,name) 33 : QObject(parent,name)
33 { 34 {
34 init(s); 35 settings = s;
36 init();
35} 37}
36 38
37void OipkgPackage::init( PackageManagerSettings *s ) 39// void OipkgPackage::init( PackageManagerSettings *s )
40// {
41 // settings = s;
42 // init();
43// }
44
45void OipkgPackage::init( )
38{ 46{
39 settings = s;
40 _size = ""; 47 _size = "";
41 _section = ""; 48 _section = "";
42 _subsection = ""; 49 _subsection = "";
43 _shortDesc = ""; 50 _shortDesc = "";
44 _desc = ""; 51 _desc = "";
45 _name = ""; 52 _name = "";
@@ -52,21 +59,23 @@ void OipkgPackage::init( PackageManagerSettings *s )
52 _versions=0; 59 _versions=0;
53 _version=""; 60 _version="";
54} 61}
55 62
56OipkgPackage::OipkgPackage( QStringList pack, PackageManagerSettings *s , QObject *parent, const char *name ) 63OipkgPackage::OipkgPackage( QStringList pack, PackageManagerSettings *s , QObject *parent, const char *name )
57 : QObject(parent,name) 64 : QObject(parent,name)
58{ 65{
59 init(s); 66 settings = s;
67 init();
60 parsePackage( pack ); 68 parsePackage( pack );
61} 69}
62 70
63OipkgPackage::OipkgPackage( QString n, PackageManagerSettings *s, QObject *parent, const char *name ) 71OipkgPackage::OipkgPackage( QString n, PackageManagerSettings *s, QObject *parent, const char *name )
64 : QObject(parent,name) 72 : QObject(parent,name)
65{ 73{
66 init(s); 74 settings = s;
75 init();
67 if ( !QFile::exists( n ) ) 76 if ( !QFile::exists( n ) )
68 { 77 {
69 _name = QString( n ); 78 _name = QString( n );
70 }else{ 79 }else{
71 pvDebug(4,"remote file: "+n); 80 pvDebug(4,"remote file: "+n);
72 parseIpkgFile( n ); 81 parseIpkgFile( n );
@@ -75,13 +84,14 @@ OipkgPackage::OipkgPackage( QString n, PackageManagerSettings *s, QObject *paren
75 } 84 }
76} 85}
77 86
78OipkgPackage::OipkgPackage( OipkgPackage *pi, QObject *parent, const char *name ) 87OipkgPackage::OipkgPackage( OipkgPackage *pi, QObject *parent, const char *name )
79 : QObject(parent,name) 88 : QObject(parent,name)
80{ 89{
81 init(pi->settings); 90 settings = pi->settings;
91 init();
82 copyValues( pi ); 92 copyValues( pi );
83} 93}
84 94
85 95
86void OipkgPackage::setValue( QString n, QString t ) 96void OipkgPackage::setValue( QString n, QString t )
87{ 97{
diff --git a/noncore/unsupported/oipkg/package.h b/noncore/unsupported/oipkg/package.h
index 2334c31..02d8eff 100644
--- a/noncore/unsupported/oipkg/package.h
+++ b/noncore/unsupported/oipkg/package.h
@@ -87,14 +87,15 @@ private:
87 QString _subsection; 87 QString _subsection;
88 QString _shortDesc; 88 QString _shortDesc;
89 QString _desc; 89 QString _desc;
90 QString _version; 90 QString _version;
91 QString _dest; 91 QString _dest;
92 QDict<QString> _values; 92 QDict<QString> _values;
93 QDict<OipkgPackage> *_versions; 93 QDict<OipkgPackage> *_versions;
94 bool _useFileName; 94 bool _useFileName;
95 void parsePackage( QStringList ); 95 void parsePackage( QStringList );
96 void init(PackageManagerSettings *); 96 void init();
97 // void init(PackageManagerSettings*);
97}; 98};
98 99
99 100
100#endif 101#endif
diff --git a/noncore/unsupported/oipkg/packagelist.cpp b/noncore/unsupported/oipkg/packagelist.cpp
index 5f79ec1..6f0b56f 100644
--- a/noncore/unsupported/oipkg/packagelist.cpp
+++ b/noncore/unsupported/oipkg/packagelist.cpp
@@ -203,12 +203,13 @@ void PackageList::readFileEntries( QString filename, QString dest )
203 p->setDest( dest ); 203 p->setDest( dest );
204 insertPackage( p ); 204 insertPackage( p );
205 packEntry.clear(); 205 packEntry.clear();
206 } 206 }
207 } 207 }
208 delete statusStream; 208 delete statusStream;
209 f.close();
209 return; 210 return;
210} 211}
211 212
212void PackageList::setSettings( PackageManagerSettings *s ) 213void PackageList::setSettings( PackageManagerSettings *s )
213{ 214{
214 settings = s; 215 settings = s;
diff --git a/noncore/unsupported/oipkg/packagelistitem.cpp b/noncore/unsupported/oipkg/packagelistitem.cpp
index 51d024b..1610a37 100644
--- a/noncore/unsupported/oipkg/packagelistitem.cpp
+++ b/noncore/unsupported/oipkg/packagelistitem.cpp
@@ -41,18 +41,19 @@ PackageListItem::PackageListItem(ListViewItemOipkg *lvi, OipkgPackage *pi, Packa
41 :ListViewItemOipkg(lvi,pi->name(),ListViewItemOipkg::Package) 41 :ListViewItemOipkg(lvi,pi->name(),ListViewItemOipkg::Package)
42{ 42{
43 init(pi,s); 43 init(pi,s);
44} 44}
45PackageListItem::~PackageListItem() 45PackageListItem::~PackageListItem()
46{ 46{
47 delete popupMenu; 47 delete popupMenu;
48 delete destsMenu; 48 delete destsMenu;
49} 49}
50 50
51void PackageListItem::init( OipkgPackage *pi, PackageManagerSettings *s) 51void PackageListItem::init( OipkgPackage *pi, PackageManagerSettings *s)
52{ 52{
53 //waring pass something different than 0
53 popupMenu = new QPopupMenu( 0 ); 54 popupMenu = new QPopupMenu( 0 );
54 destsMenu = new QPopupMenu( 0 ); 55 destsMenu = new QPopupMenu( 0 );
55 package = pi; 56 package = pi;
56 settings = s; 57 settings = s;
57 setExpandable( true ); 58 setExpandable( true );
58 ListViewItemOipkg *item; 59 ListViewItemOipkg *item;