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

diff --git a/src/Aircraft/aircraft.cxx b/src/Aircraft/aircraft.cxx
index 7bafb99aebdb6a3a06eb83554ad39632f38cb3f9..60b5eb311d3f95ebe9abe2036c3acd7f6c4f48d0 100644 (file)
--- 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 6ca0c5d8a1627d6a68a44b218363cee0477fd71d..95763b017c0f3326b904ea0c5b08a0632ad3fad8 100644 (file)
--- 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 150dbf296dfc6681c635671dc4342c16faff17ea..2e3da344c27445d30b3ef68ecc3dd8804f1d4580 100644 (file)
--- 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 bd171705555afd9a98dec5494f37d89883b696fd..d9ea286f7ebf6946917643aaa91ff1f172ec10f4 100644 (file)
--- 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 98178b5b25739290491d373354024412655074eb..5440ba253b87a4d194e0e5b10fe6551285062624 100644 (file)
--- 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 62e4903b21584e93805c488d6c52ce3f649c521f..f97348c89fc06f92edea0428b474b74c3ae5477b 100644 (file)
--- 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 869b20a19902bb39b6543309c4759a1d8d85446c..5b132f420751a771d29f01f78cbd1c3db41cf25c 100644 (file)
--- 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 85f30df4d04173e39b23223b79ecc23ef2339891..f05c6211fe9f7d1b7b0bf3e5269f3bcb34a549d3 100644 (file)
--- 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 c16266c14b60e7d7817ff2cfb931be632befc9b4..50866ad1450fcdb101aed5af2f0916ea3a511085 100644 (file)
--- 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 35ed164d4eb6c206b9eca0f22e5142f9d0587a20..c11cbc97e5fbc6157be4d398f87ed45cd05119e2 100644 (file)
--- 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 67d4b857dd0ec3f6a903f9161e72e9b100829113..434b73c2ecb8b677267fcefe6ce118d7815c0213 100644 (file)
--- 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 a208a14d61b9658a76e3c00e2dc1d22c5ba03ba9..dc9c094b9871af5e0a2a2b1b622804710b65ca4f 100644 (file)
--- 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 29134738a7730c7abcbe15b9db432545e3f60974..15e3caaa325f6e0a565b81691b595aa5cd8ca3d2 100644 (file)
--- 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 f4b410a70b7b29e17c3b9dcaebe709ab47ab6d82..8ed56f001ef2fa47f225dabb173c9db320e9d4b8 100644 (file)
--- 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 7fec6d02b5813b0d6f5bb762e91a13ddf6b342d6..c815548e13ccf1798b395d76681cfc6badc29a2b 100644 (file)
--- 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 92b24b0ae5cc1bc4c482d4671ee20efa8934dd2e..27c9e49dc909bd3beafa2216816b47204b7b6eb5 100644 (file)
--- 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 2bea8421895d64acdbb17dbab87edc6297403c16..817c761cb7d9424a41a47a62344350cb80967fd1 100644 (file)
--- 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 a50c56c0632301a6d682a67d040a61f014c536da..b163cb00ee69b175341d1d9c27c75438e04315fe 100644 (file)
--- 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 557e4496349b90c985fe1d96067af5e11294de3f..699aa144c4f4fd89cbbb7020cfc153a1488b3171 100644 (file)
--- 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 71b34680b0097298857157470432ff7fca1aadd0..85811423cd99e6b493200d52f8ce326a4efd80c3 100644 (file)
--- 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 91338d9133b90a6ceae7b4b919b7430cb3d24e97..d1cb6d1f59c9ab0a89fabee99c84d501b5cd2766 100644 (file)
--- 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 2892faa3e5fa67b671f425ee81b9ca365efa7513..21ce5856350b01764a3b836bd71c8a641bf00685 100644 (file)
--- 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 29a8cde7bce9d9f564f94af5182a2a0b8e020ca9..696740147dd77be696829a866c1e7cf62089e724 100644 (file)
--- 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 ca5312050efb44e725ee243b8ad50917ea18aef4..95781f87625e54a144621ee44df3a2d167221167 100644 (file)
--- 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 818d29bb81c70eaebf5fff772e41ff27b42a9983..ef35d0d18026ac446ad6b9100f11111cd972daa6 100644 (file)
--- 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 d84c5186079667398f25ce99f7c85b43adb974e7..c62a787a7b6b0ad9ffb9f8cf2ba2cc2486a99a4e 100644 (file)
--- 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 c38f0c4089ab69b52e91e6ca36f24ab100bbf471..66c6cad424da4595ec4894b75d3479028fbccdd1 100644 (file)
--- 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 1a83e70c85a609fc3a5812f00f618826019ccc4e..fd783398f6ec197a045ba25b1bcd02b20b7dcc6f 100644 (file)
--- 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 3daea45a0293e03b7f29780ed7038c640c204bba..2795c92cbf70c6068cfe4acc01078731d132dce1 100644 (file)
--- 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 237e9619545f02c4009107cbe5b7f1fcc4f69cbe..5be5d384f84f032c526b828ee37908cc97451ada 100644 (file)
--- 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 f0dc4ffe10411e6df7a4de666276c49f3218fe5f..7ec9fef8f3890d5ab1da9682ef3b0da2bdb639a6 100644 (file)
--- 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";