Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HaikuDepot: Store BPackageVersion in PackageInfo...

Browse Source 
...instead of the string representation. This makes it easier to
get the major, minor, micro, prerelease and revision parts later on.
This commit is contained in:
Stephan Aßmus 2014-09-29 22:01:30 +02:00
parent d7f449e9bc
commit 46bcb34d05
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/apps/haikudepot/model/PackageInfo.cpp
View File

@ -11,6 +11,7 @@
#include <package/PackageFlags.h>
// #pragma mark - UserInfo
@ -466,7 +467,7 @@ PackageInfo::PackageInfo()
PackageInfo::PackageInfo(const BString& title,
const BString& version, const PublisherInfo& publisher,
const BPackageVersion& version, const PublisherInfo& publisher,
const BString& shortDescription, const BString& fullDescription,
int32 flags, const char* architecture)
:

11
src/apps/haikudepot/model/PackageInfo.h
View File

@ -9,7 +9,7 @@
#include <set>
#include <Referenceable.h>
#include <String.h>
#include <package/PackageVersion.h>
#include "List.h"
#include "PackageInfoListener.h"
@ -229,12 +229,15 @@ enum PackageState {
};
using BPackageKit::BPackageVersion;
class PackageInfo : public BReferenceable {
public:
PackageInfo();
PackageInfo(
const BString& title,
const BString& version,
const BPackageVersion& version,
const PublisherInfo& publisher,
const BString& shortDescription,
const BString& fullDescription,
@ -248,7 +251,7 @@ public:
const BString& Title() const
{ return fTitle; }
const BString& Version() const
const BPackageVersion& Version() const
{ return fVersion; }
void SetShortDescription(const BString& description);
const BString& ShortDescription() const
@ -323,7 +326,7 @@ private:
private:
BitmapRef fIcon;
BString fTitle;
BString fVersion;
BPackageVersion fVersion;
PublisherInfo fPublisher;
BString fShortDescription;
BString fFullDescription;

2
src/apps/haikudepot/ui/MainWindow.cpp
View File

@ -641,7 +641,7 @@ MainWindow::_RefreshPackageList()
modelInfo.SetTo(new(std::nothrow) PackageInfo(
repoPackageInfo.Name(),
repoPackageInfo.Version().ToString(),
repoPackageInfo.Version(),
PublisherInfo(BitmapRef(), publisherName,
"", publisherURL), repoPackageInfo.Summary(),
repoPackageInfo.Description(),

2
src/apps/haikudepot/ui/PackageInfoView.cpp
View File

@ -514,7 +514,7 @@ public:
fPublisherView->SetText(publisher);
BString version = B_TRANSLATE("%Version%");
version.ReplaceAll("%Version%", package.Version());
version.ReplaceAll("%Version%", package.Version().ToString());
fVersionInfo->SetText(version);
RatingSummary ratingSummary = package.CalculateRatingSummary();