Clean-up some SGMath dependencies.

diff --git a/src/AIModel/performancedb.cxx b/src/AIModel/performancedb.cxx
index 842cb9bf83aee16c14d409a7522057e5964c0a56..37660e6a0549191c347affb7134213d6098833cf 100644 (file)
--- a/src/AIModel/performancedb.cxx
+++ b/src/AIModel/performancedb.cxx
@@ -1,4 +1,3 @@
-#include <simgear/math/SGMath.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/props/props.hxx>
 #include <simgear/props/props_io.hxx>

diff --git a/src/Aircraft/flightrecorder.cxx b/src/Aircraft/flightrecorder.cxx
index dd4ccc15f5008a50ab59092f7a925dfd04c10db4..2605b38be3604201e3ce94eab7a7e8d2e740ae01 100644 (file)
--- a/src/Aircraft/flightrecorder.cxx
+++ b/src/Aircraft/flightrecorder.cxx
@@ -33,6 +33,7 @@
 #include <simgear/misc/ResourceManager.hxx>
 #include <simgear/misc/strutils.hxx>
 #include <simgear/structure/exception.hxx>
+#include <simgear/math/SGMath.hxx>
 #include <Main/fg_props.hxx>
 #include "flightrecorder.hxx"
 

diff --git a/src/Autopilot/logic.cxx b/src/Autopilot/logic.cxx
index 860af0e80043f8f5babab3584bfc7f12b7fdcb63..6f8a5304156397ba83d0882abee6e6941cec7537 100644 (file)
--- a/src/Autopilot/logic.cxx
+++ b/src/Autopilot/logic.cxx
@@ -24,7 +24,6 @@
 #ifndef HAVE_CONFIG_H
 #  include <config.h>
 #endif
-#include <simgear/math/SGMath.hxx>
 #endif
 
 #include "logic.hxx"

diff --git a/src/Environment/environment.cxx b/src/Environment/environment.cxx
index 95b45852ebb2ac37400c40e7500aff67dc754776..4b0a6e3284bc56c415f0ab451bbefa8a2cf288e3 100644 (file)
--- a/src/Environment/environment.cxx
+++ b/src/Environment/environment.cxx
@@ -28,6 +28,7 @@
 #include <boost/tuple/tuple.hpp>
 
 #include <simgear/props/props.hxx>
+#include <simgear/math/SGMath.hxx>
 
 #include <Main/fg_props.hxx>
 

diff --git a/src/Environment/environment_ctrl.cxx b/src/Environment/environment_ctrl.cxx
index e7c8820fa4a3d82a686577587b1d3eb315f85327..98f59cb9ef61eb1694f5d74dbd0c995d2095f043 100644 (file)
--- a/src/Environment/environment_ctrl.cxx
+++ b/src/Environment/environment_ctrl.cxx
@@ -26,6 +26,7 @@
 
 #include <algorithm>
 
+#include <simgear/math/SGMath.hxx>
 #include <Main/fg_props.hxx>
 #include "environment_ctrl.hxx"
 #include "environment.hxx"

diff --git a/src/Environment/presets.cxx b/src/Environment/presets.cxx
index 5e31e63cff87d45f23878d86de82ea01d1f2459c..85bd82102eb101f5cd8a7c82db5d74880366dc19 100644 (file)
--- a/src/Environment/presets.cxx
+++ b/src/Environment/presets.cxx
@@ -26,6 +26,7 @@
 
 #include <cmath>
 #include <simgear/math/SGMisc.hxx>
+#include <simgear/math/SGMath.hxx>
 #include <Main/fg_props.hxx>
 
 namespace Environment {

diff --git a/src/GUI/FGColor.cxx b/src/GUI/FGColor.cxx
index f96bb1331a390ff5d9a45f588bebfdc0fb3b12f8..e808af66257d88d94748255b16ada292778c1bd8 100644 (file)
--- a/src/GUI/FGColor.cxx
+++ b/src/GUI/FGColor.cxx
@@ -7,7 +7,6 @@
 #include <iostream>
 
 #include <simgear/props/props.hxx>
-#include <simgear/math/SGMath.hxx>
 
 ////////////////////////////////////////////////////////////////////////
 // FGColor class.

diff --git a/src/GUI/FGFontCache.hxx b/src/GUI/FGFontCache.hxx
index c9d12c7a37edbaadb8507192f0331b60843443a1..a07aa7b44b4f45deb10b7f01ab1f2d8438af6eda 100644 (file)
--- a/src/GUI/FGFontCache.hxx
+++ b/src/GUI/FGFontCache.hxx
@@ -15,7 +15,6 @@
 #ifndef __FGFONTCACHE_HXX
 #define __FGFONTCACHE_HXX
 
-#include <simgear/math/SGMath.hxx>
 #include <simgear/misc/sg_path.hxx>
 
 #include <map>

diff --git a/src/GUI/layout-props.cxx b/src/GUI/layout-props.cxx
index 09764096ca0f2cfc0ec26afda7f0e3ca074d4aec..2d691036fae35047df8c763f14d20937fbcb474b 100644 (file)
--- a/src/GUI/layout-props.cxx
+++ b/src/GUI/layout-props.cxx
@@ -4,7 +4,6 @@
 
 #include <plib/pu.h>
 #include <simgear/props/props.hxx>
-#include <simgear/math/SGMath.hxx>
 
 #include "layout.hxx"
 

diff --git a/src/GUI/layout.cxx b/src/GUI/layout.cxx
index b6fa5ab8f44926c56307f5056926fe72b65d2432..dd6f1b6ca1ec8f8f84b5b2da6d7a193cfa76825e 100644 (file)
--- a/src/GUI/layout.cxx
+++ b/src/GUI/layout.cxx
@@ -5,7 +5,6 @@
 
 #include "layout.hxx"
 
-#include <simgear/math/SGMath.hxx>
 
 // This file contains the actual layout engine.  It has no dependence
 // on outside libraries; see layout-props.cxx for the glue code.

diff --git a/src/Input/FGButton.cxx b/src/Input/FGButton.cxx
index 68fcf8e1b7c8cee9e89efe22a65e3e00ce77f90b..315b4d3e9aaba9927780813d0ec29a8fa4804945 100644 (file)
--- a/src/Input/FGButton.cxx
+++ b/src/Input/FGButton.cxx
@@ -28,7 +28,6 @@
 
 #include "FGButton.hxx"
 
-#include <simgear/math/SGMath.hxx>
 
 FGButton::FGButton ()
   : is_repeatable(false),

diff --git a/src/Input/FGCommonInput.cxx b/src/Input/FGCommonInput.cxx
index f62b5ebc77eb49a782545979e21c90c27b615a02..1419d2a01411dd51ace4712fe78c8370326e37bd 100644 (file)
--- a/src/Input/FGCommonInput.cxx
+++ b/src/Input/FGCommonInput.cxx
@@ -30,8 +30,6 @@
 #include <Main/globals.hxx>
 #include <Main/fg_os.hxx>
 
-#include <simgear/math/SGMath.hxx>
-
 using simgear::PropertyList;
 using std::string;
 

diff --git a/src/Input/FGDeviceConfigurationMap.cxx b/src/Input/FGDeviceConfigurationMap.cxx
index b8ce13505f83d35c817ff13c73d2dc19ac887175..1991daaef741b3fc8a9437c94ca7e6fb1a7cf6c0 100644 (file)
--- a/src/Input/FGDeviceConfigurationMap.cxx
+++ b/src/Input/FGDeviceConfigurationMap.cxx
@@ -26,8 +26,6 @@
 #  include <config.h>
 #endif
 
-#include <simgear/math/SGMath.hxx>
-
 #include "FGDeviceConfigurationMap.hxx"
 
 #include <simgear/misc/sg_dir.hxx>

diff --git a/src/Input/FGEventInput.cxx b/src/Input/FGEventInput.cxx
index 058775193ce62ac391adb4e9b0fec5a85c1a0146..4a53a63d0a04ca1dd6ab2bec161d0061797cbbac 100644 (file)
--- a/src/Input/FGEventInput.cxx
+++ b/src/Input/FGEventInput.cxx
@@ -29,6 +29,7 @@
 #include <Main/fg_props.hxx>
 #include <simgear/io/sg_file.hxx>
 #include <simgear/props/props_io.hxx>
+#include <simgear/math/SGMath.hxx>
 #include <Scripting/NasalSys.hxx>
 
 using simgear::PropertyList;

diff --git a/src/Instrumentation/heading_indicator.cxx b/src/Instrumentation/heading_indicator.cxx
index 2cbbb9f2469b31e9fbf2dd39e318d24a17d8d3fa..d026be3e076d771e0b053cc0f865637f2263505b 100644 (file)
--- a/src/Instrumentation/heading_indicator.cxx
+++ b/src/Instrumentation/heading_indicator.cxx
@@ -9,6 +9,7 @@
 
 #include <simgear/compiler.h>
 #include <simgear/sg_inlines.h>
+#include <simgear/math/SGMath.hxx>
 #include <iostream>
 #include <string>
 #include <sstream>

diff --git a/src/Instrumentation/heading_indicator_dg.cxx b/src/Instrumentation/heading_indicator_dg.cxx
index 303f8474686fd9432cd76aef92395d4344f379e0..287938983965e04a7d2a6b42bd25f607d1d619ab 100644 (file)
--- a/src/Instrumentation/heading_indicator_dg.cxx
+++ b/src/Instrumentation/heading_indicator_dg.cxx
@@ -12,6 +12,7 @@
 
 #include <simgear/compiler.h>
 #include <simgear/sg_inlines.h>
+#include <simgear/math/SGMath.hxx>
 #include <iostream>
 #include <string>
 #include <sstream>

diff --git a/src/Instrumentation/heading_indicator_fg.cxx b/src/Instrumentation/heading_indicator_fg.cxx
index a485f5cdc7adc1f5e69fcaf50faf5d88a245b715..406300f12f01b158fb1519cead55d11a6a2ad28d 100644 (file)
--- a/src/Instrumentation/heading_indicator_fg.cxx
+++ b/src/Instrumentation/heading_indicator_fg.cxx
@@ -14,11 +14,13 @@
 #include <string>
 #include <sstream>
 
-#include "heading_indicator_fg.hxx"
+#include <simgear/magvar/magvar.hxx>
+#include <simgear/math/SGMath.hxx>
+
 #include <Main/fg_props.hxx>
-#include <Main/util.hxx>                           
+#include <Main/util.hxx>
 
-#include <simgear/magvar/magvar.hxx>
+#include "heading_indicator_fg.hxx"
 
 using std::string;
 

diff --git a/src/Instrumentation/mag_compass.cxx b/src/Instrumentation/mag_compass.cxx
index 1477228e99f3665755e8b93c0aba90cb9f571686..cf8ee8c894db6690ac06afb9a62cd5830a0cc3eb 100644 (file)
--- a/src/Instrumentation/mag_compass.cxx
+++ b/src/Instrumentation/mag_compass.cxx
@@ -11,11 +11,13 @@
 #endif
 
 #include <simgear/sg_inlines.h>
+#include <simgear/math/SGMath.hxx>
 
-#include "mag_compass.hxx"
 #include <Main/fg_props.hxx>
 #include <Main/util.hxx>
 
+#include "mag_compass.hxx"
+
 
 MagCompass::MagCompass ( SGPropertyNode *node )
     : _error_deg(0.0),

diff --git a/src/Instrumentation/mrg.cxx b/src/Instrumentation/mrg.cxx
index 6a6867b9dc7ffa3089a5051ebecf544c73f3b520..2b1280340d35263c0cb207701ba072d744d30ab5 100644 (file)
--- a/src/Instrumentation/mrg.cxx
+++ b/src/Instrumentation/mrg.cxx
@@ -12,7 +12,7 @@
 
 #include <simgear/compiler.h>
 #include <simgear/sg_inlines.h>
-
+#include <simgear/math/SGMath.hxx>
 
 #include <iostream>
 #include <string>

diff --git a/src/Instrumentation/navradio.cxx b/src/Instrumentation/navradio.cxx
index bc45c6944d99d85d01c4e5dc318114e68123a457..2475267e091d76819d9162c55859c5570b1ccc2e 100644 (file)
--- a/src/Instrumentation/navradio.cxx
+++ b/src/Instrumentation/navradio.cxx
@@ -23,8 +23,6 @@
 #  include <config.h>
 #endif
 
-#include "navradio.hxx"
-
 #include <sstream>
 #include <cstring>
 
@@ -35,6 +33,7 @@
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/structure/exception.hxx>
 #include <simgear/math/interpolater.hxx>
+#include <simgear/math/SGMath.hxx>
 #include <simgear/misc/strutils.hxx>
 
 #include <Navaids/navrecord.hxx>
@@ -43,6 +42,8 @@
 #include <Navaids/navlist.hxx>
 #include <Main/util.hxx>
 
+#include "navradio.hxx"
+
 using std::string;
 
 // General-purpose sawtooth function.  Graph looks like this:

diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index 0f43f766a465fe70a05956194a1f737fc4b4e802..f2c3514a01fcb3fb862e9491e32ec045cc748c5e 100644 (file)
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -50,7 +50,6 @@
 #include <simgear/compiler.h>
 #include <simgear/structure/exception.hxx>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/SGMath.hxx>
 
 #include <cstring>
 #include <iostream>

diff --git a/src/Main/fg_props.hxx b/src/Main/fg_props.hxx
index 15bf286f22ead366e63403cb572902b0ac797737..eb9af1dfe94c9388776e6fab88fd00c9820af23d 100644 (file)
--- a/src/Main/fg_props.hxx
+++ b/src/Main/fg_props.hxx
@@ -10,7 +10,6 @@
 
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/props/tiedpropertylist.hxx>
-#include <simgear/math/SGMath.hxx>
 
 #include <Main/globals.hxx>
 

diff --git a/src/Model/model_panel.cxx b/src/Model/model_panel.cxx
index a316243c1cf2ea22c376cdeea6a4fdf26535e7ef..ac2ab88b1c3bbd9194f2db62a32e079586bf4b22 100644 (file)
--- a/src/Model/model_panel.cxx
+++ b/src/Model/model_panel.cxx
@@ -14,7 +14,6 @@
 #include <simgear/props/props.hxx>
 #include <simgear/scene/model/modellib.hxx>
 #include <simgear/scene/util/SGNodeMasks.hxx>
-#include <simgear/math/SGMath.hxx>
 
 #include "panelnode.hxx"
 #include "model_panel.hxx"

diff --git a/src/Network/generic.cxx b/src/Network/generic.cxx
index c9c470e656c65d47d30a07971a89d8db91a8d89f..242bd881c58765cc73e88e0afcb3b5f6faad2b15 100644 (file)
--- a/src/Network/generic.cxx
+++ b/src/Network/generic.cxx
@@ -34,6 +34,7 @@
 #include <simgear/misc/stdint.hxx>
 #include <simgear/props/props.hxx>
 #include <simgear/props/props_io.hxx>
+#include <simgear/math/SGMath.hxx>
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>

diff --git a/utils/GPSsmooth/UGear_telnet.cxx b/utils/GPSsmooth/UGear_telnet.cxx
index be5b02e9f303f4b3d22ac68dedee62bd210384bd..bee0f851b8f0955763a662490e211a3cce4d595c 100644 (file)
--- a/utils/GPSsmooth/UGear_telnet.cxx
+++ b/utils/GPSsmooth/UGear_telnet.cxx
@@ -26,7 +26,6 @@
 #include <simgear/io/sg_netChat.hxx>
 #include <simgear/structure/commands.hxx>
 #include <simgear/misc/strutils.hxx>
-#include <simgear/math/SGMath.hxx>
 
 #include <sstream>
 

diff --git a/utils/TerraSync/terrasync.cxx b/utils/TerraSync/terrasync.cxx
index fb0d29258707f9c8138c052d4e4fce3043ec8dc8..f8b8b25511d8f55d4b80f3ced0e426208951fb14 100644 (file)
--- a/utils/TerraSync/terrasync.cxx
+++ b/utils/TerraSync/terrasync.cxx
@@ -46,7 +46,6 @@
 #include <fstream>
 #include <string>
 
-#include <simgear/math/SGMath.hxx>
 #include <simgear/io/raw_socket.hxx>
 #include <simgear/scene/tsync/terrasync.hxx>
 

diff --git a/utils/fgpanel/FGFontCache.hxx b/utils/fgpanel/FGFontCache.hxx
index c2ff03d15e1f2d7bf56733328a38acf5d52cb774..f8c6e6fd415073c73ba71ed0418da36675e37be9 100644 (file)
--- a/utils/fgpanel/FGFontCache.hxx
+++ b/utils/fgpanel/FGFontCache.hxx
@@ -15,7 +15,6 @@
 #ifndef __FGFONTCACHE_HXX
 #define __FGFONTCACHE_HXX
 
-#include <simgear/math/SGMath.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/props/props.hxx>
 

diff --git a/utils/fgpanel/FGPanelApplication.hxx b/utils/fgpanel/FGPanelApplication.hxx
index b67cc562b4435ee0e9ce20b911e73a3395922ad9..f2652ee3a9106cdabbd7f38e8271fc67586ba207 100644 (file)
--- a/utils/fgpanel/FGPanelApplication.hxx
+++ b/utils/fgpanel/FGPanelApplication.hxx
@@ -21,7 +21,6 @@
 #include "FGGLApplication.hxx"
 #include "FGPanelProtocol.hxx"
 
-#include <simgear/math/SGMath.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/props/props.hxx>
 

diff --git a/utils/fgpanel/FGPanelProtocol.hxx b/utils/fgpanel/FGPanelProtocol.hxx
index 710b0c2de490ee488ee2bc672cacfa070cd43e5c..69cb672f388c60b115cbb13d4ddb1797ec0b5361 100644 (file)
--- a/utils/fgpanel/FGPanelProtocol.hxx
+++ b/utils/fgpanel/FGPanelProtocol.hxx
@@ -17,7 +17,6 @@
 //
 #ifndef __FGPANELPROTOCOL_HXX
 #define __FGPANELPROTOCOL_HXX
-#include <simgear/math/SGMath.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/props/props.hxx>
 #include <simgear/io/iochannel.hxx>

diff --git a/utils/fgpanel/panel.cxx b/utils/fgpanel/panel.cxx
index 213e7d4b69525fa4fb20e4703d1d7ace982292a4..45620d22a2a4f6d91b33493036ec46aa855fb043 100644 (file)
--- a/utils/fgpanel/panel.cxx
+++ b/utils/fgpanel/panel.cxx
@@ -40,7 +40,6 @@
 #include <plib/fnt.h>
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/SGMath.hxx>
 #include <simgear/misc/sg_path.hxx>
 
 #include "panel.hxx"

diff --git a/utils/fgpanel/panel_io.cxx b/utils/fgpanel/panel_io.cxx
index 1971d5799275f1c8a4bb603e74e8b9a625f8e4f0..cd243f69f71855ea4415d0dfbd4f5c574999eee1 100644 (file)
--- a/utils/fgpanel/panel_io.cxx
+++ b/utils/fgpanel/panel_io.cxx
@@ -29,7 +29,6 @@
 #include <string.h>            // for strcmp()
 
 #include <simgear/compiler.h>
-#include <simgear/math/SGMath.hxx>
 #include <simgear/structure/exception.hxx>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>