Author: schubi2
Date: Wed Apr 2 14:01:12 2008
New Revision: 9340
URL: http://svn.opensuse.org/viewcvs/zypp?rev=9340&view=rev
Log:
moving isSatisfied from ResStatus
Modified:
trunk/libzypp-bindings/swig/ResStatus.i
Modified: trunk/libzypp-bindings/swig/ResStatus.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ResStatus.i?rev=9340&r1=9339&r2=9340&view=diff
==============================================================================
--- trunk/libzypp-bindings/swig/ResStatus.i (original)
+++ trunk/libzypp-bindings/swig/ResStatus.i Wed Apr 2 14:01:12 2008
@@ -23,8 +23,7 @@
typedef bit::BitField<FieldType> BitFieldType;
// Bit Ranges within FieldType defined by 1st bit and size:
typedef bit::Range StateField;
- typedef bit::Range EstablishField;
- typedef bit::Range TransactField;
+ typedef bit::Range TransactField;
typedef bit::Range TransactByField;
typedef bit::Range TransactDetailField;
typedef bit::Range SolverStateField;
@@ -48,13 +47,6 @@
UNINSTALLED = bit::RangeValue::value,
INSTALLED = bit::RangeValue::value
};
- enum EstablishValue
- {
- UNDETERMINED = bit::RangeValue::value,
- UNNEEDED = bit::RangeValue::value, // has freshens, none trigger
- SATISFIED = bit::RangeValue::value, // has none or triggered freshens, all requirements fulfilled
- INCOMPLETE = bit::RangeValue::value // installed: has none or triggered freshens, requirements unfulfilled
- };
enum TransactValue
{
KEEP_STATE = bit::RangeValue::value,
@@ -154,33 +146,6 @@
bool isToBeUninstalled() const
{ return isInstalled() && transacts(); }
- bool isUndetermined() const
- { return fieldValueIs<EstablishField>( UNDETERMINED ); }
-
- bool isEstablishedUneeded() const
- { return fieldValueIs<EstablishField>( UNNEEDED ); }
-
- bool isEstablishedSatisfied() const
- { return fieldValueIs<EstablishField>( SATISFIED ); }
-
- bool isEstablishedIncomplete() const
- { return fieldValueIs<EstablishField>( INCOMPLETE ); }
-
- bool isUnneeded() const
- { return isUninstalled() && fieldValueIs<EstablishField>( UNNEEDED ); }
-
- bool isSatisfied() const
- { return isUninstalled() && fieldValueIs<EstablishField>( SATISFIED ); }
-
- bool isComplete () const
- { return isInstalled() && fieldValueIs<EstablishField>( SATISFIED ); }
-
- bool isIncomplete() const
- { return isInstalled() && fieldValueIs<EstablishField>( INCOMPLETE ); }
-
- bool isNeeded() const
- { return isUninstalled() && fieldValueIs<EstablishField>( INCOMPLETE ); }
-
bool isLocked() const
{ return fieldValueIs<TransactField>( LOCKED ); }
@@ -266,30 +231,6 @@
return true;
}
- bool setUndetermined ()
- {
- fieldValueAssign<EstablishField>(UNDETERMINED);
- return true;
- }
-
- bool setUnneeded ()
- {
- fieldValueAssign<EstablishField>(UNNEEDED);
- return true;
- }
-
- bool setSatisfied ()
- {
- fieldValueAssign<EstablishField>(SATISFIED);
- return true;
- }
-
- bool setIncomplete ()
- {
- fieldValueAssign<EstablishField>(INCOMPLETE);
- return true;
- }
-
bool isSeen () const
{ return fieldValueIs<SolverStateField>( SEEN ); }
@@ -334,7 +275,6 @@
private:
/** Ctor for intialization of builtin constants. */
ResStatus( StateValue s,
- EstablishValue e = UNDETERMINED,
TransactValue t = KEEP_STATE,
InstallDetailValue i = EXPLICIT_INSTALL,
RemoveDetailValue r = EXPLICIT_REMOVE,
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
