From 7905bbbc5b845854654d75a69876af87f78cdda0 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 25 Jul 2009 00:59:18 +0000
Subject: Got rid of EventManger::artificialEventQueue.

svn-id: r42719
---
 backends/events/default/default-events.cpp | 11 ++++-------
 common/events.h                            |  4 ----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp
index 4805321ac3..7e9d8db66e 100644
--- a/backends/events/default/default-events.cpp
+++ b/backends/events/default/default-events.cpp
@@ -219,9 +219,6 @@ DefaultEventManager::~DefaultEventManager() {
 	g_system->unlockMutex(_timeMutex);
 	g_system->unlockMutex(_recorderMutex);
 
-	if (!artificialEventQueue.empty())
-		artificialEventQueue.clear();
-
 	if (_playbackFile != NULL) {
 		delete _playbackFile;
 	}
@@ -383,8 +380,8 @@ bool DefaultEventManager::pollEvent(Common::Event &event) {
 	uint32 time = g_system->getMillis();
 	bool result;
 
-	if (!artificialEventQueue.empty()) {
-		event = artificialEventQueue.pop();
+	if (!_artificialEventQueue.empty()) {
+		event = _artificialEventQueue.pop();
 		result = true;
 	} else {
 		result = _boss->pollEvent(event);
@@ -602,9 +599,9 @@ void DefaultEventManager::pushEvent(const Common::Event &event) {
 	// If already received an EVENT_QUIT, don't add another one
 	if (event.type == Common::EVENT_QUIT) {
 		if (!_shouldQuit)
-			artificialEventQueue.push(event);
+			_artificialEventQueue.push(event);
 	} else
-		artificialEventQueue.push(event);
+		_artificialEventQueue.push(event);
 }
 
 #endif // !defined(DISABLE_DEFAULT_EVENTMANAGER)
diff --git a/common/events.h b/common/events.h
index 54c9f6df22..684b87bc5f 100644
--- a/common/events.h
+++ b/common/events.h
@@ -353,10 +353,6 @@ public:
 #ifdef ENABLE_KEYMAPPER
 	virtual Common::Keymapper *getKeymapper() = 0;
 #endif
-
-protected:
-
-	Common::Queue<Common::Event> artificialEventQueue;
 };
 
 } // End of namespace Common
-- 
cgit v1.2.3