-rw-r--r-- | noncore/unsupported/oipkg/package.cpp | 24 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/package.h | 3 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelist.cpp | 1 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelistitem.cpp | 1 |
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 @@ -23,3 +23,3 @@ OipkgPackage::OipkgPackage( QObject *parent, const char *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 = ""; @@ -58,3 +65,4 @@ OipkgPackage::OipkgPackage( QStringList pack, PackageManagerSettings *s , QObjec { - init(s); + settings = s; + init(); parsePackage( pack ); @@ -65,3 +73,4 @@ OipkgPackage::OipkgPackage( QString n, PackageManagerSettings *s, QObject *paren { - 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 @@ -95,3 +95,4 @@ private: 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 @@ -52,2 +52,3 @@ void PackageListItem::init( OipkgPackage *pi, PackageManagerSettings *s) { + //waring pass something different than 0 popupMenu = new QPopupMenu( 0 ); |