[ZNC-commits] SF.net SVN: znc:[1651] trunk/Modules.cpp

[<ps...@us...>]

Revision: 1651
          http://znc.svn.sourceforge.net/znc/?rev=1651&view=rev
Author:   psychon
Date:     2009-10-17 15:50:58 +0000 (Sat, 17 Oct 2009)

Log Message:
-----------
Micro-optimization: Use existing functions in CModule::RemTimer()

CModule::RemTimer(const CString& sLabel) now uses FindTimer() and
RemTimer(CTimer *) to do the work instead of doing all of this by itself.

Thanks to KiNgMaR again.

Modified Paths:
--------------
    trunk/Modules.cpp

Modified: trunk/Modules.cpp
===================================================================
--- trunk/Modules.cpp	2009-10-17 15:44:51 UTC (rev 1650)
+++ trunk/Modules.cpp	2009-10-17 15:50:58 UTC (rev 1651)
@@ -333,18 +333,10 @@
 }
 
 bool CModule::RemTimer(const CString& sLabel) {
-	set<CTimer*>::iterator it;
-	for (it = m_sTimers.begin(); it != m_sTimers.end(); ++it) {
-		CTimer* pTimer = *it;
-
-		if (pTimer->GetName().Equals(sLabel)) {
-			m_sTimers.erase(it);
-			m_pManager->DelCronByAddr(pTimer);
-			return true;
-		}
-	}
-
-	return false;
+	CTimer *pTimer = FindTimer(sLabel);
+	if (!pTimer)
+		return false;
+	return RemTimer(pTimer);
 }
 
 bool CModule::UnlinkTimer(CTimer* pTimer) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.