From e59fabaf8276a0f49266e47ff2f59a93b0c7700c Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Sat, 5 May 2012 00:56:29 +0200
Subject: [PATCH] Clean-up some SGMath dependencies.

---
 src/AIModel/performancedb.cxx                |  1 -
 src/Aircraft/flightrecorder.cxx              |  1 +
 src/Autopilot/logic.cxx                      |  1 -
 src/Environment/environment.cxx              |  1 +
 src/Environment/environment_ctrl.cxx         |  1 +
 src/Environment/presets.cxx                  |  1 +
 src/GUI/FGColor.cxx                          |  1 -
 src/GUI/FGFontCache.hxx                      |  1 -
 src/GUI/layout-props.cxx                     |  1 -
 src/GUI/layout.cxx                           |  1 -
 src/Input/FGButton.cxx                       |  1 -
 src/Input/FGCommonInput.cxx                  |  2 --
 src/Input/FGDeviceConfigurationMap.cxx       |  2 --
 src/Input/FGEventInput.cxx                   |  1 +
 src/Instrumentation/heading_indicator.cxx    |  1 +
 src/Instrumentation/heading_indicator_dg.cxx |  1 +
 src/Instrumentation/heading_indicator_fg.cxx | 10 ++++++----
 src/Instrumentation/mag_compass.cxx          |  4 +++-
 src/Instrumentation/mrg.cxx                  |  2 +-
 src/Instrumentation/navradio.cxx             |  5 +++--
 src/Main/bootstrap.cxx                       |  1 -
 src/Main/fg_props.hxx                        |  1 -
 src/Model/model_panel.cxx                    |  1 -
 src/Network/generic.cxx                      |  1 +
 utils/GPSsmooth/UGear_telnet.cxx             |  1 -
 utils/TerraSync/terrasync.cxx                |  1 -
 utils/fgpanel/FGFontCache.hxx                |  1 -
 utils/fgpanel/FGPanelApplication.hxx         |  1 -
 utils/fgpanel/FGPanelProtocol.hxx            |  1 -
 utils/fgpanel/panel.cxx                      |  1 -
 utils/fgpanel/panel_io.cxx                   |  1 -
 31 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/src/AIModel/performancedb.cxx b/src/AIModel/performancedb.cxx
index 842cb9bf8..37660e6a0 100644
--- 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 dd4ccc15f..2605b38be 100644
--- 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 860af0e80..6f8a53041 100644
--- 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 95b45852e..4b0a6e328 100644
--- 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 e7c8820fa..98f59cb9e 100644
--- 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 5e31e63cf..85bd82102 100644
--- 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 f96bb1331..e808af662 100644
--- 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 c9d12c7a3..a07aa7b44 100644
--- 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 09764096c..2d691036f 100644
--- 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 b6fa5ab8f..dd6f1b6ca 100644
--- 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 68fcf8e1b..315b4d3e9 100644
--- 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 f62b5ebc7..1419d2a01 100644
--- 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 b8ce13505..1991daaef 100644
--- 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 058775193..4a53a63d0 100644
--- 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 2cbbb9f24..d026be3e0 100644
--- 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 303f84746..287938983 100644
--- 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 a485f5cdc..406300f12 100644
--- 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 <Main/fg_props.hxx>
-#include <Main/util.hxx>			    
-
 #include <simgear/magvar/magvar.hxx>
+#include <simgear/math/SGMath.hxx>
+
+#include <Main/fg_props.hxx>
+#include <Main/util.hxx>
+
+#include "heading_indicator_fg.hxx"
 
 using std::string;
 
diff --git a/src/Instrumentation/mag_compass.cxx b/src/Instrumentation/mag_compass.cxx
index 1477228e9..cf8ee8c89 100644
--- 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 6a6867b9d..2b1280340 100644
--- 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 bc45c6944..2475267e0 100644
--- 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 0f43f766a..f2c3514a0 100644
--- 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 15bf286f2..eb9af1dfe 100644
--- 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 a316243c1..ac2ab88b1 100644
--- 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 c9c470e65..242bd881c 100644
--- 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 be5b02e9f..bee0f851b 100644
--- 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 fb0d29258..f8b8b2551 100644
--- 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 c2ff03d15..f8c6e6fd4 100644
--- 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 b67cc562b..f2652ee3a 100644
--- 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 710b0c2de..69cb672f3 100644
--- 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 213e7d4b6..45620d22a 100644
--- 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 1971d5799..cd243f69f 100644
--- 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>