Imported Upstream version 17.0.0

[platform/upstream/libzypp.git] / zypp / solver / detail / Resolver.h

diff --git a/zypp/solver/detail/Resolver.h b/zypp/solver/detail/Resolver.h
index 22f727c..e28626c 100644 (file)
--- a/zypp/solver/detail/Resolver.h
+++ b/zypp/solver/detail/Resolver.h
@@ -85,16 +85,12 @@ class Resolver : private base::NonCopyable
 
     /** \name Solver flags */
     //@{
-    bool _forceResolve;           // remove items which are conflicts with others or
-                                  // have unfulfilled requirements.
-                                  // This behaviour is favourited by ZMD
     bool _upgradeMode;            // Resolver has been called with doUpgrade
     bool _updateMode;            // Resolver has been called with doUpdate
     bool _verifying;              // The system will be checked
     bool _onlyRequires;          // do install required resolvables only
                                   // no recommended resolvables, language
                                   // packages, hardware packages (modalias)
-    bool _allowVendorChange;   // whether the solver should allow or disallow vendor changes.
     bool _solveSrcPackages;    // whether to generate solver jobs for selected source packges.
     bool _cleandepsOnRemove;   // whether removing a package should also remove no longer needed requirements
 
@@ -174,9 +170,6 @@ class Resolver : private base::NonCopyable
     bool onlyRequires () const                 { return _onlyRequires; }
     void setOnlyRequires( TriBool state_r );
 
-    bool forceResolve()        const                   { return _forceResolve; }
-    void setForceResolve( TriBool state_r )    { _forceResolve = indeterminate(state_r) ? false : bool(state_r); }
-
     bool isUpgradeMode() const                         { return _upgradeMode; }// Resolver has been called with doUpgrade
     void setUpgradeMode( bool yesno_r )                { _upgradeMode = yesno_r; }
 
@@ -186,9 +179,6 @@ class Resolver : private base::NonCopyable
     bool isVerifyingMode() const               { return _verifying; }  // The system will be checked
     void setVerifyingMode( TriBool state_r )   { _verifying = indeterminate(state_r) ? false : bool(state_r); }
 
-    bool allowVendorChange() const             { return _allowVendorChange; }
-    void setAllowVendorChange( TriBool state_r );
-
     bool solveSrcPackages() const              { return _solveSrcPackages; }
     void setSolveSrcPackages( TriBool state_r )        { _solveSrcPackages = indeterminate(state_r) ? false : bool(state_r); }
 
@@ -200,6 +190,13 @@ class Resolver : private base::NonCopyable
     void ZSETTER( TriBool state_r );           \
     bool ZGETTER() const;                      \
 
+    ZOLV_FLAG_TRIBOOL( setForceResolve,                forceResolve )
+
+    ZOLV_FLAG_TRIBOOL( setAllowDowngrade,      allowDowngrade )
+    ZOLV_FLAG_TRIBOOL( setAllowNameChange,     allowNameChange )
+    ZOLV_FLAG_TRIBOOL( setAllowArchChange,     allowArchChange )
+    ZOLV_FLAG_TRIBOOL( setAllowVendorChange,   allowVendorChange )
+
     ZOLV_FLAG_TRIBOOL( dupSetAllowDowngrade,   dupAllowDowngrade )
     ZOLV_FLAG_TRIBOOL( dupSetAllowNameChange,  dupAllowNameChange )
     ZOLV_FLAG_TRIBOOL( dupSetAllowArchChange,  dupAllowArchChange )