aboutsummaryrefslogtreecommitdiff
path: root/backends/events/default
diff options
context:
space:
mode:
authorJohannes Schickel2009-07-25 00:59:03 +0000
committerJohannes Schickel2009-07-25 00:59:03 +0000
commitba7e01ad7c3a803471a6d0a1f91777fc16ed0096 (patch)
tree19aaada8877233b1ec7a4a72a9a177181132190e /backends/events/default
parent908af0a37f531a4f7a3310fa791c7c3836fa7373 (diff)
downloadscummvm-rg350-ba7e01ad7c3a803471a6d0a1f91777fc16ed0096.tar.gz
scummvm-rg350-ba7e01ad7c3a803471a6d0a1f91777fc16ed0096.tar.bz2
scummvm-rg350-ba7e01ad7c3a803471a6d0a1f91777fc16ed0096.zip
Replace "EventProvider" class of the DefaultEventManager implementation with "Common::EventSource".
svn-id: r42718
Diffstat (limited to 'backends/events/default')
-rw-r--r--backends/events/default/default-events.cpp2
-rw-r--r--backends/events/default/default-events.h16
2 files changed, 3 insertions, 15 deletions
diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp
index 4fdf96e57e..4805321ac3 100644
--- a/backends/events/default/default-events.cpp
+++ b/backends/events/default/default-events.cpp
@@ -92,7 +92,7 @@ void writeRecord(Common::OutSaveFile *outFile, uint32 diff, Common::Event &event
}
}
-DefaultEventManager::DefaultEventManager(EventProvider *boss) :
+DefaultEventManager::DefaultEventManager(Common::EventSource *boss) :
_boss(boss),
_buttonState(0),
_modifierState(0),
diff --git a/backends/events/default/default-events.h b/backends/events/default/default-events.h
index 9d47104608..9be90f4ad8 100644
--- a/backends/events/default/default-events.h
+++ b/backends/events/default/default-events.h
@@ -41,20 +41,8 @@ namespace Common {
}
-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 @@ class DefaultEventManager : public Common::EventManager {
void record(Common::Event &event);
bool playback(Common::Event &event);
public:
- DefaultEventManager(EventProvider *boss);
+ DefaultEventManager(Common::EventSource *boss);
~DefaultEventManager();
virtual void init();