1 files changed, 48 insertions, 50 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
@@ -19,5 +19,5 @@
 #include "debug.h"
 
-Package::Package( QObject *parent, const char *name )
+OipkgPackage::OipkgPackage( QObject *parent, const char *name )
         : QObject(parent,name)
 {
@@ -25,16 +25,15 @@ Package::Package( QObject *parent, const char *name )
 }
 
-Package::~Package()
+OipkgPackage::~OipkgPackage()
 {
 }
 
-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);
 }
 
-void Package::init( PackageManagerSettings *s )
+void OipkgPackage::init( PackageManagerSettings *s )
 {
         settings = s;
@@ -55,5 +54,5 @@ 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)
 {
@@ -62,5 +61,5 @@ 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)
 {
@@ -77,5 +76,5 @@ 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)
 {
@@ -85,5 +84,5 @@ Package::Package( Package *pi, QObject *parent, const char *name )
 
 
-void Package::setValue( QString n, QString t )
+void OipkgPackage::setValue( QString n, QString t )
 {
   if ( n == "Package" )
@@ -138,5 +137,5 @@ void Package::setValue( QString n, QString t )
 }
 
-QString Package::name()
+QString OipkgPackage::name()
 {
         if (_displayName.isEmpty() ) return _name;
@@ -145,5 +144,5 @@ QString Package::name()
 
 
-QString Package::installName()
+QString OipkgPackage::installName()
 {
         if (_useFileName) return _fileName;
@@ -151,5 +150,5 @@ QString Package::installName()
 }
 
-QString Package::packageName()
+QString OipkgPackage::packageName()
 {
         QString pn = installName();
@@ -159,5 +158,5 @@ QString Package::packageName()
 }
 
-bool Package::installed()
+bool OipkgPackage::installed()
 {
   if (_status.contains("installed"))
@@ -173,5 +172,5 @@ bool Package::installed()
         if (_versions)
   {
-          QDictIterator<Package> other( *_versions );
+          QDictIterator<OipkgPackage> other( *_versions );
                 while ( other.current() )
     {
@@ -185,9 +184,9 @@ bool Package::installed()
 }
 
-bool Package::otherInstalled()
+bool OipkgPackage::otherInstalled()
 {
         if (_versions)
   {
-          QDictIterator<Package> other( *_versions );
+          QDictIterator<OipkgPackage> other( *_versions );
                 while ( other.current() )
     {
@@ -199,5 +198,5 @@ bool Package::otherInstalled()
 }
 
-void Package::setDesc( QString s )
+void OipkgPackage::setDesc( QString s )
 {
   _desc = s;
@@ -205,15 +204,15 @@ void Package::setDesc( QString s )
 }
 
-QString Package::desc()
+QString OipkgPackage::desc()
 {
   return _desc;
 }
 
-QString Package::shortDesc()
+QString OipkgPackage::shortDesc()
 {
   return _shortDesc;
 }
 
-QString Package::size()
+QString OipkgPackage::size()
 {
   return _size;
@@ -221,10 +220,10 @@ QString Package::size()
 
 
-QString Package::version()
+QString OipkgPackage::version()
 {
   return _version;
 }
 
-QString Package::sizeUnits()
+QString OipkgPackage::sizeUnits()
 {
         int i = _size.toInt();
@@ -242,10 +241,10 @@ QString Package::sizeUnits()
 }
 
-bool Package::toProcess()
+bool OipkgPackage::toProcess()
 {
   return _toProcess;
 }
 
-bool Package::toRemove()
+bool OipkgPackage::toRemove()
 {
   if ( _toProcess && installed() ) return true;
@@ -253,5 +252,5 @@ bool Package::toRemove()
 }
 
-bool Package::toInstall()
+bool OipkgPackage::toInstall()
 {
   if ( _toProcess && !installed() ) return true;
@@ -259,5 +258,5 @@ bool Package::toInstall()
 }
 
-void Package::toggleProcess()
+void OipkgPackage::toggleProcess()
 {
   _toProcess = ! _toProcess;
@@ -265,6 +264,5 @@ void Package::toggleProcess()
 
 
-
-void Package::copyValues( Package* pack )
+void OipkgPackage::copyValues( OipkgPackage* pack )
 {
   if (_size.isEmpty()      && !pack->_size.isEmpty()) _size = QString( pack->_size );
@@ -282,10 +280,10 @@ void Package::copyValues( Package* pack )
 }
 
-QString Package::section()
+QString OipkgPackage::section()
 {
   return _section;
 }
 
-void Package::setSection( QString s)
+void OipkgPackage::setSection( QString s)
 {
   int i = s.find("/");
@@ -300,10 +298,10 @@ void Package::setSection( QString s)
 }
 
-QString Package::subSection()
+QString OipkgPackage::subSection()
 {
   return _subsection;
 }
 
-void Package::parsePackage( QStringList pack )
+void OipkgPackage::parsePackage( QStringList pack )
 {
   if ( pack.isEmpty() ) return;
@@ -324,5 +322,5 @@ void Package::parsePackage( QStringList pack )
 }
 
-QString Package::details()
+QString OipkgPackage::details()
 {
   QString status;
@@ -363,5 +361,5 @@ QString Package::details()
 }
 
-void Package::processed()
+void OipkgPackage::processed()
 {
         _toProcess = false;
@@ -371,5 +369,5 @@ void Package::processed()
 }
 
-QString Package::dest()
+QString OipkgPackage::dest()
 {
         if ( installed()||(!installed() && _toProcess) )
@@ -378,5 +376,5 @@ QString Package::dest()
 }
 
-void Package::setDest( QString d )
+void OipkgPackage::setDest( QString d )
 {
         if ( d == "remote") _useFileName = true;
@@ -384,10 +382,10 @@ void Package::setDest( QString d )
 }
 
-void Package::setOn()
+void OipkgPackage::setOn()
 {
         _toProcess = true;
 }
 
-bool Package::link()
+bool OipkgPackage::link()
 {
         if ( _dest == "root" || (!installed() && !_toProcess) ) return false;
@@ -395,10 +393,10 @@ bool Package::link()
 }
 
-void Package::setLink(bool b)
+void OipkgPackage::setLink(bool b)
 {
         _link = b;
 }
 
-void Package::parseIpkgFile( QString file)
+void OipkgPackage::parseIpkgFile( QString file)
 {
 // 20020830
@@ -426,5 +424,5 @@ void Package::parseIpkgFile( QString file)
 }
 
-//QString Package::getPackageName()
+//QString OipkgPackage::getPackageName()
 //{
         //if ( _packageName.isEmpty() ) return _name;
@@ -432,28 +430,28 @@ void Package::parseIpkgFile( QString file)
 //}
 
-void Package::instalFromFile(bool iff)
+void OipkgPackage::instalFromFile(bool iff)
 {
         _useFileName = iff;
 }
 
-void Package::setName(QString n)
+void OipkgPackage::setName(QString n)
 {
         _displayName = n;
 }
 
-QDict<QString>* Package::getFields()
+QDict<QString>* OipkgPackage::getFields()
 {
         return &_values;
 }
 
-QString Package::status()
+QString OipkgPackage::status()
 {
         return _status;
 }
 
-bool Package::isOld()
+bool OipkgPackage::isOld()
 {
         if (!_versions) return false;
-        QDictIterator<Package> other( *_versions );
+        QDictIterator<OipkgPackage> other( *_versions );
         while ( other.current() ) {
      if (other.current()->version() > version() ) return true;
@@ -463,5 +461,5 @@ bool Package::isOld()
 }
 
-bool Package::hasVersions()
+bool OipkgPackage::hasVersions()
 {
         if (!_versions) return false;
@@ -469,10 +467,10 @@ bool Package::hasVersions()
 }
 
-QDict<Package>* Package::getOtherVersions()
+QDict<OipkgPackage>* OipkgPackage::getOtherVersions()
 {
         return _versions;
 }
 
-void Package::setOtherVersions(QDict<Package> *v)
+void OipkgPackage::setOtherVersions(QDict<OipkgPackage> *v)
 {
         _versions=v;