Index: orxonox/trunk/src/lib/event/event_handler.cc
===================================================================
--- orxonox/trunk/src/lib/event/event_handler.cc	(revision 4518)
+++ orxonox/trunk/src/lib/event/event_handler.cc	(revision 4519)
@@ -55,15 +55,4 @@
 */
 EventHandler* EventHandler::singletonRef = NULL;
-
-
-/**
-   \returns a Pointer to this Class
-*/
-EventHandler* EventHandler::getInstance(void)
-{
-  if (!EventHandler::singletonRef)
-    EventHandler::singletonRef = new EventHandler();
-  return EventHandler::singletonRef;
-}
 
 
Index: orxonox/trunk/src/lib/event/event_handler.h
===================================================================
--- orxonox/trunk/src/lib/event/event_handler.h	(revision 4518)
+++ orxonox/trunk/src/lib/event/event_handler.h	(revision 4519)
@@ -19,6 +19,7 @@
 
  public:
-  static EventHandler* getInstance(void);
   virtual ~EventHandler(void);
+  /** \returns a Pointer to the only object of this Class */
+  inline static EventHandler* getInstance(void) { if (!singletonRef) singletonRef = new EventHandler();  return singletonRef; };
   void init();
 
Index: orxonox/trunk/src/lib/graphics/graphics_engine.cc
===================================================================
--- orxonox/trunk/src/lib/graphics/graphics_engine.cc	(revision 4518)
+++ orxonox/trunk/src/lib/graphics/graphics_engine.cc	(revision 4519)
@@ -47,15 +47,4 @@
 */
 GraphicsEngine* GraphicsEngine::singletonRef = NULL;
-
-/**
-   \returns A pointer to this GraphicsEngine
-*/
-GraphicsEngine* GraphicsEngine::getInstance()
-{
-  if (!GraphicsEngine::singletonRef)
-    GraphicsEngine::singletonRef = new GraphicsEngine();
-  return GraphicsEngine::singletonRef;
-}
-
 
 /**
Index: orxonox/trunk/src/lib/graphics/graphics_engine.h
===================================================================
--- orxonox/trunk/src/lib/graphics/graphics_engine.h	(revision 4518)
+++ orxonox/trunk/src/lib/graphics/graphics_engine.h	(revision 4519)
@@ -25,6 +25,7 @@
 {
  public:
-  static GraphicsEngine* getInstance();
   virtual ~GraphicsEngine();
+  /** \returns a Pointer to the only object of this Class */
+  inline static GraphicsEngine* getInstance(void) { if (!singletonRef) singletonRef = new GraphicsEngine();  return singletonRef; };
 
   int initVideo();
Index: orxonox/trunk/src/lib/graphics/light.cc
===================================================================
--- orxonox/trunk/src/lib/graphics/light.cc	(revision 4518)
+++ orxonox/trunk/src/lib/graphics/light.cc	(revision 4519)
@@ -251,16 +251,4 @@
 */
 LightManager* LightManager::singletonRef = NULL;
-
-
-/**
-   \returns The Instance of the Lights
-*/
-LightManager* LightManager::getInstance(void)
-{
-  if (!singletonRef)
-    LightManager::singletonRef = new LightManager();
-  return singletonRef;
-}
-
 
 /**
Index: orxonox/trunk/src/lib/graphics/light.h
===================================================================
--- orxonox/trunk/src/lib/graphics/light.h	(revision 4518)
+++ orxonox/trunk/src/lib/graphics/light.h	(revision 4519)
@@ -106,5 +106,6 @@
  public:
   virtual ~LightManager(void);
-  static LightManager* getInstance();
+  /** \returns a Pointer to the only object of this Class */
+  inline static LightManager* getInstance(void) { if (!singletonRef) singletonRef = new LightManager();  return singletonRef; };
 
   // set Attributes
Index: orxonox/trunk/src/lib/graphics/text_engine.cc
===================================================================
--- orxonox/trunk/src/lib/graphics/text_engine.cc	(revision 4518)
+++ orxonox/trunk/src/lib/graphics/text_engine.cc	(revision 4519)
@@ -814,14 +814,4 @@
 
 /**
-   \returns a Pointer to this Class
-*/
-TextEngine* TextEngine::getInstance(void)
-{
-  if (!TextEngine::singletonRef)
-    TextEngine::singletonRef = new TextEngine();
-  return TextEngine::singletonRef;
-}
-
-/**
    \brief standard deconstructor
 
Index: orxonox/trunk/src/lib/graphics/text_engine.h
===================================================================
--- orxonox/trunk/src/lib/graphics/text_engine.h	(revision 4518)
+++ orxonox/trunk/src/lib/graphics/text_engine.h	(revision 4519)
@@ -205,6 +205,7 @@
 {
  public:
-  static TextEngine* getInstance(void);
   virtual ~TextEngine(void);
+  /** \returns a Pointer to the only object of this Class */
+  inline static TextEngine* getInstance(void) { if (!singletonRef) singletonRef = new TextEngine();  return singletonRef; };
 
   Text* createText(const char* fontFile,
Index: orxonox/trunk/src/lib/particles/particle_engine.cc
===================================================================
--- orxonox/trunk/src/lib/particles/particle_engine.cc	(revision 4518)
+++ orxonox/trunk/src/lib/particles/particle_engine.cc	(revision 4519)
@@ -43,14 +43,4 @@
 */
 ParticleEngine* ParticleEngine::singletonRef = NULL;
-
-/**
-   \returns a Pointer to this Class
-*/
-ParticleEngine* ParticleEngine::getInstance(void)
-{
-  if (!ParticleEngine::singletonRef)
-    ParticleEngine::singletonRef = new ParticleEngine();
-  return ParticleEngine::singletonRef;
-}
 
 /**
Index: orxonox/trunk/src/lib/particles/particle_engine.h
===================================================================
--- orxonox/trunk/src/lib/particles/particle_engine.h	(revision 4518)
+++ orxonox/trunk/src/lib/particles/particle_engine.h	(revision 4519)
@@ -30,6 +30,7 @@
 
  public:
-  static ParticleEngine* getInstance(void);
   virtual ~ParticleEngine(void);
+  /** \returns a Pointer to the only object of this Class */
+  inline static ParticleEngine* getInstance(void) { if (!singletonRef) singletonRef = new ParticleEngine();  return singletonRef; };
 
   void tick(float dt);
Index: orxonox/trunk/src/lib/physics/physics_engine.cc
===================================================================
--- orxonox/trunk/src/lib/physics/physics_engine.cc	(revision 4518)
+++ orxonox/trunk/src/lib/physics/physics_engine.cc	(revision 4519)
@@ -41,14 +41,4 @@
 */
 PhysicsEngine* PhysicsEngine::singletonRef = NULL;
-
-/**
-   \returns a Pointer to this Class
-*/
-PhysicsEngine* PhysicsEngine::getInstance(void)
-{
-  if (!PhysicsEngine::singletonRef)
-    PhysicsEngine::singletonRef = new PhysicsEngine();
-  return PhysicsEngine::singletonRef;
-}
 
 /**
Index: orxonox/trunk/src/lib/physics/physics_engine.h
===================================================================
--- orxonox/trunk/src/lib/physics/physics_engine.h	(revision 4518)
+++ orxonox/trunk/src/lib/physics/physics_engine.h	(revision 4519)
@@ -22,6 +22,7 @@
 
  public:
-  static PhysicsEngine* getInstance(void);
   virtual ~PhysicsEngine(void);
+  /** \returns a Pointer to the only object of this Class */
+  inline static PhysicsEngine* getInstance(void) { if (!singletonRef) singletonRef = new PhysicsEngine();  return singletonRef; };
 
   void addPhysicsInterface(PhysicsInterface* physicsInterface);
Index: orxonox/trunk/src/lib/sound/sound_engine.cc
===================================================================
--- orxonox/trunk/src/lib/sound/sound_engine.cc	(revision 4518)
+++ orxonox/trunk/src/lib/sound/sound_engine.cc	(revision 4519)
@@ -174,14 +174,4 @@
 */
 SoundEngine* SoundEngine::singletonRef = NULL;
-
-/**
-   \returns a Pointer to this Class
-*/
-SoundEngine* SoundEngine::getInstance(void)
-{
-  if (!SoundEngine::singletonRef)
-    SoundEngine::singletonRef = new SoundEngine();
-  return SoundEngine::singletonRef;
-}
 
 /**
Index: orxonox/trunk/src/lib/sound/sound_engine.h
===================================================================
--- orxonox/trunk/src/lib/sound/sound_engine.h	(revision 4518)
+++ orxonox/trunk/src/lib/sound/sound_engine.h	(revision 4519)
@@ -71,6 +71,7 @@
 
  public:
-  static SoundEngine* getInstance(void);
   virtual ~SoundEngine(void);
+  /** \returns a Pointer to the only object of this Class */
+  inline static SoundEngine* getInstance(void) { if (!singletonRef) singletonRef = new SoundEngine();  return singletonRef; };
 
   SoundSource* createSource(const char* fileName, PNode* sourceNode = NULL);
