From 3a2ef4644effa976fbd3e7e4aa4b778ec9db8d03 Mon Sep 17 00:00:00 2001 From: David Capello Date: Sat, 30 Nov 2013 20:02:45 -0300 Subject: [PATCH] Move Manager::getDefault() to .h so it can be inlined --- src/ui/manager.cpp | 6 ------ src/ui/manager.h | 4 +++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/ui/manager.cpp b/src/ui/manager.cpp index cfe5e6658..6b5e559e4 100644 --- a/src/ui/manager.cpp +++ b/src/ui/manager.cpp @@ -104,12 +104,6 @@ static void allegro_window_close_hook() want_close_stage = STAGE_WANT_CLOSE; } -// static -Manager* Manager::getDefault() -{ - return m_defaultManager; -} - Manager::Manager() : Widget(kManagerWidget) { diff --git a/src/ui/manager.h b/src/ui/manager.h index 96d429b52..e0bee7a96 100644 --- a/src/ui/manager.h +++ b/src/ui/manager.h @@ -23,7 +23,9 @@ namespace ui { class Manager : public Widget { public: - static Manager* getDefault(); + static Manager* getDefault() { + return m_defaultManager; + } Manager(); ~Manager();