[Scummvm-cvs-logs] SF.net SVN: scummvm:[42719] scummvm/trunk

[lordhoto at users.sourceforge.net]

Revision: 42719
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42719&view=rev
Author:   lordhoto
Date:     2009-07-25 00:59:18 +0000 (Sat, 25 Jul 2009)

Log Message:
-----------
Got rid of EventManger::artificialEventQueue.

Modified Paths:
--------------
    scummvm/trunk/backends/events/default/default-events.cpp
    scummvm/trunk/common/events.h

Modified: scummvm/trunk/backends/events/default/default-events.cpp
===================================================================
--- scummvm/trunk/backends/events/default/default-events.cpp	2009-07-25 00:59:03 UTC (rev 42718)
+++ scummvm/trunk/backends/events/default/default-events.cpp	2009-07-25 00:59:18 UTC (rev 42719)
@@ -219,9 +219,6 @@
 	g_system->unlockMutex(_timeMutex);
 	g_system->unlockMutex(_recorderMutex);
 
-	if (!artificialEventQueue.empty())
-		artificialEventQueue.clear();
-
 	if (_playbackFile != NULL) {
 		delete _playbackFile;
 	}
@@ -383,8 +380,8 @@
 	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 @@
 	// 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)

Modified: scummvm/trunk/common/events.h
===================================================================
--- scummvm/trunk/common/events.h	2009-07-25 00:59:03 UTC (rev 42718)
+++ scummvm/trunk/common/events.h	2009-07-25 00:59:18 UTC (rev 42719)
@@ -353,10 +353,6 @@
 #ifdef ENABLE_KEYMAPPER
 	virtual Common::Keymapper *getKeymapper() = 0;
 #endif
-
-protected:
-
-	Common::Queue<Common::Event> artificialEventQueue;
 };
 
 } // End of namespace Common


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.