summaryrefslogtreecommitdiff
path: root/noncore
Side-by-side diff
Diffstat (limited to 'noncore') (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
@@ -21,5 +21,5 @@
OipkgPackage::OipkgPackage( QObject *parent, const char *name )
- : QObject(parent,name)
+ : QObject(parent,name)
{
-
+ init();
}
@@ -28,2 +28,3 @@ OipkgPackage::~OipkgPackage()
{
+
}
@@ -33,8 +34,14 @@ OipkgPackage::OipkgPackage( PackageManagerSettings *s, QObject *parent, const ch
{
- init(s);
+ settings = s;
+ init();
}
-void OipkgPackage::init( PackageManagerSettings *s )
+// void OipkgPackage::init( PackageManagerSettings *s )
+// {
+// settings = s;
+// init();
+// }
+
+void OipkgPackage::init( )
{
- settings = s;
_size = "";
@@ -57,4 +64,5 @@ OipkgPackage::OipkgPackage( QStringList pack, PackageManagerSettings *s , QObjec
: QObject(parent,name)
-{
- init(s);
+{
+ settings = s;
+ init();
parsePackage( pack );
@@ -64,4 +72,5 @@ OipkgPackage::OipkgPackage( QString n, PackageManagerSettings *s, QObject *paren
: QObject(parent,name)
-{
- init(s);
+{
+ settings = s;
+ init();
if ( !QFile::exists( n ) )
@@ -80,3 +89,4 @@ OipkgPackage::OipkgPackage( OipkgPackage *pi, QObject *parent, const char *name
{
- init(pi->settings);
+ settings = pi->settings;
+ init();
copyValues( pi );
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
@@ -92,6 +92,7 @@ private:
QDict<QString> _values;
- QDict<OipkgPackage> *_versions;
+ QDict<OipkgPackage> *_versions;
bool _useFileName;
void parsePackage( QStringList );
- void init(PackageManagerSettings *);
+ void init();
+ // void init(PackageManagerSettings*);
};
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
@@ -208,2 +208,3 @@ void PackageList::readFileEntries( QString filename, QString dest )
delete statusStream;
+ f.close();
return;
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
@@ -46,4 +46,4 @@ PackageListItem::~PackageListItem()
{
- delete popupMenu;
- delete destsMenu;
+ delete popupMenu;
+ delete destsMenu;
}
@@ -52,2 +52,3 @@ void PackageListItem::init( OipkgPackage *pi, PackageManagerSettings *s)
{
+ //waring pass something different than 0
popupMenu = new QPopupMenu( 0 );