From f13e6717598efe32b15dab79389c6f21b9e2294a Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 7 Jun 2011 11:58:40 +0200
Subject: BACKENDS: All backends use _timerManager now, adapt OSystem
 accordingly

---
 common/system.cpp | 4 ----
 common/system.h   | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/common/system.cpp b/common/system.cpp
index e34aeb54d6..6be7775b05 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -109,10 +109,6 @@ void OSystem::fatalError() {
 	exit(1);
 }
 
-Common::TimerManager *OSystem::getTimerManager() {
-	return _timerManager;
-}
-
 Common::SaveFileManager *OSystem::getSavefileManager() {
 	assert(_savefileManager);
 	return _savefileManager;
diff --git a/common/system.h b/common/system.h
index 9036dcd6e1..6b21ae4b82 100644
--- a/common/system.h
+++ b/common/system.h
@@ -890,7 +890,9 @@ public:
 	 * Return the timer manager singleton. For more information, refer
 	 * to the TimerManager documentation.
 	 */
-	virtual Common::TimerManager *getTimerManager();
+	inline Common::TimerManager *getTimerManager() {
+		return _timerManager;
+	}
 
 	/**
 	 * Return the event manager singleton. For more information, refer
-- 
cgit v1.2.3