summaryrefslogtreecommitdiff
path: root/src/eventsmanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-15 17:01:46 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-15 17:01:46 +0300
commit382067b05c4fe97bcf0da0143405375ec295f7c6 (patch)
treef668cd2595ac0c85f0942f88729d3ff1956676fa /src/eventsmanager.cpp
parentee8191705826d978b7793497fdd307536c709bff (diff)
parent9b329556e748050c4300174e9bdc72b15e5b8cc5 (diff)
downloadplus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.gz
plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.bz2
plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.xz
plus-382067b05c4fe97bcf0da0143405375ec295f7c6.zip
Merge branch 'master' into stable
Diffstat (limited to 'src/eventsmanager.cpp')
-rw-r--r--src/eventsmanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/eventsmanager.cpp b/src/eventsmanager.cpp
index 237e7bf68..3062ac3d2 100644
--- a/src/eventsmanager.cpp
+++ b/src/eventsmanager.cpp
@@ -60,7 +60,7 @@ void EventsManager::shutdown()
config.removeListeners(this);
}
-bool EventsManager::handleCommonEvents(const SDL_Event &event)
+bool EventsManager::handleCommonEvents(const SDL_Event &event) const
{
if (mLogInput)
logEvent(event);
@@ -100,7 +100,7 @@ bool EventsManager::handleCommonEvents(const SDL_Event &event)
return false;
}
-bool EventsManager::handleEvents()
+bool EventsManager::handleEvents() const
{
if (Game::instance())
{
@@ -157,7 +157,7 @@ bool EventsManager::handleEvents()
return false;
}
-void EventsManager::handleGameEvents()
+void EventsManager::handleGameEvents() const
{
Game *const game = Game::instance();