Use meaningful variable names in consolecolors.

[user/henk/code/inspircd.git] / include / timer.h

diff --git a/include/timer.h b/include/timer.h
index 503fa82a2f460c1aa8c8bd705d206861608f9cd1..a116d456c4e7a78cc499ba53862c9e8e76ebc76b 100644 (file)
--- a/include/timer.h
+++ b/include/timer.h
@@ -50,15 +50,9 @@ class CoreExport Timer
  public:
        /** Default constructor, initializes the triggering time
         * @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
         */
@@ -82,7 +76,7 @@ class CoreExport Timer
 
        /** Sets the interval between two ticks.
         */
-       void SetInterval(time_t interval);
+       void SetInterval(unsigned int interval);
 
        /** Called when the timer ticks.
         * You should override this method with some useful code to
@@ -117,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;