summaryrefslogtreecommitdiff
path: root/include/timer.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/timer.h')
-rw-r--r--include/timer.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/include/timer.h b/include/timer.h
index 503fa82a2..a597427e3 100644
--- 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
*/
@@ -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;