moved SATResolver to solver/details

diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt
index 4c6f71a..a5b6967 100644 (file)
--- a/zypp/CMakeLists.txt
+++ b/zypp/CMakeLists.txt
@@ -494,7 +494,7 @@ SET( zypp_solver_detail_SRCS
   solver/detail/SolverQueueItemDelete.cc
   solver/detail/SolverQueueItemUpdate.cc
   solver/detail/SolverQueueItemInstallOneOf.cc
-
+  solver/detail/SATResolver.cc
 )
 
 SET( zypp_solver_detail_HEADERS
@@ -515,7 +515,7 @@ SET( zypp_solver_detail_HEADERS
   solver/detail/SolverQueueItemDelete.h
   solver/detail/SolverQueueItemUpdate.h
   solver/detail/SolverQueueItemInstallOneOf.h
-
+  solver/detail/SATResolver.h
 )
 
 INSTALL(  FILES
@@ -531,7 +531,6 @@ SET( zypp_sat_SRCS
   sat/WhatProvides.cc
   sat/LocaleSupport.cc
   sat/LookupAttr.cc
-  sat/SATResolver.cc
   sat/SolvAttr.cc
 )
 
@@ -543,7 +542,6 @@ SET( zypp_sat_HEADERS
   sat/WhatProvides.h
   sat/LocaleSupport.h
   sat/LookupAttr.h
-  sat/SATResolver.h
   sat/SolvAttr.h
 )
 

diff --git a/zypp/solver/detail/InstallOrder.cc b/zypp/solver/detail/InstallOrder.cc
index 5c00180..85c2485 100644 (file)
--- a/zypp/solver/detail/InstallOrder.cc
+++ b/zypp/solver/detail/InstallOrder.cc
@@ -32,10 +32,11 @@
 #include "zypp/base/Iterator.h"
 #include "zypp/base/Algorithm.h"
 
+#include "zypp/solver/detail/SATResolver.h"
+
 #include "zypp/ResFilters.h"
 #include "zypp/ResStatus.h"
 #include "zypp/NameKindProxy.h"
-#include "zypp/sat/SATResolver.h"
 #include "zypp/sat/Pool.h"
 
 /////////////////////////////////////////////////////////////////////////

diff --git a/zypp/solver/detail/Resolver.cc b/zypp/solver/detail/Resolver.cc
index 9f56116..acd50e1 100644 (file)
--- a/zypp/solver/detail/Resolver.cc
+++ b/zypp/solver/detail/Resolver.cc
@@ -23,6 +23,7 @@
 #include "zypp/solver/detail/Resolver.h"
 #include "zypp/solver/detail/Helper.h"
 #include "zypp/solver/detail/Testcase.h"
+#include "zypp/solver/detail/SATResolver.h"
 
 #include "zypp/Capabilities.h"
 #include "zypp/ZConfig.h"
@@ -34,7 +35,6 @@
 #include "zypp/ResFilters.h"
 #include "zypp/sat/Pool.h"
 #include "zypp/sat/Solvable.h"
-#include "zypp/sat/SATResolver.h"
 
 #define MAXSOLVERRUNS 5
 

diff --git a/zypp/solver/detail/ResolverUpgrade.cc b/zypp/solver/detail/ResolverUpgrade.cc
index 71aaf30..db7dcb7 100644 (file)
--- a/zypp/solver/detail/ResolverUpgrade.cc
+++ b/zypp/solver/detail/ResolverUpgrade.cc
@@ -54,11 +54,10 @@
 #include "zypp/solver/detail/Helper.h"
 #include "zypp/solver/detail/Resolver.h"
 #include "zypp/solver/detail/Testcase.h"
+#include "zypp/solver/detail/SATResolver.h"
 #include "zypp/ResolverProblem.h"
 #include "zypp/ProblemSolution.h"
 #include "zypp/Target.h"
-#include "zypp/sat/SATResolver.h"
-
 
 /////////////////////////////////////////////////////////////////////////
 namespace zypp

diff --git a/zypp/solver/detail/Resolver_problems.cc b/zypp/solver/detail/Resolver_problems.cc
index 8682f28..1d61e68 100644 (file)
--- a/zypp/solver/detail/Resolver_problems.cc
+++ b/zypp/solver/detail/Resolver_problems.cc
@@ -23,9 +23,9 @@
 #include <sstream>
 
 #include "zypp/solver/detail/Resolver.h"
+#include "zypp/solver/detail/SATResolver.h"
 #include "zypp/Resolver.h"
 #include "zypp/ResolverProblem.h"
-#include "zypp/sat/SATResolver.h"
 
 #include "zypp/base/String.h"
 #include "zypp/base/Logger.h"

diff --git a/zypp/sat/SATResolver.cc b/zypp/solver/detail/SATResolver.cc
similarity index 99%
rename from zypp/sat/SATResolver.cc
rename to zypp/solver/detail/SATResolver.cc
index 8157eab..5b05b01 100644 (file)
--- a/zypp/sat/SATResolver.cc
+++ b/zypp/solver/detail/SATResolver.cc
@@ -31,9 +31,9 @@
 #include "zypp/ResPool.h"
 #include "zypp/ResFilters.h"
 #include "zypp/ZConfig.h"
-#include "zypp/sat/SATResolver.h"
 #include "zypp/sat/Pool.h"
 #include "zypp/sat/WhatProvides.h"
+#include "zypp/solver/detail/SATResolver.h"
 #include "zypp/solver/detail/ProblemSolutionCombi.h"
 
 extern "C" {

diff --git a/zypp/sat/SATResolver.h b/zypp/solver/detail/SATResolver.h
similarity index 100%
rename from zypp/sat/SATResolver.h
rename to zypp/solver/detail/SATResolver.h