From: Stefan Schubert Date: Wed, 2 Apr 2008 12:01:12 +0000 (+0000) Subject: moving isSatisfied from ResStatus X-Git-Tag: BASE-SuSE-Code-12_2-Branch~145 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e30c367362be4fe8f9fa4a7e51de20f855c8c5a2;p=platform%2Fupstream%2Flibzypp-bindings.git moving isSatisfied from ResStatus --- diff --git a/swig/ResStatus.i b/swig/ResStatus.i index 1e02d4c..4beb9e4 100644 --- a/swig/ResStatus.i +++ b/swig/ResStatus.i @@ -23,8 +23,7 @@ class ResStatus typedef bit::BitField 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 @@ class ResStatus 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 @@ class ResStatus bool isToBeUninstalled() const { return isInstalled() && transacts(); } - bool isUndetermined() const - { return fieldValueIs( UNDETERMINED ); } - - bool isEstablishedUneeded() const - { return fieldValueIs( UNNEEDED ); } - - bool isEstablishedSatisfied() const - { return fieldValueIs( SATISFIED ); } - - bool isEstablishedIncomplete() const - { return fieldValueIs( INCOMPLETE ); } - - bool isUnneeded() const - { return isUninstalled() && fieldValueIs( UNNEEDED ); } - - bool isSatisfied() const - { return isUninstalled() && fieldValueIs( SATISFIED ); } - - bool isComplete () const - { return isInstalled() && fieldValueIs( SATISFIED ); } - - bool isIncomplete() const - { return isInstalled() && fieldValueIs( INCOMPLETE ); } - - bool isNeeded() const - { return isUninstalled() && fieldValueIs( INCOMPLETE ); } - bool isLocked() const { return fieldValueIs( LOCKED ); } @@ -266,30 +231,6 @@ class ResStatus return true; } - bool setUndetermined () - { - fieldValueAssign(UNDETERMINED); - return true; - } - - bool setUnneeded () - { - fieldValueAssign(UNNEEDED); - return true; - } - - bool setSatisfied () - { - fieldValueAssign(SATISFIED); - return true; - } - - bool setIncomplete () - { - fieldValueAssign(INCOMPLETE); - return true; - } - bool isSeen () const { return fieldValueIs( SEEN ); } @@ -334,7 +275,6 @@ class ResStatus 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,