X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Ftimer.h;h=a597427e3c5c55a14ed0d7f8fd44eb7809622cb9;hb=60d92db9a1b71bbfd4230c5eb9f04cd6a87a41d8;hp=6f1834178932dcec88f7e36b129e921d1e638209;hpb=8790551dc182cd8804ee7d8ef89ccb31067cc2a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/timer.h b/include/timer.h
index 6f1834178..a597427e3 100644
--- a/include/timer.h
+++ b/include/timer.h
@@ -49,17 +49,10 @@ class CoreExport Timer
 
  public:
 	/** Default constructor, initializes the triggering time
-	 * @param mod The module that created this timer
 	 * @param secs_from_now The number of seconds from now to trigger the timer
-	 * @param now The time now
 	 * @param repeating Repeat this timer every secs_from_now seconds if set to true
 	 */
-	Timer(unsigned int secs_from_now, time_t now, bool repeating = false)
-	{
-		trigger = now + secs_from_now;
-		secs = secs_from_now;
-		repeat = repeating;
-	}
+	Timer(unsigned int secs_from_now, bool repeating = false);
 
 	/** Default destructor, removes the timer from the timer manager
 	 */
@@ -88,6 +81,8 @@ class CoreExport Timer
 	/** Called when the timer ticks.
 	 * You should override this method with some useful code to
 	 * handle the tick event.
+	 * @param TIME The current time.
+	 * @return True if the Timer object is still valid, false if it was destructed.
 	 */
 	virtual bool Tick(time_t TIME) = 0;
 
@@ -116,14 +111,14 @@ class CoreExport Timer
 	}
 };
 
-typedef std::multimap<time_t, Timer*> TimerMap;
-
 /** This class manages sets of Timers, and triggers them at their defined times.
  * This will ensure timers are not missed, as well as removing timers that have
  * expired and allowing the addition of new ones.
  */
 class CoreExport TimerManager
 {
+	typedef std::multimap<time_t, Timer*> TimerMap;
+
 	/** A list of all pending timers
 	 */
 	TimerMap Timers;