* added some missing method implementations in BPackageResolvable

and BPackageResolvableExpression
* switched GetAsString() to a AsString() as that's much more convenient
  and nothing can go wrong anyway


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40347 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2011-02-01 22:01:17 +00:00
parent cb16f69582
commit 2f7778f375
6 changed files with 97 additions and 20 deletions
+1 -1
View File
@@ -61,7 +61,7 @@ public:
BPackageResolvableType Type() const;
const BPackageVersion& Version() const;
void GetAsString(BString& string) const;
BString AsString() const;
void SetTo(const BString& name,
BPackageResolvableType type
@@ -44,7 +44,7 @@ public:
const BString& Operator() const;
const BPackageVersion& Version() const;
void GetAsString(BString& string) const;
BString AsString() const;
void SetTo(const BString& name,
const BString& _operator = "",
+6 -1
View File
@@ -21,7 +21,12 @@ public:
status_t InitCheck() const;
void GetAsString(BString& string) const;
const BString& Major() const;
const BString& Minor() const;
const BString& Micro() const;
uint8 Release() const;
BString AsString() const;
void SetTo(const BString& major,
const BString& minor, const BString& micro,
+28 -7
View File
@@ -44,16 +44,37 @@ BPackageResolvable::InitCheck() const
}
void
BPackageResolvable::GetAsString(BString& string) const
const BString&
BPackageResolvable::Name() const
{
return fName;
}
BPackageResolvableType
BPackageResolvable::Type() const
{
return fType;
}
const BPackageVersion&
BPackageResolvable::Version() const
{
return fVersion;
}
BString
BPackageResolvable::AsString() const
{
// the type is part of the name
string = fName;
BString string = fName;
if (fVersion.InitCheck() == B_OK) {
string << '=';
fVersion.GetAsString(string);
}
if (fVersion.InitCheck() == B_OK)
string << '=' << fVersion.AsString();
return string;
}
@@ -42,15 +42,36 @@ BPackageResolvableExpression::InitCheck() const
}
void
BPackageResolvableExpression::GetAsString(BString& string) const
const BString&
BPackageResolvableExpression::Name() const
{
string = fName;
return fName;
}
if (fVersion.InitCheck() == B_OK) {
string << fOperator;
fVersion.GetAsString(string);
}
const BString&
BPackageResolvableExpression::Operator() const
{
return fOperator;
}
const BPackageVersion&
BPackageResolvableExpression::Version() const
{
return fVersion;
}
BString
BPackageResolvableExpression::AsString() const
{
BString string = fName;
if (fVersion.InitCheck() == B_OK)
string << fOperator << fVersion.AsString();
return string;
}
+33 -3
View File
@@ -38,6 +38,34 @@ BPackageVersion::InitCheck() const
}
const BString&
BPackageVersion::Major() const
{
return fMajor;
}
const BString&
BPackageVersion::Minor() const
{
return fMinor;
}
const BString&
BPackageVersion::Micro() const
{
return fMicro;
}
uint8
BPackageVersion::Release() const
{
return fRelease;
}
int
BPackageVersion::Compare(const BPackageVersion& other) const
{
@@ -57,10 +85,10 @@ BPackageVersion::Compare(const BPackageVersion& other) const
}
void
BPackageVersion::GetAsString(BString& string) const
BString
BPackageVersion::AsString() const
{
string = fMajor;
BString string = fMajor;
if (fMinor.Length() > 0) {
string << '.' << fMinor;
@@ -70,6 +98,8 @@ BPackageVersion::GetAsString(BString& string) const
if (fRelease > 0)
string << '-' << fRelease;
return string;
}