summaryrefslogtreecommitdiff
authorandyq <andyq>2002-11-19 17:31:00 (UTC)
committer andyq <andyq>2002-11-19 17:31:00 (UTC)
commitabeb38c25d2cfe90d1a17912a63c9518e602766c (patch) (unidiff)
tree79df89e95a7dafc4a3bf9a7e377b41467396f20d
parent638b671dce5eff05a2ec666492c060fa2fd021a2 (diff)
downloadopie-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)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/package.cpp10
-rw-r--r--noncore/settings/aqpkg/package.h14
-rw-r--r--noncore/settings/aqpkg/server.cpp22
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()
56 return ret; 56 return ret;
57} 57}
58 58
59void Package :: setStatus( QString &s ) 59void Package :: setStatus( const QString &s )
60{ 60{
61 status = s; 61 status = s;
62 62
@@ -75,7 +75,7 @@ void Package :: setLocalPackage( Package *p )
75 differentVersionAvailable = false; 75 differentVersionAvailable = false;
76} 76}
77 77
78void Package :: setVersion( QString &v ) 78void Package :: setVersion( const QString &v )
79{ 79{
80 version = v; 80 version = v;
81 81
@@ -86,17 +86,17 @@ void Package :: setVersion( QString &v )
86 differentVersionAvailable = false; 86 differentVersionAvailable = false;
87} 87}
88 88
89void Package :: setPackageName( QString &name ) 89void Package :: setPackageName( const QString &name )
90{ 90{
91 packageName = name; 91 packageName = name;
92} 92}
93 93
94void Package :: setDescription( QString &d ) 94void Package :: setDescription( const QString &d )
95{ 95{
96 description = d; 96 description = d;
97} 97}
98 98
99void Package :: setFilename( QString &f ) 99void Package :: setFilename( const QString &f )
100{ 100{
101 filename = f; 101 filename = f;
102} 102}
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:
35 ~Package(); 35 ~Package();
36 36
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; }
44 void setInstalledToRoot( bool root ) { installedToRoot = root; } 44 void setInstalledToRoot( bool root ) { installedToRoot = root; }
45 void setInstalledTo( Destination *d ) { installedTo = d; } 45 void setInstalledTo( Destination *d ) { installedTo = d; }
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 &sect) { section = sect; }
49 49
50 Package *getLocalPackage() { return localPackage; } 50 Package *getLocalPackage() { return localPackage; }
51 QString getPackageName() { return packageName; } 51 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 )
247 name = Utils::getPackageNameFromIpkFilename( packageList[i].getFilename() ); 247 name = Utils::getPackageNameFromIpkFilename( packageList[i].getFilename() );
248 248
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
252 packageList[i].setLocalPackage( 0 ); 266 packageList[i].setLocalPackage( 0 );
253 } 267 }
@@ -283,13 +297,7 @@ QString Server :: toString()
283 297
284 298
285 return ret; 299 return ret;
286} /*
287void addAvailableSection( QString section )
288{
289 if ( DataManager::availableCategories.find( value ) == -1 )
290// DataManager::availableCategories += "#" + value;
291} 300}
292*/
293 301
294vector<Package> &Server::getPackageList() 302vector<Package> &Server::getPackageList()
295{ 303{