From 005043801fcb690ed7cc190d007f2ab8dac1bf4b Mon Sep 17 00:00:00 2001
From: Simon Hausmann <hausmann@kde.org>
Date: Sat, 28 Aug 2004 13:31:15 +0000
Subject: [PATCH] - these three (duplicated) Delete templates conflict with the
 globally   defined 'Delete' enum value from kmpopheaders.h (different types
 for   same symbol). I figured it's easier to rename the three templates to  
 DeleteObject instead of changing the enum value.

svn path=/trunk/kdepim/; revision=342147
---
 kmcomposewin.cpp             | 8 +++++---
 rulewidgethandlermanager.cpp | 4 ++--
 urlhandlermanager.cpp        | 6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp
index 023724527..f8741407a 100644
--- a/kmcomposewin.cpp
+++ b/kmcomposewin.cpp
@@ -325,10 +325,12 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
   mDone = true;
 }
 
+namespace {
 template <typename T>
-inline void Delete( const T * t ) {
+inline void DeleteObject( const T * t ) {
   delete t; t = 0;
 }
+}
 
 //-----------------------------------------------------------------------------
 KMComposeWin::~KMComposeWin()
@@ -353,7 +355,7 @@ KMComposeWin::~KMComposeWin()
     job->kill();
     it = mMapAtmLoadData.begin();
   }
-  std::for_each( mComposedMessages.begin(), mComposedMessages.end(), Delete<KMMessage> );
+  std::for_each( mComposedMessages.begin(), mComposedMessages.end(), DeleteObject<KMMessage> );
 }
 
 //-----------------------------------------------------------------------------
@@ -1762,7 +1764,7 @@ void KMComposeWin::applyChanges( bool dontSignNorEncrypt, bool dontDisable )
 
 void KMComposeWin::slotComposerDone( bool rc )
 {
-  std::for_each( mComposedMessages.begin(), mComposedMessages.end(), Delete<KMMessage> );
+  std::for_each( mComposedMessages.begin(), mComposedMessages.end(), DeleteObject<KMMessage> );
   mComposedMessages = mComposer->composedMessageList();
   emit applyChangesDone( rc );
   delete mComposer;
diff --git a/rulewidgethandlermanager.cpp b/rulewidgethandlermanager.cpp
index c5c5d55bb..25dadff8f 100644
--- a/rulewidgethandlermanager.cpp
+++ b/rulewidgethandlermanager.cpp
@@ -206,14 +206,14 @@ KMail::RuleWidgetHandlerManager::RuleWidgetHandlerManager()
 }
 
 namespace {
-  template <typename T> struct Delete {
+  template <typename T> struct DeleteObject {
     void operator()( const T * x ) { delete x; x = 0; }
   };
 }
 
 KMail::RuleWidgetHandlerManager::~RuleWidgetHandlerManager()
 {
-  for_each( mHandlers.begin(), mHandlers.end(), Delete<RuleWidgetHandler>() );
+  for_each( mHandlers.begin(), mHandlers.end(), DeleteObject<RuleWidgetHandler>() );
 }
 
 void KMail::RuleWidgetHandlerManager::registerHandler( const RuleWidgetHandler * handler )
diff --git a/urlhandlermanager.cpp b/urlhandlermanager.cpp
index ee314bf5f..c2e309244 100644
--- a/urlhandlermanager.cpp
+++ b/urlhandlermanager.cpp
@@ -140,7 +140,7 @@ namespace {
 
 
 namespace {
-  template <typename T> struct Delete {
+  template <typename T> struct DeleteObject {
     void operator()( const T * x ) { delete x; x = 0; }
   };
 }
@@ -170,7 +170,7 @@ private:
 
 KMail::URLHandlerManager::BodyPartURLHandlerManager::~BodyPartURLHandlerManager() {
   for_each( mHandlers.begin(), mHandlers.end(),
-	    Delete<Interface::BodyPartURLHandler>() );
+	    DeleteObject<Interface::BodyPartURLHandler>() );
 }
 
 void KMail::URLHandlerManager::BodyPartURLHandlerManager::registerHandler( const Interface::BodyPartURLHandler * handler ) {
@@ -270,7 +270,7 @@ KMail::URLHandlerManager::URLHandlerManager() {
 
 KMail::URLHandlerManager::~URLHandlerManager() {
   for_each( mHandlers.begin(), mHandlers.end(),
-	    Delete<URLHandler>() );
+	    DeleteObject<URLHandler>() );
 }
 
 void KMail::URLHandlerManager::registerHandler( const URLHandler * handler ) {