diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/dns.cpp | 8 | ||||
-rw-r--r-- | src/modules/extra/m_pgsql.cpp | 4 | ||||
-rw-r--r-- | src/modules/m_httpd.cpp | 4 | ||||
-rw-r--r-- | src/modules/m_spanningtree/handshaketimer.cpp | 2 | ||||
-rw-r--r-- | src/modules/m_spanningtree/handshaketimer.h | 2 | ||||
-rw-r--r-- | src/modules/m_spanningtree/timesynctimer.cpp | 4 | ||||
-rw-r--r-- | src/modules/m_spanningtree/timesynctimer.h | 8 | ||||
-rw-r--r-- | src/timer.cpp | 8 |
8 files changed, 20 insertions, 20 deletions
diff --git a/src/dns.cpp b/src/dns.cpp index c8e465de8..ec19ed397 100644 --- a/src/dns.cpp +++ b/src/dns.cpp @@ -108,14 +108,14 @@ class DNSRequest int SendRequests(const DNSHeader *header, const int length, QueryType qt); }; -class CacheTimer : public InspTimer +class CacheTimer : public Timer { private: InspIRCd* ServerInstance; DNS* dns; public: CacheTimer(InspIRCd* Instance, DNS* thisdns) - : InspTimer(3600, Instance->Time(), true), ServerInstance(Instance), dns(thisdns) { } + : Timer(3600, Instance->Time(), true), ServerInstance(Instance), dns(thisdns) { } virtual void Tick(time_t TIME) { @@ -123,13 +123,13 @@ class CacheTimer : public InspTimer } }; -class RequestTimeout : public InspTimer +class RequestTimeout : public Timer { InspIRCd* ServerInstance; DNSRequest* watch; int watchid; public: - RequestTimeout(unsigned long n, InspIRCd* SI, DNSRequest* watching, int id) : InspTimer(n, time(NULL)), ServerInstance(SI), watch(watching), watchid(id) + RequestTimeout(unsigned long n, InspIRCd* SI, DNSRequest* watching, int id) : Timer(n, time(NULL)), ServerInstance(SI), watch(watching), watchid(id) { } diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index afa32d3d8..97ecd0a8a 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -81,13 +81,13 @@ std::string SQLhost::GetDSN() return conninfo.str(); } -class ReconnectTimer : public InspTimer +class ReconnectTimer : public Timer { private: Module* mod; public: ReconnectTimer(InspIRCd* SI, Module* m) - : InspTimer(5, SI->Time(), false), mod(m) + : Timer(5, SI->Time(), false), mod(m) { } virtual void Tick(time_t TIME); diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index dc8a8c8a8..b89260831 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -36,7 +36,7 @@ class HttpServerSocket; /** This class is used to handle HTTP socket timeouts */ -class HttpServerTimeout : public InspTimer +class HttpServerTimeout : public Timer { private: /** HttpServerSocket we are attached to @@ -422,7 +422,7 @@ class HttpServerSocket : public InspSocket } }; -HttpServerTimeout::HttpServerTimeout(HttpServerSocket* sock, SocketEngine* engine) : InspTimer(15, time(NULL), true), s(sock), SE(engine) +HttpServerTimeout::HttpServerTimeout(HttpServerSocket* sock, SocketEngine* engine) : Timer(15, time(NULL), true), s(sock), SE(engine) { } diff --git a/src/modules/m_spanningtree/handshaketimer.cpp b/src/modules/m_spanningtree/handshaketimer.cpp index 617c3164d..ffe81ad80 100644 --- a/src/modules/m_spanningtree/handshaketimer.cpp +++ b/src/modules/m_spanningtree/handshaketimer.cpp @@ -28,7 +28,7 @@ /* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */ -HandshakeTimer::HandshakeTimer(InspIRCd* Inst, TreeSocket* s, Link* l, SpanningTreeUtilities* u, int delay) : InspTimer(delay, time(NULL)), Instance(Inst), sock(s), lnk(l), Utils(u) +HandshakeTimer::HandshakeTimer(InspIRCd* Inst, TreeSocket* s, Link* l, SpanningTreeUtilities* u, int delay) : Timer(delay, time(NULL)), Instance(Inst), sock(s), lnk(l), Utils(u) { thefd = sock->GetFd(); } diff --git a/src/modules/m_spanningtree/handshaketimer.h b/src/modules/m_spanningtree/handshaketimer.h index 496102dda..7f2900d7e 100644 --- a/src/modules/m_spanningtree/handshaketimer.h +++ b/src/modules/m_spanningtree/handshaketimer.h @@ -21,7 +21,7 @@ class SpanningTreeUtilities; class TreeSocket; class Link; -class HandshakeTimer : public InspTimer +class HandshakeTimer : public Timer { private: InspIRCd* Instance; diff --git a/src/modules/m_spanningtree/timesynctimer.cpp b/src/modules/m_spanningtree/timesynctimer.cpp index dd89a1217..024772893 100644 --- a/src/modules/m_spanningtree/timesynctimer.cpp +++ b/src/modules/m_spanningtree/timesynctimer.cpp @@ -28,7 +28,7 @@ /* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */ -TimeSyncTimer::TimeSyncTimer(InspIRCd *Inst, ModuleSpanningTree *Mod) : InspTimer(600, Inst->Time(), true), Instance(Inst), Module(Mod) +TimeSyncTimer::TimeSyncTimer(InspIRCd *Inst, ModuleSpanningTree *Mod) : Timer(600, Inst->Time(), true), Instance(Inst), Module(Mod) { } @@ -37,7 +37,7 @@ void TimeSyncTimer::Tick(time_t TIME) Module->BroadcastTimeSync(); } -CacheRefreshTimer::CacheRefreshTimer(InspIRCd *Inst, SpanningTreeUtilities *Util) : InspTimer(3600, Inst->Time(), true), Instance(Inst), Utils(Util) +CacheRefreshTimer::CacheRefreshTimer(InspIRCd *Inst, SpanningTreeUtilities *Util) : Timer(3600, Inst->Time(), true), Instance(Inst), Utils(Util) { } diff --git a/src/modules/m_spanningtree/timesynctimer.h b/src/modules/m_spanningtree/timesynctimer.h index 434ee253c..999fbed7b 100644 --- a/src/modules/m_spanningtree/timesynctimer.h +++ b/src/modules/m_spanningtree/timesynctimer.h @@ -20,11 +20,11 @@ class ModuleSpanningTree; class SpanningTreeUtilities; class InspIRCd; -/** Create a timer which recurs every second, we inherit from InspTimer. - * InspTimer is only one-shot however, so at the end of each Tick() we simply +/** Create a timer which recurs every second, we inherit from Timer. + * Timer is only one-shot however, so at the end of each Tick() we simply * insert another of ourselves into the pending queue :) */ -class TimeSyncTimer : public InspTimer +class TimeSyncTimer : public Timer { private: InspIRCd *Instance; @@ -34,7 +34,7 @@ class TimeSyncTimer : public InspTimer virtual void Tick(time_t TIME); }; -class CacheRefreshTimer : public InspTimer +class CacheRefreshTimer : public Timer { private: InspIRCd *Instance; diff --git a/src/timer.cpp b/src/timer.cpp index c04107502..a79105f52 100644 --- a/src/timer.cpp +++ b/src/timer.cpp @@ -33,7 +33,7 @@ void TimerManager::TickTimers(time_t TIME) */ for (timergroup::iterator y = x->begin(); y != x->end(); y++) { - InspTimer* n = *y; + Timer* n = *y; n->Tick(TIME); if (n->GetRepeat()) { @@ -52,7 +52,7 @@ void TimerManager::TickTimers(time_t TIME) this->CantDeleteHere = false; } -void TimerManager::DelTimer(InspTimer* T) +void TimerManager::DelTimer(Timer* T) { if (this->CantDeleteHere) { @@ -79,7 +79,7 @@ void TimerManager::DelTimer(InspTimer* T) timergroup* x = found->second; for (timergroup::iterator y = x->begin(); y != x->end(); y++) { - InspTimer* n = *y; + Timer* n = *y; if (n == T) { DELETE(n); @@ -108,7 +108,7 @@ void TimerManager::TickMissedTimers(time_t TIME) this->TickTimers(TIME); } -void TimerManager::AddTimer(InspTimer* T, long secs_from_now) +void TimerManager::AddTimer(Timer* T, long secs_from_now) { timergroup* x = NULL; |