ref: refs/heads/master
commit 08e51844d4f0c8205384ecfe35f31805a0d0c018
Author: Michael Andres
Date: Thu Oct 15 17:37:28 2009 +0200
Remove obsolete ResStatus bits.
---
zypp/ResStatus.cc | 8 +-------
zypp/ResStatus.h | 21 ++-------------------
2 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/zypp/ResStatus.cc b/zypp/ResStatus.cc
index 5d93707..083e16c 100644
--- a/zypp/ResStatus.cc
+++ b/zypp/ResStatus.cc
@@ -51,7 +51,7 @@ namespace zypp
{}
- ResStatus::ResStatus (enum StateValue s, enum ValidateValue v, enum TransactValue t, enum InstallDetailValue i, enum RemoveDetailValue r, enum SolverStateValue ssv)
+ ResStatus::ResStatus (enum StateValue s, enum ValidateValue v, enum TransactValue t, enum InstallDetailValue i, enum RemoveDetailValue r)
: _bitfield (s)
{
fieldValueAssign<ValidateField>(v);
@@ -60,9 +60,6 @@ namespace zypp
if (s == INSTALLED) fieldValueAssign<TransactDetailField>(r);
else fieldValueAssign<TransactDetailField>(i);
}
- if (ssv != NORMAL) {
- fieldValueAssign<SolverStateField>(ssv);
- }
}
@@ -91,10 +88,7 @@ namespace zypp
( obj.isToBeUninstalledDueToUpgrade() ? "U" :
( obj.isToBeInstalledSoft() ? "S" : "_" ) ) );
- str << (obj.isSeen() ? "@" : "" );
-
str << (obj.isRecommended() ? "r" : "" );
-
str << (obj.isSuggested() ? "s" : "" );
return str;
diff --git a/zypp/ResStatus.h b/zypp/ResStatus.h
index aa2a3d6..7ff527f 100644
--- a/zypp/ResStatus.h
+++ b/zypp/ResStatus.h
@@ -70,8 +70,7 @@ namespace zypp
typedef bit::Range TransactField;
typedef bit::Range TransactByField;
typedef bit::Range TransactDetailField;
- typedef bit::Range SolverStateField;
- typedef bit::Range LicenceConfirmedField;
+ typedef bit::Range LicenceConfirmedField;
typedef bit::Range WeakField;
typedef bit::Range UserLockQueryField; // internal
// enlarge FieldType if more bit's needed. It's not yet
@@ -117,7 +116,6 @@ namespace zypp
/** Detail for no transact, i.e. reset any Install/RemoveDetailValue. */
NO_DETAIL = bit::RangeValue::value,
};
-
enum InstallDetailValue
{
EXPLICIT_INSTALL = bit::RangeValue::value,
@@ -130,11 +128,6 @@ namespace zypp
DUE_TO_OBSOLETE = bit::RangeValue::value,
DUE_TO_UPGRADE = bit::RangeValue::value
};
- enum SolverStateValue
- {
- NORMAL = bit::RangeValue::value, // default, notthing special
- SEEN = bit::RangeValue::value, // already seen during ResolverUpgrade
- };
enum LicenceConfirmedValue
{
@@ -633,15 +626,6 @@ namespace zypp
return true;
}
- bool isSeen () const
- { return fieldValueIs<SolverStateField>( SEEN ); }
-
- bool setSeen (bool value)
- {
- fieldValueAssign<SolverStateField>( value ? SEEN : NORMAL );
- return true;
- }
-
bool setStatus( ResStatus newStatus_r )
{
// State field is immutable!
@@ -670,8 +654,7 @@ namespace zypp
ValidateValue v = UNDETERMINED,
TransactValue t = KEEP_STATE,
InstallDetailValue i = EXPLICIT_INSTALL,
- RemoveDetailValue r = EXPLICIT_REMOVE,
- SolverStateValue ssv = NORMAL );
+ RemoveDetailValue r = EXPLICIT_REMOVE );
/** Return whether the corresponding Field has value \a val_r.
*/
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org