X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Ffg_props.hxx;h=41772ff358345d94f66eeab7b8f9563e9f26d7ae;hb=b587400846111cc4d6713dcdd38b715c97923d5a;hp=4025b185dfc424a2298ddeacdd879ed031d6f619;hpb=1ec6acce39533cd43d5bbf42c277f34a6d614205;p=flightgear.git diff --git a/src/Main/fg_props.hxx b/src/Main/fg_props.hxx index 4025b185d..41772ff35 100644 --- 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 -#include -#include +#include + #include +#include -#include "globals.hxx" +#include
- //////////////////////////////////////////////////////////////////////// // 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(node->getStringValue());