Fixes for include-file flattening - condition.hxx no longer pulls in props or props_io
This commit is contained in:
parent
62e46b09a5
commit
6c52a5ac85
19 changed files with 23 additions and 1 deletions
|
@ -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>
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#endif
|
||||
|
||||
#include <simgear/structure/subsystem_mgr.hxx>
|
||||
#include <simgear/props/condition.hxx>
|
||||
#include <simgear/props/propsfwd.hxx>
|
||||
|
||||
namespace FGXMLAutopilot {
|
||||
|
||||
|
|
|
@ -25,6 +25,9 @@
|
|||
|
||||
#include "component.hxx"
|
||||
|
||||
#include <simgear/props/props.hxx>
|
||||
#include <simgear/props/condition.hxx>
|
||||
|
||||
namespace FGXMLAutopilot {
|
||||
|
||||
/**
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue