summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/package.cpp24
-rw-r--r--noncore/unsupported/oipkg/package.h3
-rw-r--r--noncore/unsupported/oipkg/packagelist.cpp1
-rw-r--r--noncore/unsupported/oipkg/packagelistitem.cpp1
4 files changed, 21 insertions, 8 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
@@ -22,9 +22,10 @@ OipkgPackage::OipkgPackage( QObject *parent, const char *name )
: QObject(parent,name)
{
-
+ init();
}
OipkgPackage::~OipkgPackage()
{
+
}
@@ -32,10 +33,16 @@ OipkgPackage::OipkgPackage( PackageManagerSettings *s, QObject *parent, const ch
: 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 = "";
@@ -57,5 +64,6 @@ OipkgPackage::OipkgPackage( QStringList pack, PackageManagerSettings *s , QObjec
: QObject(parent,name)
{
- init(s);
+ settings = s;
+ init();
parsePackage( pack );
}
@@ -64,5 +72,6 @@ OipkgPackage::OipkgPackage( QString n, PackageManagerSettings *s, QObject *paren
: QObject(parent,name)
{
- init(s);
+ settings = s;
+ init();
if ( !QFile::exists( n ) )
{
@@ -79,5 +88,6 @@ 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
@@ -94,5 +94,6 @@ private:
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
@@ -207,4 +207,5 @@ 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
@@ -51,4 +51,5 @@ PackageListItem::~PackageListItem()
void PackageListItem::init( OipkgPackage *pi, PackageManagerSettings *s)
{
+ //waring pass something different than 0
popupMenu = new QPopupMenu( 0 );
destsMenu = new QPopupMenu( 0 );