From 14885374de79779e3f642f6ecb39d4723836166a Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Thu, 31 Jul 2008 12:04:32 +0000
Subject: [PATCH] header cleanups

---
 src/AIModel/AIFlightPlan.cxx |  2 ++
 src/AIModel/AIManager.cxx    |  6 +++---
 src/AIModel/submodel.cxx     |  1 +
 src/ATCDCL/ATCDialog.cxx     |  1 +
 src/Autopilot/xmlauto.cxx    |  1 +
 src/Cockpit/hud.cxx          |  2 ++
 src/Environment/fgclouds.cxx |  2 ++
 src/GUI/new_gui.cxx          |  1 +
 src/Input/fgjs.cxx           |  1 +
 src/Main/fg_commands.cxx     |  1 +
 src/Main/fg_props.cxx        | 18 +++++-------------
 src/Main/fg_props.hxx        | 12 +++++-------
 src/Main/globals.cxx         |  2 ++
 src/Main/globals.hxx         | 32 ++++++++++++--------------------
 src/Main/logger.cxx          | 13 +++++++------
 src/Main/logger.hxx          | 11 -----------
 src/Main/main.cxx            |  9 +++++----
 src/Main/options.cxx         |  1 +
 src/Network/ATC-Inputs.cxx   |  1 +
 src/Network/ATC-Main.cxx     |  1 +
 src/Network/ATC-Outputs.cxx  |  1 +
 src/Scripting/NasalSys.cxx   |  1 +
 src/Systems/electrical.cxx   |  1 +
 src/Systems/system_mgr.cxx   |  1 +
 24 files changed, 58 insertions(+), 64 deletions(-)

diff --git a/src/AIModel/AIFlightPlan.cxx b/src/AIModel/AIFlightPlan.cxx
index abb49de43..6f3f3dc41 100644
--- a/src/AIModel/AIFlightPlan.cxx
+++ b/src/AIModel/AIFlightPlan.cxx
@@ -27,6 +27,8 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/constants.h>
 #include <simgear/props/props.hxx>
+#include <simgear/props/props_io.hxx>
+
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/fg_init.hxx>
diff --git a/src/AIModel/AIManager.cxx b/src/AIModel/AIManager.cxx
index 01bef48f2..aac54ab9b 100644
--- a/src/AIModel/AIManager.cxx
+++ b/src/AIModel/AIManager.cxx
@@ -18,6 +18,9 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+#include <simgear/math/sg_geodesy.hxx>
+#include <simgear/props/props_io.hxx>
+
 #include <Main/globals.hxx>
 
 #include <Airports/simple.hxx>
@@ -35,9 +38,6 @@
 #include "AITanker.hxx"
 #include "AIWingman.hxx"
 
-#include <simgear/math/sg_geodesy.hxx>
-
-
 FGAIManager::FGAIManager() {
     _dt = 0.0;
     mNumAiModels = 0;
diff --git a/src/AIModel/submodel.cxx b/src/AIModel/submodel.cxx
index af67c1d5a..a7c79f4a4 100644
--- a/src/AIModel/submodel.cxx
+++ b/src/AIModel/submodel.cxx
@@ -13,6 +13,7 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/math/sg_geodesy.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <Main/fg_props.hxx>
 #include <Main/util.hxx>
diff --git a/src/ATCDCL/ATCDialog.cxx b/src/ATCDCL/ATCDialog.cxx
index 80d7edce0..4902947bc 100644
--- a/src/ATCDCL/ATCDialog.cxx
+++ b/src/ATCDCL/ATCDialog.cxx
@@ -25,6 +25,7 @@
 #include <simgear/compiler.h>
 
 #include <simgear/structure/commands.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <Main/globals.hxx>
 #include <GUI/gui.h>		// mkDialog
diff --git a/src/Autopilot/xmlauto.cxx b/src/Autopilot/xmlauto.cxx
index c18234160..17ea68cba 100644
--- a/src/Autopilot/xmlauto.cxx
+++ b/src/Autopilot/xmlauto.cxx
@@ -29,6 +29,7 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/sg_inlines.h>
+#include <simgear/props/props_io.hxx>
 
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
diff --git a/src/Cockpit/hud.cxx b/src/Cockpit/hud.cxx
index 617909b2a..bee7a6011 100644
--- a/src/Cockpit/hud.cxx
+++ b/src/Cockpit/hud.cxx
@@ -38,6 +38,8 @@
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/props/props_io.hxx>
+
 #include <osg/GLU>
 
 #include <Aircraft/aircraft.hxx>
diff --git a/src/Environment/fgclouds.cxx b/src/Environment/fgclouds.cxx
index 1104f7678..5129c08d8 100644
--- a/src/Environment/fgclouds.cxx
+++ b/src/Environment/fgclouds.cxx
@@ -33,6 +33,8 @@
 #include <simgear/scene/sky/cloudfield.hxx>
 #include <simgear/scene/sky/newcloud.hxx>
 #include <simgear/math/sg_random.h>
+#include <simgear/props/props_io.hxx>
+
 #include <Main/globals.hxx>
 #include <Airports/simple.hxx>
 #include <Main/util.hxx>
diff --git a/src/GUI/new_gui.cxx b/src/GUI/new_gui.cxx
index 3ac483abc..ff9c7ad3c 100644
--- a/src/GUI/new_gui.cxx
+++ b/src/GUI/new_gui.cxx
@@ -12,6 +12,7 @@
 
 #include <simgear/compiler.h>
 #include <simgear/structure/exception.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <Main/fg_props.hxx>
 
diff --git a/src/Input/fgjs.cxx b/src/Input/fgjs.cxx
index 6f0176b4b..918d9df5d 100644
--- a/src/Input/fgjs.cxx
+++ b/src/Input/fgjs.cxx
@@ -50,6 +50,7 @@ using std::string;
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/misc/sgstream.hxx>
 #include <simgear/structure/exception.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <Main/fg_io.hxx>
 #include <Main/fg_props.hxx>
diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index ba47d0bfd..9b0fd0f40 100644
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -18,6 +18,7 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/structure/commands.hxx>
 #include <simgear/props/props.hxx>
+#include <simgear/structure/event_mgr.hxx>
 
 #include <Cockpit/panel.hxx>
 #include <Cockpit/panel_io.hxx>
diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx
index 8ed56f001..6d0cb799a 100644
--- a/src/Main/fg_props.cxx
+++ b/src/Main/fg_props.cxx
@@ -25,29 +25,21 @@
 #endif
 
 #include <simgear/compiler.h>
-
 #include <simgear/structure/exception.hxx>
+#include <simgear/props/props_io.hxx>
+
 #include <simgear/magvar/magvar.hxx>
 #include <simgear/timing/sg_time.hxx>
 #include <simgear/misc/sg_path.hxx>
-#include <simgear/scene/material/matlib.hxx>
 #include <simgear/sound/soundmgr_openal.hxx>
 
-#include <iostream>
-
 #include <Aircraft/aircraft.hxx>
 #include <FDM/flight.hxx>
-
-#include <Time/tmp.hxx>
-#include <Environment/environment.hxx>
-
 #include <GUI/gui.h>
 
 #include "globals.hxx"
 #include "fg_props.hxx"
 
-using std::istream;
-using std::ostream;
 
 static bool winding_ccw = true; // FIXME: temporary
 
@@ -55,7 +47,7 @@ static bool fdm_data_logging = false; // FIXME: temporary
 
 static bool frozen = false;	// FIXME: temporary
 
-
+using std::string;
 
 ////////////////////////////////////////////////////////////////////////
 // Default property bindings (not yet handled by any module).
@@ -592,7 +584,7 @@ FGProperties::update (double dt)
  * Save the current state of the simulator to a stream.
  */
 bool
-fgSaveFlight (ostream &output, bool write_all)
+fgSaveFlight (std::ostream &output, bool write_all)
 {
 
   fgSetBool("/sim/presets/onground", false);
@@ -616,7 +608,7 @@ fgSaveFlight (ostream &output, bool write_all)
  * Restore the current state of the simulator from a stream.
  */
 bool
-fgLoadFlight (istream &input)
+fgLoadFlight (std::istream &input)
 {
   SGPropertyNode props;
   try {
diff --git a/src/Main/fg_props.hxx b/src/Main/fg_props.hxx
index 4025b185d..ef6ed69d9 100644
--- a/src/Main/fg_props.hxx
+++ b/src/Main/fg_props.hxx
@@ -6,13 +6,11 @@
 #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 "globals.hxx"
-
+#include <Main/globals.hxx>
 
 ////////////////////////////////////////////////////////////////////////
 // Property management.
@@ -42,7 +40,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 +52,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);
 
 
 /**
diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index ac4e72541..30e3585fe 100644
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -31,6 +31,8 @@
 #include <simgear/ephemeris/ephemeris.hxx>
 #include <simgear/magvar/magvar.hxx>
 #include <simgear/scene/material/matlib.hxx>
+#include <simgear/structure/subsystem_mgr.hxx>
+#include <simgear/structure/event_mgr.hxx>
 
 #include <Aircraft/controls.hxx>
 #include <Airports/runways.hxx>
diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index c815548e1..0c3de7f8a 100644
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -24,23 +24,14 @@
 #ifndef _GLOBALS_HXX
 #define _GLOBALS_HXX
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <simgear/compiler.h>
-#include <simgear/structure/callback.hxx>
+#include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
-#include <simgear/structure/event_mgr.hxx>
 
 #include <vector>
 #include <string>
 
-using std::vector;
-using std::string;
-
-typedef vector<string> string_list;
-
+typedef std::vector<std::string> string_list;
 
 // Forward declarations
 
@@ -53,14 +44,15 @@ typedef vector<string> string_list;
 // anyway.
 
 class SGEphemeris;
-
 class SGCommandMgr;
 class SGMagVar;
 class SGMaterialLib;
 class SGPropertyNode;
 class SGTime;
 class SGSoundMgr;
-
+class SGEventMgr;
+class SGSubsystemMgr;
+class SGSubsystem;
 
 class FGAirportList;
 class FGRunwayList;
@@ -111,12 +103,12 @@ private:
     double sim_time_sec;
 
     // Root of FlightGear data tree
-    string fg_root;
+    std::string fg_root;
 
     // Roots of FlightGear scenery tree
     string_list fg_scenery;
 
-    string browser;
+    std::string browser;
 
     // An offset in seconds from the true time.  Allows us to adjust
     // the effective time of day.
@@ -229,14 +221,14 @@ public:
     inline void inc_sim_time_sec (double dt) { sim_time_sec += dt; }
     inline void set_sim_time_sec (double t) { sim_time_sec = t; }
 
-    inline const string &get_fg_root () const { return fg_root; }
-    void set_fg_root (const string &root);
+    inline const std::string &get_fg_root () const { return fg_root; }
+    void set_fg_root (const std::string &root);
 
     inline const string_list &get_fg_scenery () const { return fg_scenery; }
-    void set_fg_scenery (const string &scenery);
+    void set_fg_scenery (const std::string &scenery);
 
-    inline const string &get_browser () const { return browser; }
-    void set_browser (const string &b) { browser = b; }
+    inline const std::string &get_browser () const { return browser; }
+    void set_browser (const std::string &b) { browser = b; }
 
     inline long int get_warp() const { return warp; }
     inline void set_warp( long int w ) { warp = w; }
diff --git a/src/Main/logger.cxx b/src/Main/logger.cxx
index 71ee3f554..95e0a5dbe 100644
--- a/src/Main/logger.cxx
+++ b/src/Main/logger.cxx
@@ -3,20 +3,21 @@
 //
 // This file is in the Public Domain, and comes with no warranty.
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include "logger.hxx"
 
 #include <fstream>
 #include <string>
 
-using std::ofstream;
-using std::endl;
-using std::string;
-
 #include <simgear/debug/logstream.hxx>
 
 #include "fg_props.hxx"
 
-
+using std::string;
+using std::endl;
 
 ////////////////////////////////////////////////////////////////////////
 // Implementation of FGLogger
@@ -72,7 +73,7 @@ FGLogger::init ()
     //
     // Process the individual entries (Time is automatic).
     //
-    vector<SGPropertyNode_ptr> entries = child->getChildren("entry");
+    std::vector<SGPropertyNode_ptr> entries = child->getChildren("entry");
     (*log.output) << "Time";
     for (unsigned int j = 0; j < entries.size(); j++) {
       SGPropertyNode * entry = entries[j];
diff --git a/src/Main/logger.hxx b/src/Main/logger.hxx
index 184af4425..1f99cd910 100644
--- a/src/Main/logger.hxx
+++ b/src/Main/logger.hxx
@@ -6,22 +6,11 @@
 #ifndef __LOGGER_HXX
 #define __LOGGER_HXX 1
 
-#ifndef __cplusplus
-# error This library requires C++
-#endif
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <iosfwd>
 #include <vector>
 
 #include <simgear/compiler.h>
-#include <simgear/debug/logstream.hxx>
-#include <simgear/structure/exception.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
-#include <simgear/props/props.hxx>
 
 /**
  * Log any property values to any number of CSV files.
diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 27c9e49dc..d2d678761 100644
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -34,10 +34,6 @@
 
 #include <plib/netSocket.h>
 
-#include <simgear/props/props.hxx>
-#include <simgear/timing/sg_time.hxx>
-#include <simgear/math/sg_random.h>
-
 #include <osgDB/Registry>
 
 // Class references
@@ -46,6 +42,11 @@
 #include <simgear/scene/material/matlib.hxx>
 #include <simgear/scene/model/animation.hxx>
 #include <simgear/scene/sky/sky.hxx>
+#include <simgear/structure/event_mgr.hxx>
+#include <simgear/props/props.hxx>
+#include <simgear/timing/sg_time.hxx>
+#include <simgear/math/sg_random.h>
+
 #include <Time/light.hxx>
 #include <Include/general.hxx>
 #include <Aircraft/replay.hxx>
diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index a36ad671d..6286578af 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -40,6 +40,7 @@
 #include <plib/ul.h>
 
 #include <simgear/math/sg_random.h>
+#include <simgear/props/props_io.hxx>
 #include <simgear/misc/sgstream.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/scene/material/mat.hxx>
diff --git a/src/Network/ATC-Inputs.cxx b/src/Network/ATC-Inputs.cxx
index 378f215c8..ebf008719 100644
--- a/src/Network/ATC-Inputs.cxx
+++ b/src/Network/ATC-Inputs.cxx
@@ -42,6 +42,7 @@
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <Main/fg_props.hxx>
 
diff --git a/src/Network/ATC-Main.cxx b/src/Network/ATC-Main.cxx
index 962996d62..8e1b81cda 100644
--- a/src/Network/ATC-Main.cxx
+++ b/src/Network/ATC-Main.cxx
@@ -41,6 +41,7 @@
 #include <plib/ul.h>
 
 #include <simgear/debug/logstream.hxx>
+#include <simgear/props/props_io.hxx>
 #include <simgear/io/iochannel.hxx>
 #include <simgear/math/sg_types.hxx>
 #include <simgear/misc/sg_path.hxx>
diff --git a/src/Network/ATC-Outputs.cxx b/src/Network/ATC-Outputs.cxx
index 79a9dcb26..f4b3dbae2 100644
--- a/src/Network/ATC-Outputs.cxx
+++ b/src/Network/ATC-Outputs.cxx
@@ -42,6 +42,7 @@
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <Main/fg_props.hxx>
 
diff --git a/src/Scripting/NasalSys.cxx b/src/Scripting/NasalSys.cxx
index e7fefb46e..1177b2102 100644
--- a/src/Scripting/NasalSys.cxx
+++ b/src/Scripting/NasalSys.cxx
@@ -23,6 +23,7 @@
 #include <simgear/scene/material/mat.hxx>
 #include <simgear/structure/commands.hxx>
 #include <simgear/math/sg_geodesy.hxx>
+#include <simgear/structure/event_mgr.hxx>
 
 #include <Airports/runways.hxx>
 #include <Airports/simple.hxx>
diff --git a/src/Systems/electrical.cxx b/src/Systems/electrical.cxx
index e015487b1..2bd473c09 100644
--- a/src/Systems/electrical.cxx
+++ b/src/Systems/electrical.cxx
@@ -27,6 +27,7 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/debug/logstream.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
diff --git a/src/Systems/system_mgr.cxx b/src/Systems/system_mgr.cxx
index 682293ef6..3a706d8ca 100644
--- a/src/Systems/system_mgr.cxx
+++ b/src/Systems/system_mgr.cxx
@@ -10,6 +10,7 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/sg_inlines.h>
+#include <simgear/props/props_io.hxx>
 
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>