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

[lordhoto at users.sourceforge.net]

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

Log Message:
-----------
Replace "EventProvider" class of the DefaultEventManager implementation with "Common::EventSource".

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

Modified: scummvm/trunk/backends/base-backend.h
===================================================================
--- scummvm/trunk/backends/base-backend.h	2009-07-25 00:58:44 UTC (rev 42717)
+++ scummvm/trunk/backends/base-backend.h	2009-07-25 00:59:03 UTC (rev 42718)
@@ -29,7 +29,7 @@
 #include "common/system.h"
 #include "backends/events/default/default-events.h"
 
-class BaseBackend : public OSystem, EventProvider {
+class BaseBackend : public OSystem, Common::EventSource {
 public:
 	virtual Common::EventManager *getEventManager();
 	virtual void displayMessageOnOSD(const char *msg);

Modified: scummvm/trunk/backends/events/default/default-events.cpp
===================================================================
--- scummvm/trunk/backends/events/default/default-events.cpp	2009-07-25 00:58:44 UTC (rev 42717)
+++ scummvm/trunk/backends/events/default/default-events.cpp	2009-07-25 00:59:03 UTC (rev 42718)
@@ -92,7 +92,7 @@
 	}
 }
 
-DefaultEventManager::DefaultEventManager(EventProvider *boss) :
+DefaultEventManager::DefaultEventManager(Common::EventSource *boss) :
 	_boss(boss),
 	_buttonState(0),
 	_modifierState(0),

Modified: scummvm/trunk/backends/events/default/default-events.h
===================================================================
--- scummvm/trunk/backends/events/default/default-events.h	2009-07-25 00:58:44 UTC (rev 42717)
+++ scummvm/trunk/backends/events/default/default-events.h	2009-07-25 00:59:03 UTC (rev 42718)
@@ -41,20 +41,8 @@
 }
 
 
-class EventProvider {
-public:
-	virtual ~EventProvider() {}
-	/**
-	 * Get the next event in the event queue.
-	 * @param event	point to an Common::Event struct, which will be filled with the event data.
-	 * @return true if an event was retrieved.
-	 */
-	virtual bool pollEvent(Common::Event &event) = 0;
-};
-
-
 class DefaultEventManager : public Common::EventManager {
-	EventProvider *_boss;
+	Common::EventSource *_boss;
 
 #ifdef ENABLE_VKEYBD
 	Common::VirtualKeyboard *_vk;
@@ -128,7 +116,7 @@
 	void record(Common::Event &event);
 	bool playback(Common::Event &event);
 public:
-	DefaultEventManager(EventProvider *boss);
+	DefaultEventManager(Common::EventSource *boss);
 	~DefaultEventManager();
 
 	virtual void init();

Modified: scummvm/trunk/common/events.h
===================================================================
--- scummvm/trunk/common/events.h	2009-07-25 00:58:44 UTC (rev 42717)
+++ scummvm/trunk/common/events.h	2009-07-25 00:59:03 UTC (rev 42718)
@@ -199,6 +199,8 @@
 	/**
 	 * Tries to catch events from the registered event
 	 * sources and dispatch them to the observers.
+	 *
+	 * This dispatches *all* events the sources offer.
 	 */
 	void dispatch();
 


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