From 429f2530de08f922d62fcfeade85740569e04768 Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Tue, 29 Jul 2008 08:27:48 +0000
Subject: [PATCH] James Turner:  * experimental clean-up / reduction on two of
 the FG headers:    (I'm going to await feedback on the developers list before
 doing more of     these, to avoiding going over files multiple times, but in
 principle it     seems pretty straightforward.)

 * final fixes for SG_USING_STD removal
---
 src/Aircraft/aircraft.cxx                  |  5 +++--
 src/Aircraft/aircraft.hxx                  | 16 ++++------------
 src/Aircraft/controls.cxx                  |  3 +++
 src/Aircraft/controls.hxx                  |  8 --------
 src/Environment/environment_mgr.cxx        |  1 +
 src/FDM/SP/Balloon.cxx                     |  3 ++-
 src/FDM/SP/Balloon.h                       |  1 -
 src/FDM/UIUCModel/uiuc_gear.cpp            |  5 -----
 src/FDM/UIUCModel/uiuc_warnings_errors.cpp |  6 +++---
 src/FDM/UIUCModel/uiuc_wrapper.cpp         |  7 +++----
 src/Instrumentation/HUD/HUD_runway.cxx     |  2 ++
 src/Instrumentation/navradio.cxx           |  1 +
 src/Main/fg_init.cxx                       |  1 +
 src/Main/fg_props.cxx                      |  2 ++
 src/Main/globals.hxx                       |  4 ++--
 src/Main/main.cxx                          |  2 +-
 src/Navaids/navdb.cxx                      |  2 +-
 src/Network/joyclient.cxx                  |  3 ++-
 src/Traffic/Schedule.cxx                   |  2 +-
 tests/test-up.cxx                          |  4 ++--
 utils/GPSsmooth/MIDG-II.cxx                |  4 ++--
 utils/GPSsmooth/MIDG-II.hxx                |  8 ++++----
 utils/GPSsmooth/MIDG_main.cxx              |  6 +++---
 utils/GPSsmooth/UGear.cxx                  |  4 ++--
 utils/GPSsmooth/UGear.hxx                  |  8 ++++----
 utils/GPSsmooth/UGear_command.hxx          |  8 ++++----
 utils/GPSsmooth/UGear_main.cxx             |  6 +++---
 utils/GPSsmooth/gps.cxx                    |  4 ++--
 utils/GPSsmooth/gps.hxx                    |  8 ++++----
 utils/GPSsmooth/gps_main.cxx               |  6 +++---
 utils/TerraSync/terrasync.cxx              |  6 +++---
 31 files changed, 68 insertions(+), 78 deletions(-)

diff --git a/src/Aircraft/aircraft.cxx b/src/Aircraft/aircraft.cxx
index 7bafb99ae..60b5eb311 100644
--- a/src/Aircraft/aircraft.cxx
+++ b/src/Aircraft/aircraft.cxx
@@ -24,8 +24,8 @@
 #  include "config.h"
 #endif
 
-#include <stdio.h>
-#include <string.h>		// strdup
+#include <cstdio>
+#include <cstring>		// strdup
 
 #include <plib/ul.h>
 
@@ -36,6 +36,7 @@
 #include <simgear/structure/exception.hxx>
 
 #include <Main/globals.hxx>
+#include <Main/fg_init.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/viewmgr.hxx>
 #include <Cockpit/panel.hxx>
diff --git a/src/Aircraft/aircraft.hxx b/src/Aircraft/aircraft.hxx
index 6ca0c5d8a..95763b017 100644
--- a/src/Aircraft/aircraft.hxx
+++ b/src/Aircraft/aircraft.hxx
@@ -25,18 +25,10 @@
 
 #ifndef _AIRCRAFT_HXX
 #define _AIRCRAFT_HXX
-
-
-#ifndef __cplusplus                                                          
-# error This library requires C++
-#endif                                   
-
-
-#include <FDM/flight.hxx>
-#include <Main/fg_init.hxx>
-
-#include "controls.hxx"
-
+                                 
+class FGInterface;
+class FGControls;
+class SGPropertyNode;
 
 // Define a structure containing all the parameters for an aircraft
 typedef struct{
diff --git a/src/Aircraft/controls.cxx b/src/Aircraft/controls.cxx
index 150dbf296..2e3da344c 100644
--- a/src/Aircraft/controls.cxx
+++ b/src/Aircraft/controls.cxx
@@ -20,6 +20,9 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
 #include <simgear/compiler.h>
 #include <simgear/debug/logstream.hxx>
diff --git a/src/Aircraft/controls.hxx b/src/Aircraft/controls.hxx
index bd1717055..d9ea286f7 100644
--- a/src/Aircraft/controls.hxx
+++ b/src/Aircraft/controls.hxx
@@ -24,16 +24,8 @@
 #ifndef _CONTROLS_HXX
 #define _CONTROLS_HXX
 
-#include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 
-#include <Main/globals.hxx>
-
-#ifndef __cplusplus                                                          
-# error This library requires C++
-#endif                                   
-
-
 // Define a structure containing the control parameters
 
 class FGControls : public SGSubsystem
diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx
index 98178b5b2..5440ba253 100644
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@@ -31,6 +31,7 @@
 #include <Main/main.hxx>
 #include <Main/fg_props.hxx>
 #include <Aircraft/aircraft.hxx>
+#include <FDM/flight.hxx>
 
 #include "environment.hxx"
 #include "environment_ctrl.hxx"
diff --git a/src/FDM/SP/Balloon.cxx b/src/FDM/SP/Balloon.cxx
index 62e4903b2..f97348c89 100644
--- a/src/FDM/SP/Balloon.cxx
+++ b/src/FDM/SP/Balloon.cxx
@@ -50,12 +50,13 @@ HISTORY
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/misc/sg_path.hxx>
 
-#include <Aircraft/aircraft.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
+#include <Aircraft/controls.hxx>
 
 #include "Balloon.h"
 
+
 /****************************************************************************/
 /********************************** CODE ************************************/
 /****************************************************************************/
diff --git a/src/FDM/SP/Balloon.h b/src/FDM/SP/Balloon.h
index 869b20a19..5b132f420 100644
--- a/src/FDM/SP/Balloon.h
+++ b/src/FDM/SP/Balloon.h
@@ -42,7 +42,6 @@ HISTORY
 /* INCLUDES								    */
 /****************************************************************************/
 
-#include <Aircraft/aircraft.hxx>
 #include <FDM/flight.hxx>
 
 #include "BalloonSim.h"
diff --git a/src/FDM/UIUCModel/uiuc_gear.cpp b/src/FDM/UIUCModel/uiuc_gear.cpp
index 85f30df4d..f05c6211f 100644
--- a/src/FDM/UIUCModel/uiuc_gear.cpp
+++ b/src/FDM/UIUCModel/uiuc_gear.cpp
@@ -72,11 +72,6 @@
 
 #include "uiuc_gear.h"
 
-
-
-using std::cerr;
-
-
 #define HEIGHT_AGL_WHEEL d_wheel_rwy_local_v[2]
 
 
diff --git a/src/FDM/UIUCModel/uiuc_warnings_errors.cpp b/src/FDM/UIUCModel/uiuc_warnings_errors.cpp
index c16266c14..50866ad14 100644
--- a/src/FDM/UIUCModel/uiuc_warnings_errors.cpp
+++ b/src/FDM/UIUCModel/uiuc_warnings_errors.cpp
@@ -78,11 +78,11 @@ Prints to screen the follow:
 
 #include "uiuc_warnings_errors.h"
 
-SG_USING_STD (cerr);
-SG_USING_STD (endl);
+using std::cerr;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD (exit);
+using std::exit;
 #endif
 
 void uiuc_warnings_errors(int errorCode, std::string line)
diff --git a/src/FDM/UIUCModel/uiuc_wrapper.cpp b/src/FDM/UIUCModel/uiuc_wrapper.cpp
index 35ed164d4..c11cbc97e 100644
--- a/src/FDM/UIUCModel/uiuc_wrapper.cpp
+++ b/src/FDM/UIUCModel/uiuc_wrapper.cpp
@@ -82,6 +82,8 @@
 #  include <config.h>
 #endif
 
+#include <iostream>
+
 #include <simgear/compiler.h>
 #include <simgear/misc/sg_path.hxx>
 #include <Aircraft/aircraft.hxx>
@@ -102,9 +104,6 @@
 //#include "uiuc_network.h"
 #include "uiuc_get_flapper.h"
 
-using std::cout;
-using std::endl;
-
 extern "C" void uiuc_initial_init ();
 extern "C" void uiuc_defaults_inits ();
 extern "C" void uiuc_vel_init ();
@@ -323,7 +322,7 @@ void uiuc_init_aeromodel ()
   SGPath path(globals->get_fg_root());
   path.append(fgGetString("/sim/aircraft-dir"));
   path.append("aircraft.dat");
-  cout << "We are using "<< path.str() << endl;
+  std::cout << "We are using "<< path.str() << std::endl;
   uiuc_initializemaps(); // Initialize the <string,int> maps
   uiuc_menu(path.str());   // Read the specified aircraft file 
 }
diff --git a/src/Instrumentation/HUD/HUD_runway.cxx b/src/Instrumentation/HUD/HUD_runway.cxx
index 67d4b857d..434b73c2e 100644
--- a/src/Instrumentation/HUD/HUD_runway.cxx
+++ b/src/Instrumentation/HUD/HUD_runway.cxx
@@ -31,6 +31,8 @@
 #include <Main/globals.hxx>
 #include <Scenery/scenery.hxx>
 #include <Aircraft/aircraft.hxx>
+#include <Aircraft/controls.hxx>
+#include <FDM/flight.hxx>
 #include <Environment/environment.hxx>
 #include <Environment/environment_mgr.hxx>
 #include <Main/viewer.hxx>
diff --git a/src/Instrumentation/navradio.cxx b/src/Instrumentation/navradio.cxx
index a208a14d6..dc9c094b9 100644
--- a/src/Instrumentation/navradio.cxx
+++ b/src/Instrumentation/navradio.cxx
@@ -33,6 +33,7 @@
 #include <simgear/sg_inlines.h>
 #include <simgear/math/sg_random.h>
 #include <simgear/math/vector.hxx>
+#include <simgear/structure/exception.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Navaids/navlist.hxx>
diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 29134738a..15e3caaa3 100644
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -62,6 +62,7 @@
 #include <simgear/timing/lowleveltime.h>
 
 #include <Aircraft/aircraft.hxx>
+#include <Aircraft/controls.hxx>
 #include <Aircraft/replay.hxx>
 #include <Airports/apt_loader.hxx>
 #include <Airports/runways.hxx>
diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx
index f4b410a70..8ed56f001 100644
--- a/src/Main/fg_props.cxx
+++ b/src/Main/fg_props.cxx
@@ -36,6 +36,8 @@
 #include <iostream>
 
 #include <Aircraft/aircraft.hxx>
+#include <FDM/flight.hxx>
+
 #include <Time/tmp.hxx>
 #include <Environment/environment.hxx>
 
diff --git a/src/Main/globals.hxx b/src/Main/globals.hxx
index 7fec6d02b..c815548e1 100644
--- a/src/Main/globals.hxx
+++ b/src/Main/globals.hxx
@@ -36,8 +36,8 @@
 #include <vector>
 #include <string>
 
-SG_USING_STD( vector );
-SG_USING_STD( string );
+using std::vector;
+using std::string;
 
 typedef vector<string> string_list;
 
diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 92b24b0ae..27c9e49dc 100644
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -73,7 +73,7 @@
 #include "splash.hxx"
 #include "main.hxx"
 #include "util.hxx"
-
+#include "fg_init.hxx"
 
 static double real_delta_time_sec = 0.0;
 double delta_time_sec = 0.0;
diff --git a/src/Navaids/navdb.cxx b/src/Navaids/navdb.cxx
index 2bea84218..817c761cb 100644
--- a/src/Navaids/navdb.cxx
+++ b/src/Navaids/navdb.cxx
@@ -37,7 +37,7 @@
 #include "navrecord.hxx"
 #include "navdb.hxx"
 
-SG_USING_STD( string );
+using std::string;
 
 
 // load and initialize the navigational databases
diff --git a/src/Network/joyclient.cxx b/src/Network/joyclient.cxx
index a50c56c06..b163cb00e 100644
--- a/src/Network/joyclient.cxx
+++ b/src/Network/joyclient.cxx
@@ -27,7 +27,8 @@
 #include <simgear/debug/logstream.hxx>
 #include <simgear/io/iochannel.hxx>
 
-#include <Aircraft/aircraft.hxx>
+#include <Aircraft/controls.hxx>
+#include <Main/globals.hxx>
 
 #include "joyclient.hxx"
 
diff --git a/src/Traffic/Schedule.cxx b/src/Traffic/Schedule.cxx
index 557e44963..699aa144c 100644
--- a/src/Traffic/Schedule.cxx
+++ b/src/Traffic/Schedule.cxx
@@ -57,7 +57,7 @@
 #include "SchedFlight.hxx"
 #include "TrafficMgr.hxx"
 
-SG_USING_STD( sort );
+using std::sort;
 
 /******************************************************************************
  * the FGAISchedule class contains data members and code to maintain a
diff --git a/tests/test-up.cxx b/tests/test-up.cxx
index 71b34680b..85811423c 100644
--- a/tests/test-up.cxx
+++ b/tests/test-up.cxx
@@ -13,8 +13,8 @@
 #include <simgear/constants.h>
 #include <simgear/math/sg_geodesy.hxx>
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cout;
+using std::endl;
 
 int main() {
     // for each lat/lon given in goedetic coordinates, calculate
diff --git a/utils/GPSsmooth/MIDG-II.cxx b/utils/GPSsmooth/MIDG-II.cxx
index 91338d913..d1cb6d1f5 100644
--- a/utils/GPSsmooth/MIDG-II.cxx
+++ b/utils/GPSsmooth/MIDG-II.cxx
@@ -13,8 +13,8 @@
 
 #include "MIDG-II.hxx"
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cout;
+using std::endl;
 
 
 MIDGTrack::MIDGTrack() {};
diff --git a/utils/GPSsmooth/MIDG-II.hxx b/utils/GPSsmooth/MIDG-II.hxx
index 2892faa3e..21ce58563 100644
--- a/utils/GPSsmooth/MIDG-II.hxx
+++ b/utils/GPSsmooth/MIDG-II.hxx
@@ -16,10 +16,10 @@
 #include <simgear/io/iochannel.hxx>
 #include <simgear/serial/serial.hxx>
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::cout;
+using std::endl;
+using std::string;
+using std::vector;
 
 
 // encapsulate a midg integer time (fixme, assumes all times in a track
diff --git a/utils/GPSsmooth/MIDG_main.cxx b/utils/GPSsmooth/MIDG_main.cxx
index 29a8cde7b..696740147 100644
--- a/utils/GPSsmooth/MIDG_main.cxx
+++ b/utils/GPSsmooth/MIDG_main.cxx
@@ -21,9 +21,9 @@
 #include "MIDG-II.hxx"
 
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
-SG_USING_STD(string);
+using std::cout;
+using std::endl;
+using std::string;
 
 
 // Network channels
diff --git a/utils/GPSsmooth/UGear.cxx b/utils/GPSsmooth/UGear.cxx
index ca5312050..95781f876 100644
--- a/utils/GPSsmooth/UGear.cxx
+++ b/utils/GPSsmooth/UGear.cxx
@@ -14,8 +14,8 @@
 
 #include "UGear.hxx"
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cout;
+using std::endl;
 
 
 #define START_OF_MSG0 147
diff --git a/utils/GPSsmooth/UGear.hxx b/utils/GPSsmooth/UGear.hxx
index 818d29bb8..ef35d0d18 100644
--- a/utils/GPSsmooth/UGear.hxx
+++ b/utils/GPSsmooth/UGear.hxx
@@ -16,10 +16,10 @@
 #include <simgear/io/iochannel.hxx>
 #include <simgear/serial/serial.hxx>
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::cout;
+using std::endl;
+using std::string;
+using std::vector;
 
 
 enum ugPacketType {
diff --git a/utils/GPSsmooth/UGear_command.hxx b/utils/GPSsmooth/UGear_command.hxx
index d84c51860..c62a787a7 100644
--- a/utils/GPSsmooth/UGear_command.hxx
+++ b/utils/GPSsmooth/UGear_command.hxx
@@ -16,10 +16,10 @@
 #include <simgear/io/iochannel.hxx>
 #include <simgear/serial/serial.hxx>
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
-SG_USING_STD(string);
-SG_USING_STD(queue);
+using std::cout;
+using std::endl;
+using std::string;
+using std::queue;
 
 
 // Manage UGear Command Channel
diff --git a/utils/GPSsmooth/UGear_main.cxx b/utils/GPSsmooth/UGear_main.cxx
index c38f0c408..66c6cad42 100644
--- a/utils/GPSsmooth/UGear_main.cxx
+++ b/utils/GPSsmooth/UGear_main.cxx
@@ -29,9 +29,9 @@
 #include "UGear_telnet.hxx"
 
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
-SG_USING_STD(string);
+using std::cout;
+using std::endl;
+using std::string;
 
 
 // Network channels
diff --git a/utils/GPSsmooth/gps.cxx b/utils/GPSsmooth/gps.cxx
index 1a83e70c8..fd783398f 100644
--- a/utils/GPSsmooth/gps.cxx
+++ b/utils/GPSsmooth/gps.cxx
@@ -10,8 +10,8 @@
 
 #include "gps.hxx"
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cout;
+using std::endl;
 
 
 GPSTrack::GPSTrack() {};
diff --git a/utils/GPSsmooth/gps.hxx b/utils/GPSsmooth/gps.hxx
index 3daea45a0..2795c92cb 100644
--- a/utils/GPSsmooth/gps.hxx
+++ b/utils/GPSsmooth/gps.hxx
@@ -8,10 +8,10 @@
 #include <string>
 #include <vector>
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
-SG_USING_STD(string);
-SG_USING_STD(vector);
+using std::cout;
+using std::endl;
+using std::string;
+using std::vector;
 
 
 // encapsulate a gps integer time (fixme, assumes all times in a track
diff --git a/utils/GPSsmooth/gps_main.cxx b/utils/GPSsmooth/gps_main.cxx
index 237e96195..5be5d384f 100644
--- a/utils/GPSsmooth/gps_main.cxx
+++ b/utils/GPSsmooth/gps_main.cxx
@@ -17,9 +17,9 @@
 #include "gps.hxx"
 
 
-SG_USING_STD(cout);
-SG_USING_STD(endl);
-SG_USING_STD(string);
+using std::cout;
+using std::endl;
+using std::string;
 
 
 // Network channels
diff --git a/utils/TerraSync/terrasync.cxx b/utils/TerraSync/terrasync.cxx
index f0dc4ffe1..7ec9fef8f 100644
--- a/utils/TerraSync/terrasync.cxx
+++ b/utils/TerraSync/terrasync.cxx
@@ -41,9 +41,9 @@
 
 #include <simgear/bucket/newbucket.hxx>
 
-SG_USING_STD(string);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::string;
+using std::cout;
+using std::endl;
 
 static string server = "scenery.flightgear.org";
 static string source_module = "Scenery";