author | andyq <andyq> | 2002-11-19 17:31:00 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-11-19 17:31:00 (UTC) |
commit | abeb38c25d2cfe90d1a17912a63c9518e602766c (patch) (unidiff) | |
tree | 79df89e95a7dafc4a3bf9a7e377b41467396f20d | |
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 | |||
@@ -58,3 +58,3 @@ QString Package :: toString() | |||
58 | 58 | ||
59 | void Package :: setStatus( QString &s ) | 59 | void Package :: setStatus( const QString &s ) |
60 | { | 60 | { |
@@ -77,3 +77,3 @@ void Package :: setLocalPackage( Package *p ) | |||
77 | 77 | ||
78 | void Package :: setVersion( QString &v ) | 78 | void Package :: setVersion( const QString &v ) |
79 | { | 79 | { |
@@ -88,3 +88,3 @@ void Package :: setVersion( QString &v ) | |||
88 | 88 | ||
89 | void Package :: setPackageName( QString &name ) | 89 | void Package :: setPackageName( const QString &name ) |
90 | { | 90 | { |
@@ -93,3 +93,3 @@ void Package :: setPackageName( QString &name ) | |||
93 | 93 | ||
94 | void Package :: setDescription( QString &d ) | 94 | void Package :: setDescription( const QString &d ) |
95 | { | 95 | { |
@@ -98,3 +98,3 @@ void Package :: setDescription( QString &d ) | |||
98 | 98 | ||
99 | void Package :: setFilename( QString &f ) | 99 | void Package :: setFilename( const QString &f ) |
100 | { | 100 | { |
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 | |||
@@ -37,7 +37,7 @@ public: | |||
37 | void setLocalPackage( Package *p ); | 37 | void setLocalPackage( Package *p ); |
38 | void setPackageName( QString &name ); | 38 | void setPackageName( const QString &name ); |
39 | void setVersion( QString &v ); | 39 | void setVersion( const QString &v ); |
40 | void setStatus( QString &s ); | 40 | void setStatus( const QString &s ); |
41 | void setDescription( QString &d ); | 41 | void setDescription( const QString &d ); |
42 | void setFilename( QString &f ); | 42 | void setFilename( const QString &f ); |
43 | void setPackageStoredLocally( bool local ){ packageStoredLocally = local; } | 43 | void setPackageStoredLocally( bool local ){ packageStoredLocally = local; } |
@@ -46,4 +46,4 @@ public: | |||
46 | void setDependancies( QString &deps ) { dependancies = deps; } | 46 | void setDependancies( QString &deps ) { dependancies = deps; } |
47 | void setPackageSize( QString size ) { packageSize = size; } | 47 | void setPackageSize( const QString &size ) { packageSize = size; } |
48 | void setSection( QString sect) { section = sect; } | 48 | void setSection( const QString §) { section = sect; } |
49 | 49 | ||
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 | |||
@@ -249,3 +249,17 @@ void Server :: buildLocalPackages( Server *local ) | |||
249 | if ( local ) | 249 | if ( local ) |
250 | packageList[i].setLocalPackage( local->getPackage( name ) ); | 250 | { |
251 | Package *p = local->getPackage( name ); | ||
252 | packageList[i].setLocalPackage( p ); | ||
253 | if ( p ) | ||
254 | { | ||
255 | // Set some default stuff like size and things | ||
256 | if ( p->getInstalledVersion() == packageList[i].getVersion() ) | ||
257 | { | ||
258 | p->setPackageSize( packageList[i].getPackageSize() ); | ||
259 | p->setSection( packageList[i].getSection() ); | ||
260 | p->setDescription( packageList[i].getDescription() ); | ||
261 | } | ||
262 | } | ||
263 | |||
264 | } | ||
251 | else | 265 | else |
@@ -285,9 +299,3 @@ QString Server :: toString() | |||
285 | return ret; | 299 | return ret; |
286 | } /* | ||
287 | void addAvailableSection( QString section ) | ||
288 | { | ||
289 | if ( DataManager::availableCategories.find( value ) == -1 ) | ||
290 | // DataManager::availableCategories += "#" + value; | ||
291 | } | 300 | } |
292 | */ | ||
293 | 301 | ||