Imported Upstream version 14.45.0

[platform/upstream/libzypp.git] / zypp / ResPool.h

diff --git a/zypp/ResPool.h b/zypp/ResPool.h
index 2657598..a8d37d9 100644 (file)
--- a/zypp/ResPool.h
+++ b/zypp/ResPool.h
@@ -14,7 +14,7 @@
 
 #include <iosfwd>
 
-#include "zypp/base/Deprecated.h"
+#include "zypp/APIConfig.h"
 #include "zypp/base/Iterator.h"
 
 #include "zypp/pool/PoolTraits.h"
@@ -27,6 +27,7 @@ namespace zypp
 
   class SerialNumber;
   class ResPoolProxy;
+  class Resolver;
 
   ///////////////////////////////////////////////////////////////////
   //
@@ -62,6 +63,9 @@ namespace zypp
       /** preliminary */
       ResPoolProxy proxy() const;
 
+      /** The Resolver */
+      Resolver & resolver() const;
+
     public:
       /** The pools serial number. Changing whenever the
        * whenever the content changes. (Resolvables or
@@ -303,7 +307,7 @@ namespace zypp
       */
       const LocaleSet & getRequestedLocales() const;
 
-      /** Wheter this \ref Locale is in the set of requested locales. */
+      /** Whether this \ref Locale is in the set of requested locales. */
       bool isRequestedLocale( const Locale & locale_r ) const;
 
       /** Get the set of available locales.
@@ -312,46 +316,11 @@ namespace zypp
        */
       const LocaleSet & getAvailableLocales() const;
 
-      /** Wheter this \ref Locale is in the set of available locales. */
+      /** Whether this \ref Locale is in the set of available locales. */
       bool isAvailableLocale( const Locale & locale_r ) const;
       //@}
 
     public:
-      /** \name Handle automatic soft-locks.
-       *
-       * Solvables with and ident listed here are per default created with
-       * a setSoftLock applied. I.e. the \ref Resolver should not automatically
-       * select them, if they are just recommended.
-       *
-       * This list is considered when adding new repos to the pool. It is
-       * \b not the list of currently softLocked items.
-       *
-       * Mainly used to re-apply soft-locks remembered during the last commit.
-       */
-      //@{
-      typedef pool::PoolTraits::AutoSoftLocks          AutoSoftLocks;
-      typedef pool::PoolTraits::autoSoftLocks_iterator autoSoftLocks_iterator;
-
-      bool autoSoftLocksEmpty() const;
-      size_type autoSoftLocksSize() const;
-      autoSoftLocks_iterator autoSoftLocksBegin() const;
-      autoSoftLocks_iterator autoSoftLocksEnd() const;
-
-      /** Set a new soft-lock list.
-       * The soft-locks of existing PoolItems are adjusted according
-       * to the list. (usually called on target load)
-      */
-      void setAutoSoftLocks( const AutoSoftLocks & newLocks_r );
-
-      /** Suggest a new soft-lock list based on the current selection.
-       * Based on the the current soft-lock list. Items tagged to be
-       * installed are removed, and those tagged to be deleted are added.
-       * (usually remembered on commit).
-      */
-      void getActiveSoftLocks( AutoSoftLocks & activeLocks_r );
-      //@}
-
-    public:
       /** \name Handle hard locks (e.g set from /etc/zypp/locks).
        *
        * As this kind of lock is query based, it's quite expensive.