X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftimer.cpp;h=2b30b478cf592eed5806b27d8d137449fb125cf9;hb=12737ab4ad61a0d8a908c8a21594c7012e21eb3c;hp=14e61216885f42f92b62d2794a32a092d53e7aa2;hpb=5041993a7c5b2b94d84a5c15c4960e6acc3bb52d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/timer.cpp b/src/timer.cpp
index 14e612168..2b30b478c 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -14,36 +14,15 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
+#include <vector>
+#include <map>
 #include "inspircd_config.h"
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <string>
-#include <unistd.h>
-#include <fcntl.h>
-#include <poll.h>
-#include <sstream>
-#include <iostream>
-#include <fstream>
-#include <stdexcept>
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include "inspstring.h"
+#include "typedefs.h"
 #include "helperfuncs.h"
+#include "timer.h"
 
-extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
-extern time_t TIME;
-
-typedef std::vector<InspTimer*> timergroup;
-typedef std::map<time_t, timergroup*> timerlist;
-timerlist Timers;
-
-void TickTimers(time_t TIME)
+void TimerManager::TickTimers(time_t TIME)
 {
 	timerlist::iterator found = Timers.find(TIME);
 
@@ -55,13 +34,13 @@ void TickTimers(time_t TIME)
 		 */
 		for (timergroup::iterator y = x->begin(); y != x->end(); y++)
 		{
-			InspTimer* n = (InspTimer*)*y;
+			InspTimer* n = *y;
 			n->Tick(TIME);
-			delete n;
+			DELETE(n);
 		}
 
 		Timers.erase(found);
-		delete x;
+		DELETE(x);
 	}
 }
 
@@ -73,7 +52,7 @@ void TickTimers(time_t TIME)
  * If you move your clock BACK, and your timers move further ahead as a result,
  * then tough titty you'll just have to wait.
  */
-void TickMissedTimers(time_t TIME)
+void TimerManager::TickMissedTimers(time_t TIME)
 {
 	for (time_t n = TIME-1; n > TIME-120; n--)
 	{
@@ -83,18 +62,18 @@ void TickMissedTimers(time_t TIME)
 			timergroup* x = found->second;
 			for (timergroup::iterator y = x->begin(); y != x->end(); y++)
 			{
-				InspTimer* z = (InspTimer*)*y;
+				InspTimer* z = *y;
 				z->Tick(TIME);
-				delete z;
+				DELETE(z);
 			}
 
 			Timers.erase(found);
-			delete x;
+			DELETE(x);
 		}
 	}
 }
 
-void AddTimer(InspTimer* T)
+void TimerManager::AddTimer(InspTimer* T)
 {
 	timergroup* x = NULL;
 
@@ -112,3 +91,4 @@ void AddTimer(InspTimer* T)
 
 	x->push_back(T);
 }
+