Remove resolvable provides type
* Remove BPackageResolvableType and respective property from BPackageResolvable. * Remove package attribute B_HPKG_ATTRIBUTE_ID_PACKAGE_PROVIDES_TYPE.
This commit is contained in:
@@ -8,7 +8,6 @@
|
||||
|
||||
#include <String.h>
|
||||
|
||||
#include <package/PackageResolvableType.h>
|
||||
#include <package/PackageVersion.h>
|
||||
|
||||
|
||||
@@ -49,8 +48,6 @@ public:
|
||||
BPackageResolvable(
|
||||
const BPackageResolvableData& data);
|
||||
BPackageResolvable(const BString& name,
|
||||
BPackageResolvableType type
|
||||
= B_PACKAGE_RESOLVABLE_TYPE_DEFAULT,
|
||||
const BPackageVersion& version
|
||||
= BPackageVersion(),
|
||||
const BPackageVersion& compatibleVersion
|
||||
@@ -59,27 +56,20 @@ public:
|
||||
status_t InitCheck() const;
|
||||
|
||||
const BString& Name() const;
|
||||
BPackageResolvableType Type() const;
|
||||
const BPackageVersion& Version() const;
|
||||
const BPackageVersion& CompatibleVersion() const;
|
||||
|
||||
BString ToString() const;
|
||||
|
||||
void SetTo(const BString& name,
|
||||
BPackageResolvableType type
|
||||
= B_PACKAGE_RESOLVABLE_TYPE_DEFAULT,
|
||||
const BPackageVersion& version
|
||||
= BPackageVersion(),
|
||||
const BPackageVersion& compatibleVersion
|
||||
= BPackageVersion());
|
||||
void Clear();
|
||||
|
||||
public:
|
||||
static const char* kTypeNames[];
|
||||
|
||||
private:
|
||||
BString fName;
|
||||
BPackageResolvableType fType;
|
||||
BPackageVersion fVersion;
|
||||
BPackageVersion fCompatibleVersion;
|
||||
};
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
/*
|
||||
* Copyright 2011, Haiku, Inc.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
#ifndef _PACKAGE__PACKAGE_RESOLVABLE_TYPE_H_
|
||||
#define _PACKAGE__PACKAGE_RESOLVABLE_TYPE_H_
|
||||
|
||||
|
||||
namespace BPackageKit {
|
||||
|
||||
|
||||
enum BPackageResolvableType {
|
||||
B_PACKAGE_RESOLVABLE_TYPE_DEFAULT = 0,
|
||||
B_PACKAGE_RESOLVABLE_TYPE_LIBRARY = 1,
|
||||
B_PACKAGE_RESOLVABLE_TYPE_COMMAND = 2,
|
||||
B_PACKAGE_RESOLVABLE_TYPE_APPLICATION = 3,
|
||||
B_PACKAGE_RESOLVABLE_TYPE_ADD_ON = 4,
|
||||
//
|
||||
B_PACKAGE_RESOLVABLE_TYPE_ENUM_COUNT,
|
||||
};
|
||||
|
||||
|
||||
} // namespace BPackageKit
|
||||
|
||||
|
||||
#endif // _PACKAGE__PACKAGE_RESOLVABLE_TYPE_H_
|
||||
@@ -116,19 +116,18 @@ enum BHPKGAttributeID {
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_COPYRIGHT = 29,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_LICENSE = 30,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_PROVIDES = 31,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_PROVIDES_TYPE = 32,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_REQUIRES = 33,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_SUPPLEMENTS = 34,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_CONFLICTS = 35,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_FRESHENS = 36,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_REPLACES = 37,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_RESOLVABLE_OPERATOR = 38,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_CHECKSUM = 39,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_VERSION_PRE_RELEASE = 40,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_PROVIDES_COMPATIBLE = 41,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_URL = 42,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_SOURCE_URL = 43,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_INSTALL_PATH = 44,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_REQUIRES = 32,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_SUPPLEMENTS = 33,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_CONFLICTS = 34,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_FRESHENS = 35,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_REPLACES = 36,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_RESOLVABLE_OPERATOR = 37,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_CHECKSUM = 38,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_VERSION_PRE_RELEASE = 39,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_PROVIDES_COMPATIBLE = 40,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_URL = 41,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_SOURCE_URL = 42,
|
||||
B_HPKG_ATTRIBUTE_ID_PACKAGE_INSTALL_PATH = 43,
|
||||
//
|
||||
B_HPKG_ATTRIBUTE_ID_ENUM_COUNT,
|
||||
};
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
#include <package/PackageArchitecture.h>
|
||||
#include <package/PackageInfoAttributes.h>
|
||||
#include <package/PackageResolvableOperator.h>
|
||||
#include <package/PackageResolvableType.h>
|
||||
|
||||
|
||||
namespace BPackageKit {
|
||||
@@ -31,7 +30,6 @@ struct BPackageVersionData {
|
||||
|
||||
|
||||
struct BPackageResolvableData {
|
||||
BPackageResolvableType type;
|
||||
const char* name;
|
||||
bool haveVersion;
|
||||
bool haveCompatibleVersion;
|
||||
|
||||
Reference in New Issue
Block a user