X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=zypp%2Fsolver%2Fdetail%2FTypes.h;h=f8287a2383785de2d4ff99939567174561c07234;hb=42b5d038414cf4a4a050e816b471f890b24e8032;hp=e50f351d4880e751dac6069ab7bffb872b1c639e;hpb=b61a0ff7e76a542a874714e4ee7753db48f9f8aa;p=platform%2Fupstream%2Flibzypp.git

diff --git a/zypp/solver/detail/Types.h b/zypp/solver/detail/Types.h
index e50f351..f8287a2 100644
--- a/zypp/solver/detail/Types.h
+++ b/zypp/solver/detail/Types.h
@@ -21,58 +21,36 @@
 #ifndef ZYPP_SOLVER_DETAIL_TYPES_H
 #define ZYPP_SOLVER_DETAIL_TYPES_H
 
-#include <iosfwd>
 #include <list>
-#include <set>
-#include <map>
-#include <string>
-
-#include "zypp/base/ReferenceCounted.h"
-#include "zypp/base/NonCopyable.h"
 #include "zypp/base/PtrTypes.h"
-#include "zypp/base/Functional.h"
-
-#include "zypp/PoolItem.h"
-
-#define _DEBUG(x) DBG << x << std::endl;
-#define _XDEBUG(x) do { if (base::logger::isExcessive()) XXX << x << std::endl;} while (0)
-//#define _DEBUG(x)
 
 /////////////////////////////////////////////////////////////////////////
 namespace zypp 
-{ ///////////////////////////////////////////////////////////////////////
+{
   ///////////////////////////////////////////////////////////////////////
   namespace solver
-  { /////////////////////////////////////////////////////////////////////
+  {
     /////////////////////////////////////////////////////////////////////
     namespace detail
-    { ///////////////////////////////////////////////////////////////////
+    {
+      // A few type names exposed in the public API
+      //
+      class Resolver;
+      typedef Resolver ResolverInternal;	///< Preferred name in API
 
-typedef std::list<PoolItem> PoolItemList;
-typedef std::set<PoolItem> PoolItemSet;
-      
-DEFINE_PTR_TYPE(Resolver);
+      class ItemCapKind;
+      typedef std::list<ItemCapKind> ItemCapKindList;
 
-DEFINE_PTR_TYPE(SolutionAction);
-typedef std::list<SolutionAction_Ptr> SolutionActionList;
-typedef std::list<SolutionAction_constPtr> CSolutionActionList;
-DEFINE_PTR_TYPE(TransactionSolutionAction);
-DEFINE_PTR_TYPE(InjectSolutionAction);
-DEFINE_PTR_TYPE(SolverQueueItem);
-DEFINE_PTR_TYPE(SolverQueueItemUpdate);
-DEFINE_PTR_TYPE(SolverQueueItemDelete);
-DEFINE_PTR_TYPE(SolverQueueItemInstall);	
-DEFINE_PTR_TYPE(SolverQueueItemInstallOneOf);
-DEFINE_PTR_TYPE(SolverQueueItemLock);		
-      
-      ///////////////////////////////////////////////////////////////////
-    };// namespace detail
-    /////////////////////////////////////////////////////////////////////
+      DEFINE_PTR_TYPE(SolverQueueItem);
+      typedef std::list<SolverQueueItem_Ptr> SolverQueueItemList;
+
+      DEFINE_PTR_TYPE(SolutionAction);
+      typedef std::list<SolutionAction_Ptr> SolutionActionList;
+
+    } // namespace detail
     /////////////////////////////////////////////////////////////////////
-  };// namespace solver
+  } // namespace solver
   ///////////////////////////////////////////////////////////////////////
-  ///////////////////////////////////////////////////////////////////////
-};// namespace zypp
+} // namespace zypp
 /////////////////////////////////////////////////////////////////////////
-
 #endif // ZYPP_SOLVER_DETAIL_TYPES_H