From 38f02085b919767ce9098faf639c77ffc214be39 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <schubi@suse.de>
Date: Tue, 15 Apr 2008 09:16:47 +0000
Subject: [PATCH] cleanup in DEFINE_PTR_TYPE

---
 zypp/solver/detail/SolverQueueItem.h             | 2 +-
 zypp/solver/detail/SolverQueueItemDelete.h       | 2 --
 zypp/solver/detail/SolverQueueItemInstall.h      | 2 --
 zypp/solver/detail/SolverQueueItemInstallOneOf.h | 3 ---
 zypp/solver/detail/SolverQueueItemUpdate.h       | 3 ---
 zypp/solver/detail/Types.h                       | 6 +++++-
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/zypp/solver/detail/SolverQueueItem.h b/zypp/solver/detail/SolverQueueItem.h
index bfa5f08..30b463f 100644
--- a/zypp/solver/detail/SolverQueueItem.h
+++ b/zypp/solver/detail/SolverQueueItem.h
@@ -25,6 +25,7 @@
 #include <list>
 #include <string>
 
+#include "zypp/solver/detail/Types.h"
 #include "zypp/base/ReferenceCounted.h"
 #include "zypp/base/NonCopyable.h"
 #include "zypp/base/PtrTypes.h"
@@ -48,7 +49,6 @@ typedef enum {
     QUEUE_ITEM_TYPE_INSTALL_ONE_OF,    
 } SolverQueueItemType;
 
-DEFINE_PTR_TYPE(SolverQueueItem);
 	
 typedef std::list<SolverQueueItem_Ptr> SolverQueueItemList;
 
diff --git a/zypp/solver/detail/SolverQueueItemDelete.h b/zypp/solver/detail/SolverQueueItemDelete.h
index 7580a9b..29adeb8 100644
--- a/zypp/solver/detail/SolverQueueItemDelete.h
+++ b/zypp/solver/detail/SolverQueueItemDelete.h
@@ -37,8 +37,6 @@ namespace zypp
     namespace detail
     { ///////////////////////////////////////////////////////////////////
 
-DEFINE_PTR_TYPE(SolverQueueItemDelete);
-	
 
 ///////////////////////////////////////////////////////////////////
 //
diff --git a/zypp/solver/detail/SolverQueueItemInstall.h b/zypp/solver/detail/SolverQueueItemInstall.h
index 44ee3cd..06220ba 100644
--- a/zypp/solver/detail/SolverQueueItemInstall.h
+++ b/zypp/solver/detail/SolverQueueItemInstall.h
@@ -36,8 +36,6 @@ namespace zypp
     namespace detail
     { ///////////////////////////////////////////////////////////////////
 
-DEFINE_PTR_TYPE(SolverQueueItemInstall);
-	
 
 ///////////////////////////////////////////////////////////////////
 //
diff --git a/zypp/solver/detail/SolverQueueItemInstallOneOf.h b/zypp/solver/detail/SolverQueueItemInstallOneOf.h
index 78f806b..5a8f274 100644
--- a/zypp/solver/detail/SolverQueueItemInstallOneOf.h
+++ b/zypp/solver/detail/SolverQueueItemInstallOneOf.h
@@ -36,9 +36,6 @@ namespace zypp
     namespace detail
     { ///////////////////////////////////////////////////////////////////
 
-DEFINE_PTR_TYPE(SolverQueueItemInstallOneOf);
-	
-
 ///////////////////////////////////////////////////////////////////
 //
 //	CLASS NAME : SolverQueueItemInstallOneOf
diff --git a/zypp/solver/detail/SolverQueueItemUpdate.h b/zypp/solver/detail/SolverQueueItemUpdate.h
index 1fd3ce5..c307b7e 100644
--- a/zypp/solver/detail/SolverQueueItemUpdate.h
+++ b/zypp/solver/detail/SolverQueueItemUpdate.h
@@ -37,9 +37,6 @@ namespace zypp
     namespace detail
     { ///////////////////////////////////////////////////////////////////
 
-DEFINE_PTR_TYPE(SolverQueueItemUpdate);
-	
-
 ///////////////////////////////////////////////////////////////////
 //
 //	CLASS NAME : SolverQueueItemUpdate
diff --git a/zypp/solver/detail/Types.h b/zypp/solver/detail/Types.h
index b24ebad..8bb9b4b 100644
--- a/zypp/solver/detail/Types.h
+++ b/zypp/solver/detail/Types.h
@@ -58,7 +58,11 @@ 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);	
       
       ///////////////////////////////////////////////////////////////////
     };// namespace detail
-- 
2.7.4