* made resolvable expression operator an enum instead of a string

* fixed a couple of copy'n'paste bugs during parsing of resolvable
  expression lists (they were all added as 'requires')


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40353 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2011-02-04 17:34:19 +00:00
parent 26a912cd34
commit 531d191219
3 changed files with 46 additions and 21 deletions
@@ -8,6 +8,7 @@
#include <String.h>
#include <package/PackageResolvableOperator.h>
#include <package/PackageVersion.h>
@@ -34,27 +35,32 @@ public:
BPackageResolvableExpression();
BPackageResolvableExpression(
const BString& name,
const BString& _operator = "",
BPackageResolvableOperator _op
= B_PACKAGE_RESOLVABLE_OP_ENUM_COUNT,
const BPackageVersion& version
= BPackageVersion());
status_t InitCheck() const;
const BString& Name() const;
const BString& Operator() const;
BPackageResolvableOperator Operator() const;
const BPackageVersion& Version() const;
BString AsString() const;
void SetTo(const BString& name,
const BString& _operator = "",
BPackageResolvableOperator _op
= B_PACKAGE_RESOLVABLE_OP_ENUM_COUNT,
const BPackageVersion& version
= BPackageVersion());
void Clear();
public:
static const char* kOperatorNames[];
private:
BString fName;
BString fOperator;
BPackageResolvableOperator fOperator;
BPackageVersion fVersion;
};