diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/commands/cmd_whowas.h | 6 | ||||
| -rw-r--r-- | include/inspircd.h | 2 | ||||
| -rw-r--r-- | include/inspsocket.h | 4 | ||||
| -rw-r--r-- | include/timer.h | 34 |
4 files changed, 23 insertions, 23 deletions
diff --git a/include/commands/cmd_whowas.h b/include/commands/cmd_whowas.h index c8f367116..ca411de07 100644 --- a/include/commands/cmd_whowas.h +++ b/include/commands/cmd_whowas.h @@ -35,7 +35,7 @@ class WhoWasMaintainTimer; /* Forward ref for typedefs */ class WhoWasGroup; -/** InspTimer that is used to maintain the whowas list, called once an hour +/** Timer that is used to maintain the whowas list, called once an hour */ extern WhoWasMaintainTimer* timer; @@ -127,13 +127,13 @@ class WhoWasGroup : public classbase ~WhoWasGroup(); }; -class WhoWasMaintainTimer : public InspTimer +class WhoWasMaintainTimer : public Timer { private: InspIRCd* ServerInstance; public: WhoWasMaintainTimer(InspIRCd* Instance, long interval) - : InspTimer(interval, Instance->Time(), true), ServerInstance(Instance) + : Timer(interval, Instance->Time(), true), ServerInstance(Instance) { } virtual void Tick(time_t TIME); diff --git a/include/inspircd.h b/include/inspircd.h index afa4db7f4..4dc90c8e8 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -455,7 +455,7 @@ class CoreExport InspIRCd : public classbase */ DNS* Res; - /** Timer manager class, triggers InspTimer timer events + /** Timer manager class, triggers Timer timer events */ TimerManager* Timers; diff --git a/include/inspsocket.h b/include/inspsocket.h index d165d64f2..d4ff58d93 100644 --- a/include/inspsocket.h +++ b/include/inspsocket.h @@ -72,7 +72,7 @@ using irc::sockets::insp_aton; /** Used to time out socket connections */ -class CoreExport SocketTimeout : public InspTimer +class CoreExport SocketTimeout : public Timer { private: /** InspSocket the class is attached to @@ -92,7 +92,7 @@ class CoreExport SocketTimeout : public InspTimer * @param secs_from_now Seconds from now to time out * @param now The current time */ - SocketTimeout(int fd, InspIRCd* Instance, InspSocket* thesock, long secs_from_now, time_t now) : InspTimer(secs_from_now, now), sock(thesock), ServerInstance(Instance), sfd(fd) { }; + SocketTimeout(int fd, InspIRCd* Instance, InspSocket* thesock, long secs_from_now, time_t now) : Timer(secs_from_now, now), sock(thesock), ServerInstance(Instance), sfd(fd) { }; /** Handle tick event */ virtual void Tick(time_t now); diff --git a/include/timer.h b/include/timer.h index ef8b82e31..82c788242 100644 --- a/include/timer.h +++ b/include/timer.h @@ -17,16 +17,16 @@ class InspIRCd; /** Timer class for one-second resolution timers - * InspTimer provides a facility which allows module + * Timer provides a facility which allows module * developers to create one-shot timers. The timer * can be made to trigger at any time up to a one-second - * resolution. To use InspTimer, inherit a class from - * InspTimer, then insert your inherited class into the + * resolution. To use Timer, inherit a class from + * Timer, then insert your inherited class into the * queue using Server::AddTimer(). The Tick() method of * your object (which you should override) will be called * at the given time. */ -class CoreExport InspTimer : public Extensible +class CoreExport Timer : public Extensible { private: /** The triggering time @@ -44,7 +44,7 @@ class CoreExport InspTimer : public Extensible * @param now The time now * @param repeating Repeat this timer every secs_from_now seconds if set to true */ - InspTimer(long secs_from_now,time_t now, bool repeating = false) + Timer(long secs_from_now,time_t now, bool repeating = false) { trigger = now + secs_from_now; secs = secs_from_now; @@ -53,7 +53,7 @@ class CoreExport InspTimer : public Extensible /** Default destructor, does nothing. */ - virtual ~InspTimer() { } + virtual ~Timer() { } /** Retrieve the current triggering time */ @@ -89,7 +89,7 @@ class CoreExport InspTimer : public Extensible * You should use this method call to remove a recurring * timer if you wish to do so within the timer's Tick * event, as calling TimerManager::DelTimer() from within - * the InspTimer::Tick() method is dangerous and may + * the Timer::Tick() method is dangerous and may * cause a segmentation fault. Calling CancelRepeat() * is safe in this case. */ @@ -100,7 +100,7 @@ class CoreExport InspTimer : public Extensible }; -/** This class manages sets of InspTimers, and triggers them at their defined times. +/** 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. */ @@ -109,7 +109,7 @@ class CoreExport TimerManager : public Extensible protected: /** A group of timers all set to trigger at the same time */ - typedef std::vector<InspTimer*> timergroup; + typedef std::vector<Timer*> timergroup; /** A map of timergroups, each group has a specific trigger time */ typedef std::map<time_t, timergroup*> timerlist; @@ -129,23 +129,23 @@ class CoreExport TimerManager : public Extensible /** Constructor */ TimerManager(InspIRCd* Instance); - /** Tick all pending InspTimers + /** Tick all pending Timers * @param TIME the current system time */ void TickTimers(time_t TIME); - /** Add an InspTimer - * @param T an InspTimer derived class to add + /** Add an Timer + * @param T an Timer derived class to add * @param secs_from_now You may set this to the number of seconds * from the current time when the timer will tick, or you may just - * leave this unset and the values set by the InspTimers constructor + * leave this unset and the values set by the Timers constructor * will be used. This is used internally for re-triggering repeating * timers. */ - void AddTimer(InspTimer* T, long secs_from_now = 0); - /** Delete an InspTimer - * @param T an InspTimer derived class to delete + void AddTimer(Timer* T, long secs_from_now = 0); + /** Delete an Timer + * @param T an Timer derived class to delete */ - void DelTimer(InspTimer* T); + void DelTimer(Timer* T); /** Tick any timers that have been missed due to lag * @param TIME the current system time */ |