Changeset 6278

Timestamp:

Dec 9, 2009, 9:34:47 AM (14 years ago)

Author:

rgrieder

Message:

Use base class method for getInstance (for tolua interface).

Location:

code/branches/presentation2/src

Files:

• libraries/core/input/InputManager.h (modified) (1 diff)
• libraries/core/input/KeyBinderManager.h (modified) (2 diffs)
• orxonox/MoodManager.h (modified) (1 diff)
• orxonox/sound/SoundManager.h (modified) (1 diff)

code/branches/presentation2/src/libraries/core/input/InputManager.h

@@ -171 +171 @@
         std::pair<int, int> getMousePosition() const;
         
-        static InputManager& getInstance() { return *singletonPtr_s; } // tolua_export
+        static InputManager& getInstance() { return Singleton<InputManager>::getInstance(); } // tolua_export
 
     private: // functions

code/branches/presentation2/src/libraries/core/input/KeyBinderManager.h

@@ -62 +62 @@
         void setConfigValues();
 
-        static KeyBinderManager& getInstance() { return Singleton<KeyBinderManager>::getInstance(); } //tolua_export
+        static KeyBinderManager& getInstance() //tolua_export
+            { return Singleton<KeyBinderManager>::getInstance(); }
         //! Returns the currently selected KeyBinder
-        KeyBinder* getCurrent() { return this->currentBinder_; } //tolua_export
+        KeyBinder* getCurrent() //tolua_export
+            { return this->currentBinder_; }
         //! Like getCurrent(), but returns it as InputHandler* (so you don't have to include KeyBinder.h)
         InputHandler* getCurrentAsHandler();
@@ -95 +97 @@
 
         //! Bind 'command' to any key pressed after this call (use with care!)
-        inline void keybind(const std::string& command) { this->keybindInternal(command, false); } //tolua_export
+        inline void keybind(const std::string& command) //tolua_export
+            { this->keybindInternal(command, false); }
         //! Bind 'command' to any key pressed after this call (use with care!), but temporarily (no file save)
         inline void tkeybind(const std::string& command)

code/branches/presentation2/src/orxonox/MoodManager.h

@@ -56 +56 @@
             const std::string& getMood();
 
-            static MoodManager& getInstance()    { return Singleton<MoodManager>::getInstance(); } // tolua_export
+            static MoodManager& getInstance() { return Singleton<MoodManager>::getInstance(); } // tolua_export
 
         private:

code/branches/presentation2/src/orxonox/sound/SoundManager.h

@@ -80 +80 @@
         
         // tolua_begin
-        static SoundManager& getInstance()
-            { return Singleton<SoundManager>::getInstance(); }
+        static SoundManager& getInstance() { return Singleton<SoundManager>::getInstance(); }
 
         std::string getDeviceName(unsigned int index) const