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

[flightgear.git] / src / Model / model_panel.hxx

diff --git a/src/Model/model_panel.hxx b/src/Model/model_panel.hxx
index fb0554e115ce768986f50163f4ef57bcdff49cfb..301f770c8c4536cb513cc197cfd02a30b1d2c429 100644 (file)
--- a/src/Model/model_panel.hxx
+++ b/src/Model/model_panel.hxx
@@ -12,22 +12,12 @@
 
 #include <vector>
 
-SG_USING_STD(vector);
+using std::vector;
 
-#include <plib/sg.h>
-#include <plib/ssg.h>
-
-#include <simgear/math/point3d.hxx>
 #include <simgear/props/props.hxx>
 
 
 // Don't pull in the headers, since we don't need them here.
-class ssgBranch;
-class ssgCutout;
-class ssgEntity;
-class ssgRangeSelector;
-class ssgSelector;
-class ssgTransform;
 
 class SGInterpTable;
 class FGCondition;
@@ -55,9 +45,7 @@ class FGLocation;
  * Subsystems should not normally invoke this function directly;
  * instead, they should use the SGModelLoader declared in loader.hxx.
  */
-ssgBranch *fgLoad3DModelPanel( const string& fg_root, const string &path,
-                               SGPropertyNode *prop_root,
-                               double sim_time_sec );
+osg::Node *fgLoad3DModelPanel( const std::string &path, SGPropertyNode *prop_root);
 
 
 #endif // __MODEL_HXX