Merge branch 'next' of gitorious.org:fg/flightgear into next

[flightgear.git] / src / Canvas / canvas_mgr.hxx

diff --git a/src/Canvas/canvas_mgr.hxx b/src/Canvas/canvas_mgr.hxx
index b3b5bac0e5328b1e7fd62f313c6f54b804a81a7a..893b50e887e7fc77c094671034e27518611bbfef 100644 (file)
--- a/src/Canvas/canvas_mgr.hxx
+++ b/src/Canvas/canvas_mgr.hxx
@@ -26,6 +26,7 @@
 #include <vector>
 
 class Canvas;
+typedef boost::shared_ptr<Canvas> CanvasPtr;
 
 class CanvasMgr:
   public SGSubsystem,
@@ -55,7 +56,7 @@ class CanvasMgr:
     SGPropertyNode_ptr _props;
 
     /** The actual canvases */
-    std::vector<Canvas> _canvases;
+    std::vector<CanvasPtr> _canvases;
 
     void textureAdded(SGPropertyNode* node);
 
@@ -65,12 +66,6 @@ class CanvasMgr:
      */
     void triggerChangeRecursive(SGPropertyNode* node);
 
-    /**
-     * Get the value of a property or throw an exception if it doesn't exist.
-     */
-    template<class T>
-    T getParam(const SGPropertyNode* node, const char* prop);
-
 };
 
 #endif /* CANVAS_MGR_H_ */