Changeset 609 for code/branches/FICN/src/orxonox/orxonox.h

Timestamp:

Dec 18, 2007, 12:32:09 PM (16 years ago)

Author:

rgrieder

Message:

• removed all the "using namespace Ogre" in the header files
• cleaned up the orxonox.cc header a little bit (every Ogre class referenced is now included via header file)

File:

• code/branches/FICN/src/orxonox/orxonox.h (modified) (2 diffs)

code/branches/FICN/src/orxonox/orxonox.h

@@ -8 +8 @@
 #define ORXONOX_H
 
-//#include <OgreSingleton.h>
+#include <OgrePrerequisites.h>
 #include <OgreSceneManager.h>
 #include <OIS/OIS.h>
@@ -39 +39 @@
       void die(/* some error code */);
       static Orxonox* getSingleton();
-      inline SceneManager* getSceneManager() { return ogre_->getSceneManager(); };
+      inline Ogre::SceneManager* getSceneManager() { return ogre_->getSceneManager(); };
       inline GraphicsEngine* getOgrePointer() { return ogre_; };
       inline audio::AudioManager* getAudioManagerPointer() { return auMan_; };