Changeset 5651 for code/branches/resource2

Timestamp:

Aug 17, 2009, 3:17:15 PM (15 years ago)

Author:

rgrieder

Message:

Added using declaration for boost::shared_ptr, weak_ptr and scoped_ptr to OrxonoxConfig.h

Location:

code/branches/resource2/src

Files:

• OrxonoxConfig.h.in (modified) (1 diff)
• core/Core.h (modified) (1 diff)
• core/GUIManager.h (modified) (1 diff)
• core/Game.cc (modified) (1 diff)
• core/Game.h (modified) (2 diffs)
• core/GraphicsManager.h (modified) (1 diff)

code/branches/resource2/src/OrxonoxConfig.h.in

@@ -198 +198 @@
 }
 
+// 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__ */

code/branches/resource2/src/core/Core.h

@@ -51 +51 @@
 {
     class CoreConfiguration;
-    using boost::scoped_ptr;
 
     /**

code/branches/resource2/src/core/GUIManager.h

@@ -92 +92 @@
         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

code/branches/resource2/src/core/Game.cc

@@ -54 +54 @@
 namespace orxonox
 {
-    using boost::shared_ptr;
-    using boost::weak_ptr;
-
     static void stop_game()
         { Game::getInstance().stop(); }

code/branches/resource2/src/core/Game.h

@@ -61 +61 @@
 {
     class GameConfiguration;
-    using boost::scoped_ptr;
-    using boost::shared_ptr;
 
     //! Helper object required before GameStates are being constructed
@@ -84 +82 @@
         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);

code/branches/resource2/src/core/GraphicsManager.h

@@ -49 +49 @@
 namespace orxonox
 {
-    using boost::scoped_ptr;
-
     /**
     @brief