One more std::string fixup.

[flightgear.git] / src / Main / fg_init.hxx

diff --git a/src/Main/fg_init.hxx b/src/Main/fg_init.hxx
index 73a8cd7ebc330ff3d002b89b4b425848458a0c4b..256716a8800eda171de5f0c636eb9647d45cbfb3 100644 (file)
--- a/src/Main/fg_init.hxx
+++ b/src/Main/fg_init.hxx
@@ -25,25 +25,12 @@
 #ifndef _FG_INIT_HXX
 #define _FG_INIT_HXX
 
+#include <string>
 
-#ifndef __cplusplus                                                          
-# error This library requires C++
-#endif                                   
-
-
-#ifdef HAVE_CONFIG
-#  include <config.h>
-#endif
-
-#include <simgear/compiler.h>
-#include <simgear/timing/sg_time.hxx>
-
-#include STL_STRING
-
-#include <Airports/simple.hxx>
-
-SG_USING_STD(string);
-
+// forward decls
+class SGPropertyNode;
+class SGTime;
+class SGPath;
 
 // Read in configuration (files and command line optoins) but only set
 // fg_root
@@ -51,7 +38,7 @@ bool fgInitFGRoot ( int argc, char **argv );
 
 
 // Return the current base package version
-string fgBasePackageVersion();
+std::string fgBasePackageVersion();
 
 
 // Read in configuration (file and command line)
@@ -79,17 +66,27 @@ bool fgInitSubsystems();
 // Reset
 void fgReInitSubsystems();
 
+/**
+ * this is what the 'reset' command (and hence, GUI) is attached too
+ * it overlaps with fgReInitSubsystems quite substantially
+ */
+void doSimulatorReset(void);
 
 // Set the initial position based on presets (or defaults)
 bool fgInitPosition();
 
-// Initialize various time dependent systems (lighting, sun position, etc.)
-// returns a new instance of the SGTime class
-SGTime *fgInitTime();
 
-// set up a time offset (aka warp) if one is specified
-void fgInitTimeOffset();
+// Listen to /sim/tower/airport-id and set tower view position accordingly
+void fgInitTowerLocationListener();
 
+/*
+ * Search in the current directory, and in on directory deeper
+ * for <aircraft>-set.xml configuration files and show the aircaft name
+ * and the contents of the<description> tag in a sorted manner.
+ *
+ * @parampath the directory to search for configuration files
+ */
+void fgShowAircraft(const SGPath &path);
 
 #endif // _FG_INIT_HXX