using Dep

diff --git a/zypp/solver/detail/SolutionAction.cc b/zypp/solver/detail/SolutionAction.cc
index 96a9750..961e154 100644 (file)
--- a/zypp/solver/detail/SolutionAction.cc
+++ b/zypp/solver/detail/SolutionAction.cc
@@ -128,7 +128,7 @@ InjectSolutionAction::toString ( const InjectSolutionAction & action )
 {
     string ret ("InjectSolutionAction: ");
     ret += action._capability.asString();
-    ret += action._kind == PROVIDE ? "(provide)" : "(conflict)";
+    ret += action._kind.asString();
     ret += "\n";
     return ret;
 }

diff --git a/zypp/solver/detail/SolutionAction.h b/zypp/solver/detail/SolutionAction.h
index 35f466a..7b4e0fa 100644 (file)
--- a/zypp/solver/detail/SolutionAction.h
+++ b/zypp/solver/detail/SolutionAction.h
@@ -15,6 +15,7 @@
 #include "zypp/base/ReferenceCounted.h"
 #include "zypp/base/PtrTypes.h"
 
+#include "zypp/Dep.h"
 #include "zypp/Capability.h"
 #include "zypp/solver/detail/Resolver.h"
 #include "zypp/solver/detail/ProblemSolutionPtr.h"
@@ -120,13 +121,7 @@ namespace zypp
        {
        public:
            
-           typedef enum
-           {
-               PROVIDE,
-               CONFLICT
-           } CapabilityKind;
-           
-           InjectSolutionAction( const Capability & capability, const CapabilityKind & kind )
+           InjectSolutionAction( const Capability & capability, const Dep & kind )
                : SolutionAction(), _capability( capability ), _kind( kind ) {}
 
          // ---------------------------------- I/O
@@ -148,7 +143,7 @@ namespace zypp
        protected:
 
            const Capability & _capability;
-           const CapabilityKind & _kind;
+           const Dep & _kind;
        };