[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdepim/kmail
From:       David Faure <faure () kde ! org>
Date:       2005-03-03 17:32:10
Message-ID: 20050303173210.DB2A81751E () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Backport IRIX compilation fix.


  M +2 -1      rulewidgethandlermanager.cpp   1.11.2.2
  M +3 -3      stl_util.h   1.1.2.3
  M +2 -2      urlhandlermanager.cpp   1.12.2.4


--- kdepim/kmail/rulewidgethandlermanager.cpp  #1.11.2.1:1.11.2.2
@@ -209,5 +209,6 @@ KMail::RuleWidgetHandlerManager::RuleWid
 KMail::RuleWidgetHandlerManager::~RuleWidgetHandlerManager()
 {
-  for_each( mHandlers.begin(), mHandlers.end(), DeleteAndSetToZero<RuleWidgetHandler> );
+  for_each( mHandlers.begin(), mHandlers.end(),
+            DeleteAndSetToZero<RuleWidgetHandler>() );
 }
 

--- kdepim/kmail/stl_util.h  #1.1.2.2:1.1.2.3
@@ -34,7 +34,7 @@
 
 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>

--- kdepim/kmail/urlhandlermanager.cpp  #1.12.2.3:1.12.2.4
@@ -154,5 +154,5 @@ private:
 KMail::URLHandlerManager::BodyPartURLHandlerManager::~BodyPartURLHandlerManager() {
   for_each( mHandlers.begin(), mHandlers.end(),
-            DeleteAndSetToZero<Interface::BodyPartURLHandler> );
+            DeleteAndSetToZero<Interface::BodyPartURLHandler>() );
 }
 
@@ -254,5 +254,5 @@ KMail::URLHandlerManager::URLHandlerMana
 KMail::URLHandlerManager::~URLHandlerManager() {
   for_each( mHandlers.begin(), mHandlers.end(),
-            DeleteAndSetToZero<URLHandler> );
+            DeleteAndSetToZero<URLHandler>() );
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]