Merge branch 'curt/make' into next

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

diff --git a/src/Main/fg_props.hxx b/src/Main/fg_props.hxx
index b20f102922b88488d2383351e3f9c8b1c2665750..41772ff358345d94f66eeab7b8f9563e9f26d7ae 100644 (file)
--- a/src/Main/fg_props.hxx
+++ b/src/Main/fg_props.hxx
@@ -6,14 +6,13 @@
 #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 <iosfwd>
+
 #include <simgear/structure/subsystem_mgr.hxx>
+#include <simgear/math/SGMath.hxx>
 
-#include "globals.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,10 +534,10 @@ 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 = (char *)node->getStringValue();
+        char *s = const_cast<char *>(node->getStringValue());
         for (; *s; s++)
             *s = toupper(*s);
     }