Land the GPS/route-manager re-write. Many things are better, many other things will...

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

diff --git a/src/Main/fg_props.hxx b/src/Main/fg_props.hxx
index 4025b185dfc424a2298ddeacdd879ed031d6f619..8516c93c924aa0a6a4f226da39ab387408231dc8 100644 (file)
--- a/src/Main/fg_props.hxx
+++ b/src/Main/fg_props.hxx
@@ -6,13 +6,12 @@
 #ifndef __FG_PROPS_HXX
 #define __FG_PROPS_HXX 1
 
-#include <simgear/debug/logstream.hxx>
-#include <simgear/props/props.hxx>
-#include <simgear/props/props_io.hxx>
-#include <simgear/structure/subsystem_mgr.hxx>
+#include <iosfwd>
 
-#include "globals.hxx"
+#include <simgear/structure/subsystem_mgr.hxx>
+#include <simgear/math/SGMath.hxx>
 
+#include <Main/globals.hxx>
 \f
 ////////////////////////////////////////////////////////////////////////
 // Property management.
@@ -42,7 +41,7 @@ public:
  *        just the ones flagged as archivable.
  * @return true if the flight was saved successfully.
  */
-extern bool fgSaveFlight (ostream &output, bool write_all = false);
+extern bool fgSaveFlight (std::ostream &output, bool write_all = false);
 
 
 /**
@@ -54,7 +53,7 @@ extern bool fgSaveFlight (ostream &output, bool write_all = false);
  * @param input The input stream to read the XML from.
  * @return true if the flight was restored successfully.
  */
-extern bool fgLoadFlight (istream &input);
+extern bool fgLoadFlight (std::istream &input);
 
 
 /**
@@ -535,7 +534,7 @@ fgTie (const char * name, T * obj, int index,
 class FGMakeUpperCase : public SGPropertyChangeListener {
 public:
     void valueChanged(SGPropertyNode *node) {
-        if (node->getType() != SGPropertyNode::STRING)
+        if (node->getType() != simgear::props::STRING)
             return;
 
         char *s = const_cast<char *>(node->getStringValue());