summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -18,26 +18,33 @@
#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 = "";
_shortDesc = "";
@@ -54,17 +61,19 @@ 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 );
}else{
@@ -77,9 +86,10 @@ 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
@@ -89,12 +89,13 @@ private:
QString _desc;
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*);
};
#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
@@ -205,8 +205,9 @@ void PackageList::readFileEntries( QString filename, QString dest )
packEntry.clear();
}
}
delete statusStream;
+ f.close();
return;
}
void PackageList::setSettings( PackageManagerSettings *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
@@ -43,14 +43,15 @@ PackageListItem::PackageListItem(ListViewItemOipkg *lvi, OipkgPackage *pi, Packa
init(pi,s);
}
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;
settings = s;