1 files changed, 49 insertions, 51 deletions

diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp
index 3effb73..e020601 100644
--- a/noncore/unsupported/oipkg/package.cpp
+++ b/noncore/unsupported/oipkg/package.cpp
@@ -20,3 +20,3 @@
 
-Package::Package( QObject *parent, const char *name )
+OipkgPackage::OipkgPackage( QObject *parent, const char *name )
         : QObject(parent,name)
@@ -26,3 +26,3 @@ Package::Package( QObject *parent, const char *name )
 
-Package::~Package()
+OipkgPackage::~OipkgPackage()
 {
@@ -30,6 +30,5 @@ Package::~Package()
 
-Package::Package( PackageManagerSettings *s, QObject *parent, const char *name )
+OipkgPackage::OipkgPackage( PackageManagerSettings *s, QObject *parent, const char *name )
         : QObject(parent,name)
-{
-        Package(parent,name);
+        {
         init(s);
@@ -37,3 +36,3 @@ Package::Package( PackageManagerSettings *s, QObject *parent, const char *name )
 
-void Package::init( PackageManagerSettings *s )
+void OipkgPackage::init( PackageManagerSettings *s )
 {
@@ -56,3 +55,3 @@ void Package::init( PackageManagerSettings *s )
 
-Package::Package( QStringList pack, PackageManagerSettings *s , QObject *parent, const char *name )
+OipkgPackage::OipkgPackage( QStringList pack, PackageManagerSettings *s , QObject *parent, const char *name )
         : QObject(parent,name)
@@ -63,3 +62,3 @@ Package::Package( QStringList pack, PackageManagerSettings *s , QObject *parent,
 
-Package::Package( QString n, PackageManagerSettings *s, QObject *parent, const char *name )
+OipkgPackage::OipkgPackage( QString n, PackageManagerSettings *s, QObject *parent, const char *name )
         : QObject(parent,name)
@@ -78,3 +77,3 @@ Package::Package( QString n, PackageManagerSettings *s, QObject *parent, const c
 
-Package::Package( Package *pi, QObject *parent, const char *name )
+OipkgPackage::OipkgPackage( OipkgPackage *pi, QObject *parent, const char *name )
         : QObject(parent,name)
@@ -86,3 +85,3 @@ Package::Package( Package *pi, QObject *parent, const char *name )
 
-void Package::setValue( QString n, QString t )
+void OipkgPackage::setValue( QString n, QString t )
 {
@@ -139,3 +138,3 @@ void Package::setValue( QString n, QString t )
 
-QString Package::name()
+QString OipkgPackage::name()
 {
@@ -146,3 +145,3 @@ QString Package::name()
 
-QString Package::installName()
+QString OipkgPackage::installName()
 {
@@ -152,3 +151,3 @@ QString Package::installName()
 
-QString Package::packageName()
+QString OipkgPackage::packageName()
 {
@@ -160,3 +159,3 @@ QString Package::packageName()
 
-bool Package::installed()
+bool OipkgPackage::installed()
 {
@@ -174,3 +173,3 @@ bool Package::installed()
   {
-          QDictIterator<Package> other( *_versions );
+          QDictIterator<OipkgPackage> other( *_versions );
                 while ( other.current() )
@@ -186,3 +185,3 @@ bool Package::installed()
 
-bool Package::otherInstalled()
+bool OipkgPackage::otherInstalled()
 {
@@ -190,3 +189,3 @@ bool Package::otherInstalled()
   {
-          QDictIterator<Package> other( *_versions );
+          QDictIterator<OipkgPackage> other( *_versions );
                 while ( other.current() )
@@ -200,3 +199,3 @@ bool Package::otherInstalled()
 
-void Package::setDesc( QString s )
+void OipkgPackage::setDesc( QString s )
 {
@@ -206,3 +205,3 @@ void Package::setDesc( QString s )
 
-QString Package::desc()
+QString OipkgPackage::desc()
 {
@@ -211,3 +210,3 @@ QString Package::desc()
 
-QString Package::shortDesc()
+QString OipkgPackage::shortDesc()
 {
@@ -216,3 +215,3 @@ QString Package::shortDesc()
 
-QString Package::size()
+QString OipkgPackage::size()
 {
@@ -222,3 +221,3 @@ QString Package::size()
 
-QString Package::version()
+QString OipkgPackage::version()
 {
@@ -227,3 +226,3 @@ QString Package::version()
 
-QString Package::sizeUnits()
+QString OipkgPackage::sizeUnits()
 {
@@ -243,3 +242,3 @@ QString Package::sizeUnits()
 
-bool Package::toProcess()
+bool OipkgPackage::toProcess()
 {
@@ -248,3 +247,3 @@ bool Package::toProcess()
 
-bool Package::toRemove()
+bool OipkgPackage::toRemove()
 {
@@ -254,3 +253,3 @@ bool Package::toRemove()
 
-bool Package::toInstall()
+bool OipkgPackage::toInstall()
 {
@@ -260,3 +259,3 @@ bool Package::toInstall()
 
-void Package::toggleProcess()
+void OipkgPackage::toggleProcess()
 {
@@ -266,4 +265,3 @@ void Package::toggleProcess()
 
-
-void Package::copyValues( Package* pack )
+void OipkgPackage::copyValues( OipkgPackage* pack )
 {
@@ -283,3 +281,3 @@ void Package::copyValues( Package* pack )
 
-QString Package::section()
+QString OipkgPackage::section()
 {
@@ -288,3 +286,3 @@ QString Package::section()
 
-void Package::setSection( QString s)
+void OipkgPackage::setSection( QString s)
 {
@@ -301,3 +299,3 @@ void Package::setSection( QString s)
 
-QString Package::subSection()
+QString OipkgPackage::subSection()
 {
@@ -306,3 +304,3 @@ QString Package::subSection()
 
-void Package::parsePackage( QStringList pack )
+void OipkgPackage::parsePackage( QStringList pack )
 {
@@ -325,3 +323,3 @@ void Package::parsePackage( QStringList pack )
 
-QString Package::details()
+QString OipkgPackage::details()
 {
@@ -364,3 +362,3 @@ QString Package::details()
 
-void Package::processed()
+void OipkgPackage::processed()
 {
@@ -372,3 +370,3 @@ void Package::processed()
 
-QString Package::dest()
+QString OipkgPackage::dest()
 {
@@ -379,3 +377,3 @@ QString Package::dest()
 
-void Package::setDest( QString d )
+void OipkgPackage::setDest( QString d )
 {
@@ -385,3 +383,3 @@ void Package::setDest( QString d )
 
-void Package::setOn()
+void OipkgPackage::setOn()
 {
@@ -390,3 +388,3 @@ void Package::setOn()
 
-bool Package::link()
+bool OipkgPackage::link()
 {
@@ -396,3 +394,3 @@ bool Package::link()
 
-void Package::setLink(bool b)
+void OipkgPackage::setLink(bool b)
 {
@@ -401,3 +399,3 @@ void Package::setLink(bool b)
 
-void Package::parseIpkgFile( QString file)
+void OipkgPackage::parseIpkgFile( QString file)
 {
@@ -427,3 +425,3 @@ void Package::parseIpkgFile( QString file)
 
-//QString Package::getPackageName()
+//QString OipkgPackage::getPackageName()
 //{
@@ -433,3 +431,3 @@ void Package::parseIpkgFile( QString file)
 
-void Package::instalFromFile(bool iff)
+void OipkgPackage::instalFromFile(bool iff)
 {
@@ -438,3 +436,3 @@ void Package::instalFromFile(bool iff)
 
-void Package::setName(QString n)
+void OipkgPackage::setName(QString n)
 {
@@ -443,3 +441,3 @@ void Package::setName(QString n)
 
-QDict<QString>* Package::getFields()
+QDict<QString>* OipkgPackage::getFields()
 {
@@ -448,3 +446,3 @@ QDict<QString>* Package::getFields()
 
-QString Package::status()
+QString OipkgPackage::status()
 {
@@ -453,6 +451,6 @@ QString Package::status()
 
-bool Package::isOld()
+bool OipkgPackage::isOld()
 {
         if (!_versions) return false;
-        QDictIterator<Package> other( *_versions );
+        QDictIterator<OipkgPackage> other( *_versions );
         while ( other.current() ) {
@@ -464,3 +462,3 @@ bool Package::isOld()
 
-bool Package::hasVersions()
+bool OipkgPackage::hasVersions()
 {
@@ -470,3 +468,3 @@ bool Package::hasVersions()
 
-QDict<Package>* Package::getOtherVersions()
+QDict<OipkgPackage>* OipkgPackage::getOtherVersions()
 {
@@ -475,3 +473,3 @@ QDict<Package>* Package::getOtherVersions()
 
-void Package::setOtherVersions(QDict<Package> *v)
+void OipkgPackage::setOtherVersions(QDict<OipkgPackage> *v)
 {