Made SANICK not collide the user (theres no need to in the new 1.1 now we have return...

[user/henk/code/inspircd.git] / src / timer.cpp

diff --git a/src/timer.cpp b/src/timer.cpp
index ae345edc04b32faa2cedec090be6a5aa2d3c097f..9157c152187b6ba0994854cf9f0fac7ed237bddc 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -14,36 +14,10 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#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 "helperfuncs.h"
-
-extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
-extern time_t TIME;
+#include "timer.h"
 
-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);
 
@@ -51,17 +25,17 @@ void TickTimers(time_t TIME)
        {
                timergroup* x = found->second;
                /*
-                * There are pending timers to trigger :o
+                * There are pending timers to trigger
                 */
                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 +47,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 +57,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 +86,4 @@ void AddTimer(InspTimer* T)
 
        x->push_back(T);
 }
+