aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMax Horn2007-03-17 00:53:21 +0000
committerMax Horn2007-03-17 00:53:21 +0000
commit15d9bc42ea14d1c1fd5d1f8787664bbf0944d0a3 (patch)
tree1658efcaefcad7d9c8301317ea1acd3707048e76 /common
parenta6f3ed8173a0490855df84e955229c9f77ecf9c2 (diff)
downloadscummvm-rg350-15d9bc42ea14d1c1fd5d1f8787664bbf0944d0a3.tar.gz
scummvm-rg350-15d9bc42ea14d1c1fd5d1f8787664bbf0944d0a3.tar.bz2
scummvm-rg350-15d9bc42ea14d1c1fd5d1f8787664bbf0944d0a3.zip
Force all code to use EventManager::pollEvent instead of OSystem::pollEvent
svn-id: r26156
Diffstat (limited to 'common')
-rw-r--r--common/system.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/system.h b/common/system.h
index a8aa1198bd..53a545627c 100644
--- a/common/system.h
+++ b/common/system.h
@@ -680,9 +680,6 @@ public:
/** @name Events and Time */
//@{
-//protected:
- friend class Common::EventManager;
-
/**
* The types of events backends may generate.
* @see Event
@@ -790,6 +787,9 @@ public:
Common::Point mouse;
};
+protected:
+ friend class DefaultEventManager;
+
/**
* Get the next event in the event queue.
* @param event point to an Event struct, which will be filled with the event data.