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
@@ -19,24 +19,31 @@
#include "debug.h"
OipkgPackage::OipkgPackage( QObject *parent, const char *name )
- : QObject(parent,name)
+ : QObject(parent,name)
{
-
+ init();
}
OipkgPackage::~OipkgPackage()
{
+
}
OipkgPackage::OipkgPackage( PackageManagerSettings *s, QObject *parent, const char *name )
: QObject(parent,name)
{
- init(s);
+ settings = s;
+ init();
}
-void OipkgPackage::init( PackageManagerSettings *s )
+// void OipkgPackage::init( PackageManagerSettings *s )
+// {
+// settings = s;
+// init();
+// }
+
+void OipkgPackage::init( )
{
- settings = s;
_size = "";
_section = "";
_subsection = "";
@@ -55,15 +62,17 @@ void OipkgPackage::init( PackageManagerSettings *s )
OipkgPackage::OipkgPackage( QStringList pack, PackageManagerSettings *s , QObject *parent, const char *name )
: QObject(parent,name)
-{
- init(s);
+{
+ settings = s;
+ init();
parsePackage( pack );
}
OipkgPackage::OipkgPackage( QString n, PackageManagerSettings *s, QObject *parent, const char *name )
: QObject(parent,name)
-{
- init(s);
+{
+ settings = s;
+ init();
if ( !QFile::exists( n ) )
{
_name = QString( n );
@@ -78,7 +87,8 @@ OipkgPackage::OipkgPackage( QString n, PackageManagerSettings *s, QObject *paren
OipkgPackage::OipkgPackage( OipkgPackage *pi, QObject *parent, const char *name )
: QObject(parent,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
@@ -90,10 +90,11 @@ private:
QString _version;
QString _dest;
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
@@ -206,6 +206,7 @@ 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
@@ -44,12 +44,13 @@ PackageListItem::PackageListItem(ListViewItemOipkg *lvi, OipkgPackage *pi, Packa
}
PackageListItem::~PackageListItem()
{
- delete popupMenu;
- delete destsMenu;
+ delete popupMenu;
+ delete destsMenu;
}
void PackageListItem::init( OipkgPackage *pi, PackageManagerSettings *s)
{
+ //waring pass something different than 0
popupMenu = new QPopupMenu( 0 );
destsMenu = new QPopupMenu( 0 );
package = pi;