Changeset 6278 for code/branches/presentation2/src/orxonox

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/orxonox

Files:

• MoodManager.h (modified) (1 diff)
• sound/SoundManager.h (modified) (1 diff)

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