Fix indentation and mixed-up white-space/tabs

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

diff --git a/src/Main/fg_props.hxx b/src/Main/fg_props.hxx
index 055beaeea18d2d0bb958b9cd299651801de4d4a9..023d4dbbff4c1f42db65f3f935b5e01c832c7b0b 100644 (file)
--- a/src/Main/fg_props.hxx
+++ b/src/Main/fg_props.hxx
@@ -9,7 +9,7 @@
 #include <iosfwd>
 
 #include <simgear/structure/subsystem_mgr.hxx>
-#include <simgear/math/SGMath.hxx>
+#include <simgear/props/tiedpropertylist.hxx>
 
 #include <Main/globals.hxx>
 
@@ -27,6 +27,9 @@ public:
     void bind ();
     void unbind ();
     void update (double dt);
+
+private:
+    simgear::TiedPropertyList _tiedProperties;
 };
 
 
@@ -70,6 +73,8 @@ extern bool fgLoadFlight (std::istream &input);
 extern bool fgLoadProps (const char * path, SGPropertyNode * props,
                          bool in_fg_root = true, int default_mode = 0);
 
+void setLoggingClasses (const char * c);
+void setLoggingPriority (const char * p);
 
 \f
 ////////////////////////////////////////////////////////////////////////
@@ -294,7 +299,7 @@ inline int fgGetInt (const std::string & name, int defaultValue = 0)
  *        does not exist.
  * @return The property's value as a long, or the default value provided.
  */
-extern int fgGetLong (const char * name, long defaultValue = 0L);
+extern long fgGetLong (const char * name, long defaultValue = 0L);
 
 /**
  * Get a long value for a property.
@@ -310,7 +315,7 @@ extern int fgGetLong (const char * name, long defaultValue = 0L);
  *        does not exist.
  * @return The property's value as a long, or the default value provided.
  */
-inline int fgGetLong (const std::string & name, long defaultValue = 0L)
+inline long fgGetLong (const std::string & name, long defaultValue = 0L)
 {
     return fgGetLong( name.c_str(), defaultValue );
 }
@@ -420,7 +425,7 @@ extern const char * fgGetString (const char * name,
  * @return The property's value as a string, or the default value provided.
  */
 inline const char * fgGetString (const std::string & name,
-                                const std::string & defaultValue = string(""))
+                                 const std::string & defaultValue = std::string(""))
 {
     return fgGetString( name.c_str(), defaultValue.c_str() );
 }
@@ -557,7 +562,7 @@ extern bool fgSetFloat (const char * name, float val);
  */
 inline bool fgSetFloat (const std::string & name, float val)
 {
-    return fgSetBool( name.c_str(), val );
+    return fgSetFloat( name.c_str(), val );
 }