Fixes for include-file flattening - condition.hxx no longer pulls in props or props_io

diff --git a/src/Autopilot/autopilotgroup.cxx b/src/Autopilot/autopilotgroup.cxx
index cf06bb4b422133b9a5c33e155eada34d40abf432..e58cd8fd71ad8e1bbb7aaeb11d20932a7d3fbf11 100644 (file)
--- a/src/Autopilot/autopilotgroup.cxx
+++ b/src/Autopilot/autopilotgroup.cxx
@@ -31,6 +31,7 @@
 #include <string>
 #include <vector>
 
+#include <simgear/props/props_io.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/structure/exception.hxx>
 #include <Main/fg_props.hxx>

diff --git a/src/Autopilot/component.cxx b/src/Autopilot/component.cxx
index bdf6ecc21d994aed3a013eec14b7a41d9c342a81..63ee6262a1b062b53a5226c1dea626ddb0d188de 100644 (file)
--- a/src/Autopilot/component.cxx
+++ b/src/Autopilot/component.cxx
@@ -23,6 +23,7 @@
 #include "component.hxx"
 #include <Main/fg_props.hxx>
 #include <simgear/structure/exception.hxx>
+#include <simgear/props/condition.hxx>
 
 using namespace FGXMLAutopilot;
 

diff --git a/src/Autopilot/component.hxx b/src/Autopilot/component.hxx
index 3f8d60352f287acd9eb49b14be5f02eac5652471..cf8634a4a4412316ecf8cda858a0206359eef63c 100644 (file)
--- a/src/Autopilot/component.hxx
+++ b/src/Autopilot/component.hxx
@@ -28,7 +28,7 @@
 #endif
 
 #include <simgear/structure/subsystem_mgr.hxx>
-#include <simgear/props/condition.hxx>
+#include <simgear/props/propsfwd.hxx>
 
 namespace FGXMLAutopilot {
 

diff --git a/src/Autopilot/digitalcomponent.hxx b/src/Autopilot/digitalcomponent.hxx
index 606dd5f8b1db6444db94e18a7f11019bafbd4fd1..afff879ba81a0d0d0ec4e2a072cdb9f4d3bd84bb 100644 (file)
--- a/src/Autopilot/digitalcomponent.hxx
+++ b/src/Autopilot/digitalcomponent.hxx
@@ -25,6 +25,9 @@
 
 #include "component.hxx"
 
+#include <simgear/props/props.hxx>
+#include <simgear/props/condition.hxx>
+
 namespace FGXMLAutopilot {
 
 /**

diff --git a/src/Cockpit/panel_io.cxx b/src/Cockpit/panel_io.cxx
index ecd6efd89a02c674463529642c5899e92bbb6ef2..754afb30e33278c99d9c0b455b3a6cdd383d91cf 100644 (file)
--- a/src/Cockpit/panel_io.cxx
+++ b/src/Cockpit/panel_io.cxx
@@ -29,6 +29,7 @@
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/props/props.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <istream>
 #include <fstream>

diff --git a/src/GUI/MapWidget.hxx b/src/GUI/MapWidget.hxx
index ce9333e32ae78319c187b3f8a4de7a5be6d9aa9e..934198603f20b74b802df88880ba783fded07290 100644 (file)
--- a/src/GUI/MapWidget.hxx
+++ b/src/GUI/MapWidget.hxx
@@ -1,6 +1,7 @@
 #ifndef GUI_MAPWIDGET_HXX
 #define GUI_MAPWIDGET_HXX
 
+#include <map>
 #include <simgear/compiler.h>
 #include <simgear/math/SGMath.hxx>
 #include <simgear/props/props.hxx>

diff --git a/src/GUI/dialog.cxx b/src/GUI/dialog.cxx
index 71d6d7279d170801612655a2113c5661884d0174..364cf5d1399d7acfa20d9232fe652d2f9c852dfc 100644 (file)
--- a/src/GUI/dialog.cxx
+++ b/src/GUI/dialog.cxx
@@ -5,6 +5,8 @@
 #endif
 
 #include <simgear/structure/SGBinding.hxx>
+#include <simgear/props/props_io.hxx>
+
 #include <Scripting/NasalSys.hxx>
 #include <Main/fg_os.hxx>
 

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index 06459a8f6d744d2e7ea3505317bf50ff863b3a47..57adcc26eb102cad5602801fa5ce9e09a35d571e 100644 (file)
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -43,6 +43,7 @@
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/screen/screen-dump.hxx>
 #include <simgear/structure/event_mgr.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <Cockpit/panel.hxx>
 #include <Main/globals.hxx>

diff --git a/src/GUI/menubar.cxx b/src/GUI/menubar.cxx
index 5675b14e434d2507c07d132ef0b0e4e6c927f584..39d4d53aa8bdc2be89c963c21a7545a8dd623521 100644 (file)
--- a/src/GUI/menubar.cxx
+++ b/src/GUI/menubar.cxx
@@ -7,6 +7,7 @@
 #include <plib/pu.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/structure/SGBinding.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <Main/globals.hxx>
 

diff --git a/src/Input/FGEventInput.cxx b/src/Input/FGEventInput.cxx
index 8bf9f304e53bb2be03e22c04bbc1182008b3e78b..7e8c98944bc342fbdc3d72b88c00175b8935e481 100644 (file)
--- a/src/Input/FGEventInput.cxx
+++ b/src/Input/FGEventInput.cxx
@@ -28,6 +28,7 @@
 #include "FGEventInput.hxx"
 #include <Main/fg_props.hxx>
 #include <simgear/io/sg_file.hxx>
+#include <simgear/props/props_io.hxx>
 #include <Scripting/NasalSys.hxx>
 
 using simgear::PropertyList;

diff --git a/src/Input/FGJoystickInput.cxx b/src/Input/FGJoystickInput.cxx
index 0d0a86ce97c0f49f4fff7cc294893f1e96dc49aa..45674764732dd1bb10bdc7000cc76338f5d6edb2 100644 (file)
--- a/src/Input/FGJoystickInput.cxx
+++ b/src/Input/FGJoystickInput.cxx
@@ -23,6 +23,8 @@
 // $Id$
 
 #include "FGJoystickInput.hxx"
+
+#include <simgear/props/props_io.hxx>
 #include "FGDeviceConfigurationMap.hxx"
 #include <Main/fg_props.hxx>
 #include <Scripting/NasalSys.hxx>

diff --git a/src/Instrumentation/HUD/HUD.cxx b/src/Instrumentation/HUD/HUD.cxx
index 6d9e0bd90134185c74741fa934b19af6bc19f620..d886bc76ed0fdfcdd5bf372139dc0abea53879bb 100644 (file)
--- a/src/Instrumentation/HUD/HUD.cxx
+++ b/src/Instrumentation/HUD/HUD.cxx
@@ -31,6 +31,7 @@
 
 #include <simgear/constants.h>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/props/props_io.hxx>
 #include <osg/GLU>
 
 #include <Main/globals.hxx>

diff --git a/src/Instrumentation/instrument_mgr.cxx b/src/Instrumentation/instrument_mgr.cxx
index 58fe89db1a4c5b5a5c7976cc9f133753b51573d3..67dfd7623deb6b1b15b677bfc4db05c898105238 100644 (file)
--- a/src/Instrumentation/instrument_mgr.cxx
+++ b/src/Instrumentation/instrument_mgr.cxx
@@ -14,6 +14,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/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index ef2824089455b8afe005c4c7be6b50d29de4255b..ee56f9ad820fb297c6f5a885a2ad1943b6d0172f 100644 (file)
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -19,6 +19,7 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/structure/commands.hxx>
 #include <simgear/props/props.hxx>
+#include <simgear/props/props_io.hxx>
 #include <simgear/structure/event_mgr.hxx>
 #include <simgear/sound/soundmgr_openal.hxx>
 #include <simgear/timing/sg_time.hxx>

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 52a88efdfc1da92b03ab2b25490ea038d805a6e0..c28c9d98e72de952568422b236122d3b0cf26e01 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -60,6 +60,7 @@
 #include <simgear/misc/sg_dir.hxx>
 #include <simgear/misc/sgstream.hxx>
 #include <simgear/misc/strutils.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <simgear/misc/interpolator.hxx>
 #include <simgear/scene/material/matlib.hxx>

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index 91af653c03c96b1b9ab5f9154fae8fd90cc3898b..99f1709da14b2298e394c6490bde15b5f462bab2 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -36,6 +36,7 @@
 #include <simgear/sound/soundmgr_openal.hxx>
 #include <simgear/misc/ResourceManager.hxx>
 #include <simgear/props/propertyObject.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <Aircraft/controls.hxx>
 #include <Airports/runways.hxx>

diff --git a/src/Sound/fg_fx.cxx b/src/Sound/fg_fx.cxx
index f60f441145b078ce0ff1bfeca01db33947cad486..2953bfe678c6e8ae18c45089425f743a265bc798 100644 (file)
--- a/src/Sound/fg_fx.cxx
+++ b/src/Sound/fg_fx.cxx
@@ -34,6 +34,7 @@
 #include <Main/fg_props.hxx>
 
 #include <simgear/props/props.hxx>
+#include <simgear/props/props_io.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/sound/soundmgr_openal.hxx>
 #include <simgear/sound/xmlsound.hxx>

diff --git a/utils/fgpanel/panel.hxx b/utils/fgpanel/panel.hxx
index 44ce96a05f382aeee3210160cc7f31a61de3082d..6d296296695660aa9e87a145cdc28a68017f354e 100644 (file)
--- a/utils/fgpanel/panel.hxx
+++ b/utils/fgpanel/panel.hxx
@@ -33,6 +33,7 @@
 
 #include <plib/fnt.h>
 
+#include <simgear/props/propsfwd.hxx>
 #include <simgear/props/condition.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/math/interpolater.hxx>

diff --git a/utils/fgpanel/panel_io.cxx b/utils/fgpanel/panel_io.cxx
index d0bd6b3585e8f163c47d5948f5cf66c1adb7d88f..1971d5799275f1c8a4bb603e74e8b9a625f8e4f0 100644 (file)
--- a/utils/fgpanel/panel_io.cxx
+++ b/utils/fgpanel/panel_io.cxx
@@ -35,6 +35,7 @@
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/props/props.hxx>
 #include <simgear/props/condition.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include "panel.hxx"
 #include "panel_io.hxx"