[Orxonox-commit 928] r5651 - in code/branches/resource2/src: . core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-08-17 15:17:15 +0200 (Mon, 17 Aug 2009)
New Revision: 5651

Modified:
   code/branches/resource2/src/OrxonoxConfig.h.in
   code/branches/resource2/src/core/Core.h
   code/branches/resource2/src/core/GUIManager.h
   code/branches/resource2/src/core/Game.cc
   code/branches/resource2/src/core/Game.h
   code/branches/resource2/src/core/GraphicsManager.h
Log:
Added using declaration for boost::shared_ptr, weak_ptr and scoped_ptr to OrxonoxConfig.h

Modified: code/branches/resource2/src/OrxonoxConfig.h.in
===================================================================
--- code/branches/resource2/src/OrxonoxConfig.h.in	2009-08-17 13:14:16 UTC (rev 5650)
+++ code/branches/resource2/src/OrxonoxConfig.h.in	2009-08-17 13:17:15 UTC (rev 5651)
@@ -197,4 +197,18 @@
     typedef basic_string<char, char_traits<char>, allocator<char> > string;
 }
 
+// Import general purpose smart pointers
+namespace boost
+{
+    template<class T> class scoped_ptr;
+    template<class T> class shared_ptr;
+    template<class T> class weak_ptr;
+}
+namespace orxonox
+{
+    using boost::scoped_ptr;
+    using boost::shared_ptr;
+    using boost::weak_ptr;
+}
+
 #endif /* _OrxonoxConfig_H__ */

Modified: code/branches/resource2/src/core/Core.h
===================================================================
--- code/branches/resource2/src/core/Core.h	2009-08-17 13:14:16 UTC (rev 5650)
+++ code/branches/resource2/src/core/Core.h	2009-08-17 13:17:15 UTC (rev 5651)
@@ -50,7 +50,6 @@
 namespace orxonox
 {
     class CoreConfiguration;
-    using boost::scoped_ptr;
 
     /**
     @brief

Modified: code/branches/resource2/src/core/GUIManager.h
===================================================================
--- code/branches/resource2/src/core/GUIManager.h	2009-08-17 13:14:16 UTC (rev 5650)
+++ code/branches/resource2/src/core/GUIManager.h	2009-08-17 13:17:15 UTC (rev 5651)
@@ -91,9 +91,9 @@
         void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize);
         void mouseScrolled (int abs, int rel);
 
-        boost::scoped_ptr<CEGUI::OgreCEGUIRenderer> guiRenderer_;  //!< CEGUI's interface to the Ogre Engine
-        boost::scoped_ptr<CEGUI::LuaScriptModule>   scriptModule_; //!< CEGUI's script module to use Lua
-        boost::scoped_ptr<CEGUI::System>            guiSystem_;    //!< CEGUI's main system
+        scoped_ptr<CEGUI::OgreCEGUIRenderer> guiRenderer_;  //!< CEGUI's interface to the Ogre Engine
+        scoped_ptr<CEGUI::LuaScriptModule>   scriptModule_; //!< CEGUI's script module to use Lua
+        scoped_ptr<CEGUI::System>            guiSystem_;    //!< CEGUI's main system
         Ogre::RenderWindow*      renderWindow_;     //!< Ogre's render window to give CEGUI access to it
         CEGUI::ResourceProvider* resourceProvider_; //!< CEGUI's resource provider
         CEGUI::Logger*           ceguiLogger_;      //!< CEGUI's logger to be able to log CEGUI errors in our log

Modified: code/branches/resource2/src/core/Game.cc
===================================================================
--- code/branches/resource2/src/core/Game.cc	2009-08-17 13:14:16 UTC (rev 5650)
+++ code/branches/resource2/src/core/Game.cc	2009-08-17 13:17:15 UTC (rev 5651)
@@ -53,9 +53,6 @@
 
 namespace orxonox
 {
-    using boost::shared_ptr;
-    using boost::weak_ptr;
-
     static void stop_game()
         { Game::getInstance().stop(); }
     SetConsoleCommandShortcutExternAlias(stop_game, "exit");

Modified: code/branches/resource2/src/core/Game.h
===================================================================
--- code/branches/resource2/src/core/Game.h	2009-08-17 13:14:16 UTC (rev 5650)
+++ code/branches/resource2/src/core/Game.h	2009-08-17 13:17:15 UTC (rev 5651)
@@ -60,8 +60,6 @@
 namespace orxonox
 {
     class GameConfiguration;
-    using boost::scoped_ptr;
-    using boost::shared_ptr;
 
     //! Helper object required before GameStates are being constructed
     struct GameStateInfo
@@ -83,7 +81,7 @@
         friend class Singleton<Game>;
         typedef std::vector<shared_ptr<GameState> > GameStateVector;
         typedef std::map<std::string, shared_ptr<GameState> > GameStateMap;
-        typedef boost::shared_ptr<GameStateTreeNode> GameStateTreeNodePtr;
+        typedef shared_ptr<GameStateTreeNode> GameStateTreeNodePtr;
     public:
         Game(const std::string& cmdLine);
         ~Game();

Modified: code/branches/resource2/src/core/GraphicsManager.h
===================================================================
--- code/branches/resource2/src/core/GraphicsManager.h	2009-08-17 13:14:16 UTC (rev 5650)
+++ code/branches/resource2/src/core/GraphicsManager.h	2009-08-17 13:17:15 UTC (rev 5651)
@@ -48,8 +48,6 @@
 
 namespace orxonox
 {
-    using boost::scoped_ptr;
-
     /**
     @brief
         Graphics engine manager class