Imported Upstream version 14.45.0

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

diff --git a/zypp/solver/detail/SolutionAction.h b/zypp/solver/detail/SolutionAction.h
index 9fff7a6..84b49db 100644 (file)
--- a/zypp/solver/detail/SolutionAction.h
+++ b/zypp/solver/detail/SolutionAction.h
@@ -8,9 +8,6 @@
 
 #ifndef ZYPP_SOLVER_DETAIL_SOLUTIONACTION_H
 #define ZYPP_SOLVER_DETAIL_SOLUTIONACTION_H
-#ifndef ZYPP_USE_RESOLVER_INTERNALS
-#error Do not directly include this file!
-#else
 
 #include <list>
 #include <string>
@@ -18,7 +15,12 @@
 #include "zypp/base/ReferenceCounted.h"
 #include "zypp/base/PtrTypes.h"
 
-#include "zypp/PoolItem.h"
+#include "zypp/Dep.h"
+#include "zypp/Capability.h"
+
+#include "zypp/solver/detail/Types.h"
+#include "zypp/solver/detail/Resolver.h"
+#include "zypp/solver/detail/SolverQueueItem.h"
 
 /////////////////////////////////////////////////////////////////////////
 namespace zypp
@@ -30,20 +32,12 @@ namespace zypp
     namespace detail
     { ///////////////////////////////////////////////////////////////////
 
-      class Resolver;
-
-      DEFINE_PTR_TYPE(SolverQueueItem);
-
-      DEFINE_PTR_TYPE(SolutionAction);
-      typedef std::list<SolutionAction_Ptr> SolutionActionList;
-
        /**
         * Abstract base class for one action of a problem solution.
         **/
        class SolutionAction : public base::ReferenceCounted
        {
        protected:
-           typedef Resolver ResolverInternal;
            SolutionAction ();
        public:
            virtual ~SolutionAction();
@@ -53,13 +47,14 @@ namespace zypp
            friend std::ostream& operator<<(std::ostream & str, const SolutionAction & action)
                { return action.dumpOn (str); }
            friend std::ostream& operator<<(std::ostream & str, const SolutionActionList & actionlist);
+           friend std::ostream& operator<<(std::ostream & str, const CSolutionActionList & actionlist);
 
            // ---------------------------------- methods
            /**
             * Execute this action.
             * Returns 'true' on success, 'false' on error.
             **/
-           virtual bool execute (ResolverInternal & resolver) const = 0;
+           virtual bool execute (Resolver & resolver) const = 0;
        };
 
 
@@ -117,7 +112,7 @@ namespace zypp
          TransactionKind action() const { return _action; }
 
          // ---------------------------------- methods
-           virtual bool execute(ResolverInternal & resolver) const;
+           virtual bool execute(Resolver & resolver) const;
 
        protected:
 
@@ -165,7 +160,7 @@ namespace zypp
            const PoolItem item() const { return _item; }
 
          // ---------------------------------- methods
-           virtual bool execute(ResolverInternal & resolver) const;
+           virtual bool execute(Resolver & resolver) const;
 
        protected:
            PoolItem _item;
@@ -182,6 +177,6 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////////
 };// namespace zypp
 /////////////////////////////////////////////////////////////////////////
-#endif // ZYPP_USE_RESOLVER_INTERNALS
+
 #endif // ZYPP_SOLVER_DETAIL_SOLUTIONACTION_H