Patch from #100725 to fix build problem on IRIX. Approved by Marc Mutz.

BUG: 100725

svn path=/trunk/kdepim/; revision=394641

rulewidgethandlermanager.cpp

@@ -209,7 +209,8 @@ KMail::RuleWidgetHandlerManager::RuleWidgetHandlerManager()
 
 KMail::RuleWidgetHandlerManager::~RuleWidgetHandlerManager()
 {
-  for_each( mHandlers.begin(), mHandlers.end(), DeleteAndSetToZero<RuleWidgetHandler> );
+  for_each( mHandlers.begin(), mHandlers.end(),
+	    DeleteAndSetToZero<RuleWidgetHandler>() );
 }
 
 void KMail::RuleWidgetHandlerManager::registerHandler( const RuleWidgetHandler * handler )

stl_util.h

@@ -33,9 +33,9 @@
 #define __KDEPIM__KMAIL__STL_UTIL_H__
 
 template <typename T>
-static inline void DeleteAndSetToZero( const T* & t ) {
-  delete t; t = 0;
-}
+struct DeleteAndSetToZero {
+  void operator()( const T * t ) { delete t; t = 0; }
+};
 
 template <typename T>
 static inline void deleteAll( T & c ) {

urlhandlermanager.cpp

@@ -153,7 +153,7 @@ private:
 
 KMail::URLHandlerManager::BodyPartURLHandlerManager::~BodyPartURLHandlerManager() {
   for_each( mHandlers.begin(), mHandlers.end(),
-	    DeleteAndSetToZero<Interface::BodyPartURLHandler> );
+	    DeleteAndSetToZero<Interface::BodyPartURLHandler>() );
 }
 
 void KMail::URLHandlerManager::BodyPartURLHandlerManager::registerHandler( const Interface::BodyPartURLHandler * handler ) {
@@ -253,7 +253,7 @@ KMail::URLHandlerManager::URLHandlerManager() {
 
 KMail::URLHandlerManager::~URLHandlerManager() {
   for_each( mHandlers.begin(), mHandlers.end(),
-	    DeleteAndSetToZero<URLHandler> );
+	    DeleteAndSetToZero<URLHandler>() );
 }
 
 void KMail::URLHandlerManager::registerHandler( const URLHandler * handler ) {