Imported Upstream version 16.3.2

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

diff --git a/zypp/Resolver.h b/zypp/Resolver.h
index dd71fd2..aaeffbe 100644 (file)
--- a/zypp/Resolver.h
+++ b/zypp/Resolver.h
@@ -19,9 +19,15 @@
 #include "zypp/base/PtrTypes.h"
 
 #include "zypp/ResPool.h"
-#include "zypp/solver/detail/Resolver.h"
-#include "zypp/solver/detail/SolverQueueItem.h"
+#include "zypp/PoolItem.h"
+#include "zypp/Capabilities.h"
+#include "zypp/Capability.h"
+
+#include "zypp/solver/detail/Types.h"
+
 #include "zypp/ProblemTypes.h"
+#include "zypp/ResolverProblem.h"
+#include "zypp/ProblemSolution.h"
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp
@@ -247,22 +253,22 @@ namespace zypp
     //@{
     /** dup mode: allow to downgrade installed solvable */
     void dupSetAllowDowngrade( bool yesno_r );
-    void dupSetDefaultAllowDowngrade();        // Set back to default
+    void dupSetDefaultAllowDowngrade();                // Set back to default (in zypp.conf)
     bool dupAllowDowngrade() const;
 
     /** dup mode: allow to change name of installed solvable */
     void dupSetAllowNameChange( bool yesno_r );
-    void dupSetDefaultAllowNameChange();       // Set back to default
+    void dupSetDefaultAllowNameChange();       // Set back to default (in zypp.conf)
     bool dupAllowNameChange() const;
 
     /** dup mode: allow to change architecture of installed solvables */
     void dupSetAllowArchChange( bool yesno_r );
-    void dupSetDefaultAllowArchChange();       // Set back to default
+    void dupSetDefaultAllowArchChange();       // Set back to default (in zypp.conf)
     bool dupAllowArchChange() const;
 
     /**  dup mode: allow to change vendor of installed solvables*/
     void dupSetAllowVendorChange( bool yesno_r );
-    void dupSetDefaultAllowVendorChange();     // Set back to default
+    void dupSetDefaultAllowVendorChange();     // Set back to default (in zypp.conf)
     bool dupAllowVendorChange() const;
     //@}
 
@@ -280,6 +286,11 @@ namespace zypp
     void addUpgradeRepo( Repository repo_r );
 
     /**
+     * Whether there is at least one \c UpgradeRepo request pending
+     */
+    bool upgradingRepos() const;
+
+    /**
      * Whether there is an \c UpgradeRepo request pending for this repo.
      */
     bool upgradingRepo( Repository repo_r ) const;
@@ -407,9 +418,7 @@ namespace zypp
 
   private:
     friend std::ostream & operator<<( std::ostream & str, const Resolver & obj );
-
-    typedef solver::detail::Resolver Impl;
-    zypp::RW_pointer<Impl,rw_pointer::Intrusive<Impl> > _pimpl;
+    zypp::RW_pointer<solver::detail::ResolverInternal> _pimpl;
   };
   ///////////////////////////////////////////////////////////////////