Changeset 1654 for code/branches/gui/src/orxonox/Orxonox.h

Timestamp:

Aug 5, 2008, 9:55:00 PM (17 years ago)

Author:

rgrieder

Message:

forgot getSingleton in Orxonox.cc
There are now only three classes uses getSingleton: ConfigFileManager, Server and Client

File:

• code/branches/gui/src/orxonox/Orxonox.h (modified) (1 diff)

code/branches/gui/src/orxonox/Orxonox.h

@@ -62 +62 @@
       void abortRequest();
 
-      static Orxonox& getSingleton();
+      static Orxonox& getInstance();
 
       static void slomo(float factor) { Orxonox::setTimeFactor(factor); }
-      static float getTimeFactor()    { return Orxonox::getSingleton().timefactor_; }
+      static float getTimeFactor()    { return Orxonox::getInstance().timefactor_; }
       static void loadGame(const std::string& name);
-      static void exit()              { Orxonox::getSingleton().abortRequest(); }
+      static void exit()              { Orxonox::getInstance().abortRequest(); }
       static void setTimeFactor(float factor = 1.0);