author | andyq <andyq> | 2002-11-19 17:31:00 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-11-19 17:31:00 (UTC) |
commit | abeb38c25d2cfe90d1a17912a63c9518e602766c (patch) (side-by-side diff) | |
tree | 79df89e95a7dafc4a3bf9a7e377b41467396f20d /noncore | |
parent | 638b671dce5eff05a2ec666492c060fa2fd021a2 (diff) | |
download | opie-abeb38c25d2cfe90d1a17912a63c9518e602766c.zip opie-abeb38c25d2cfe90d1a17912a63c9518e602766c.tar.gz opie-abeb38c25d2cfe90d1a17912a63c9518e602766c.tar.bz2 |
Changed so that the size of a package is passed down into the local package
(as long as the package installed is the same version as the package
available in the feed)
-rw-r--r-- | noncore/settings/aqpkg/package.cpp | 10 | ||||
-rw-r--r-- | noncore/settings/aqpkg/package.h | 14 | ||||
-rw-r--r-- | noncore/settings/aqpkg/server.cpp | 22 |
3 files changed, 27 insertions, 19 deletions
diff --git a/noncore/settings/aqpkg/package.cpp b/noncore/settings/aqpkg/package.cpp index fd75450..526de5e 100644 --- a/noncore/settings/aqpkg/package.cpp +++ b/noncore/settings/aqpkg/package.cpp @@ -56,7 +56,7 @@ QString Package :: toString() return ret; } -void Package :: setStatus( QString &s ) +void Package :: setStatus( const QString &s ) { status = s; @@ -75,7 +75,7 @@ void Package :: setLocalPackage( Package *p ) differentVersionAvailable = false; } -void Package :: setVersion( QString &v ) +void Package :: setVersion( const QString &v ) { version = v; @@ -86,17 +86,17 @@ void Package :: setVersion( QString &v ) differentVersionAvailable = false; } -void Package :: setPackageName( QString &name ) +void Package :: setPackageName( const QString &name ) { packageName = name; } -void Package :: setDescription( QString &d ) +void Package :: setDescription( const QString &d ) { description = d; } -void Package :: setFilename( QString &f ) +void Package :: setFilename( const QString &f ) { filename = f; } diff --git a/noncore/settings/aqpkg/package.h b/noncore/settings/aqpkg/package.h index 7545818..f5a132f 100644 --- a/noncore/settings/aqpkg/package.h +++ b/noncore/settings/aqpkg/package.h @@ -35,17 +35,17 @@ public: ~Package(); void setLocalPackage( Package *p ); - void setPackageName( QString &name ); - void setVersion( QString &v ); - void setStatus( QString &s ); - void setDescription( QString &d ); - void setFilename( QString &f ); + void setPackageName( const QString &name ); + void setVersion( const QString &v ); + void setStatus( const QString &s ); + void setDescription( const QString &d ); + void setFilename( const QString &f ); void setPackageStoredLocally( bool local ) { packageStoredLocally = local; } void setInstalledToRoot( bool root ) { installedToRoot = root; } void setInstalledTo( Destination *d ) { installedTo = d; } void setDependancies( QString &deps ) { dependancies = deps; } - void setPackageSize( QString size ) { packageSize = size; } - void setSection( QString sect) { section = sect; } + void setPackageSize( const QString &size ) { packageSize = size; } + void setSection( const QString §) { section = sect; } Package *getLocalPackage() { return localPackage; } QString getPackageName() { return packageName; } diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp index 7c3257b..726cf00 100644 --- a/noncore/settings/aqpkg/server.cpp +++ b/noncore/settings/aqpkg/server.cpp @@ -247,7 +247,21 @@ void Server :: buildLocalPackages( Server *local ) name = Utils::getPackageNameFromIpkFilename( packageList[i].getFilename() ); if ( local ) - packageList[i].setLocalPackage( local->getPackage( name ) ); + { + Package *p = local->getPackage( name ); + packageList[i].setLocalPackage( p ); + if ( p ) + { + // Set some default stuff like size and things + if ( p->getInstalledVersion() == packageList[i].getVersion() ) + { + p->setPackageSize( packageList[i].getPackageSize() ); + p->setSection( packageList[i].getSection() ); + p->setDescription( packageList[i].getDescription() ); + } + } + + } else packageList[i].setLocalPackage( 0 ); } @@ -283,13 +297,7 @@ QString Server :: toString() return ret; -} /* -void addAvailableSection( QString section ) -{ - if ( DataManager::availableCategories.find( value ) == -1 ) -// DataManager::availableCategories += "#" + value; } -*/ vector<Package> &Server::getPackageList() { |