X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Ftimer.cpp;h=f35a9c67be4acc39b5d8a992bc131eaba667495c;hb=8f9d0a68cd77b6a78eccfa7df9c1045d453ce581;hp=0e7a77ad8d552d8cf439aa5339d6a2c008fbb768;hpb=77123f4dec9f29105f6c0ceea0262cfe8e9eaa1a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/timer.cpp b/src/timer.cpp
index 0e7a77ad8..f35a9c67b 100644
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -14,28 +14,17 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include <time.h>
 #include <vector>
 #include <map>
-#include "users.h"
-#include "ctables.h"
-#include "typedefs.h"
-#include "commands.h"
-#include "globals.h"
-#include "hashcomp.h"
+#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspstring.h"
+#include "typedefs.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)
@@ -52,11 +41,11 @@ void TickTimers(time_t TIME)
 		{
 			InspTimer* n = *y;
 			n->Tick(TIME);
-			delete n;
+			DELETE(n);
 		}
 
 		Timers.erase(found);
-		delete x;
+		DELETE(x);
 	}
 }
 
@@ -80,11 +69,11 @@ void TickMissedTimers(time_t TIME)
 			{
 				InspTimer* z = *y;
 				z->Tick(TIME);
-				delete z;
+				DELETE(z);
 			}
 
 			Timers.erase(found);
-			delete x;
+			DELETE(x);
 		}
 	}
 }