From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Fri, 13 Jul 2012 13:03:24 +0000 (+0200)
Subject: Made Timer::Timers private.
X-Git-Tag: v0.0.1~248
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c972b9793321f56865f4e067067ee3446839a34;p=icinga2

Made Timer::Timers private.
---

diff --git a/base/timer.cpp b/base/timer.cpp
index a34e91802..8bf42cfad 100644
--- a/base/timer.cpp
+++ b/base/timer.cpp
@@ -21,7 +21,7 @@
 
 using namespace icinga;
 
-Timer::CollectionType Timer::Timers;
+Timer::CollectionType Timer::m_Timers;
 
 /**
  * Constructor for the Timer class.
@@ -44,14 +44,14 @@ long Timer::ProcessTimers(void)
 	time(&st);
 
 	Timer::CollectionType::iterator prev, i;
-	for (i = Timers.begin(); i != Timers.end(); ) {
+	for (i = m_Timers.begin(); i != m_Timers.end(); ) {
 		Timer::Ptr timer = i->lock();
 
 		prev = i;
 		i++;
 
 		if (!timer) {
-			Timers.erase(prev);
+			m_Timers.erase(prev);
 			continue;
 		}
 
@@ -140,7 +140,7 @@ void Timer::Start(void)
 
 	Stop();
 
-	Timers.push_back(GetSelf());
+	m_Timers.push_back(GetSelf());
 
 	Reschedule(time(NULL) + m_Interval);
 }
@@ -152,7 +152,7 @@ void Timer::Stop(void)
 {
 	assert(Application::IsMainThread());
 
-	Timers.remove_if(WeakPtrEqual<Timer>(this));
+	m_Timers.remove_if(WeakPtrEqual<Timer>(this));
 }
 
 /**
diff --git a/base/timer.h b/base/timer.h
index 651dfe62b..f644863f5 100644
--- a/base/timer.h
+++ b/base/timer.h
@@ -37,8 +37,6 @@ public:
 
 	typedef list<Timer::WeakPtr> CollectionType;
 
-	static Timer::CollectionType Timers;
-
 	Timer(void);
 
 	void SetInterval(long interval);
@@ -57,6 +55,8 @@ private:
 	long m_Interval; /**< The interval of the timer. */
 	time_t m_Next; /**< When the next event should happen. */
 
+	static Timer::CollectionType m_Timers;
+
 	void Call(void);
 };