Give the FGAirport class a sane filename.

simple.[cxx|hxx] -> airport.[cxx|hxx]
2013-02-21 11:32:02 +00:00 · 2013-02-21 11:32:02 +00:00 · 1eb8ae1fbf
commit 1eb8ae1fbf
parent 11c00afaec
50 changed files with 51 additions and 51 deletions
--- a/src/AIModel/AIAircraft.cxx
+++ b/src/AIModel/AIAircraft.cxx
@ -27,7 +27,7 @@
 #include <Scenery/scenery.hxx>
 #include <Scenery/tilemgr.hxx>
 #include <Airports/dynamics.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Main/util.hxx>

 #include <string>
--- a/src/AIModel/AIFlightPlan.cxx
+++ b/src/AIModel/AIFlightPlan.cxx
@ -33,7 +33,7 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Main/fg_init.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/dynamics.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/groundnetwork.hxx>
--- a/src/AIModel/AIFlightPlanCreate.cxx
+++ b/src/AIModel/AIFlightPlanCreate.cxx
@ -30,7 +30,7 @@
 #include <simgear/props/props.hxx>
 #include <simgear/props/props_io.hxx>

-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/dynamics.hxx>
 #include "AIAircraft.hxx"
--- a/src/AIModel/AIFlightPlanCreateCruise.cxx
+++ b/src/AIModel/AIFlightPlanCreateCruise.cxx
@ -26,7 +26,7 @@
 #include <fstream>
 #include <iostream>

-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/dynamics.hxx>

--- a/src/AIModel/AIFlightPlanCreatePushBack.cxx
+++ b/src/AIModel/AIFlightPlanCreatePushBack.cxx
@ -27,7 +27,7 @@

 #include <simgear/math/sg_geodesy.hxx>

-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/dynamics.hxx>

--- a/src/AIModel/AIManager.cxx
+++ b/src/AIModel/AIManager.cxx
@ -29,7 +29,7 @@
 #include <boost/foreach.hpp>

 #include <Main/globals.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>

 #include "AIManager.hxx"
 #include "AIAircraft.hxx"
--- a/src/ATC/atc_mgr.cxx
+++ b/src/ATC/atc_mgr.cxx
@ -27,7 +27,7 @@
 #include <iostream>

 #include <Airports/dynamics.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Scenery/scenery.hxx>
 #include "atc_mgr.hxx"

--- a/src/ATC/atcdialog.cxx
+++ b/src/ATC/atcdialog.cxx
@ -41,7 +41,7 @@
 #include <Main/fg_props.hxx>
 #include <GUI/gui.h>		// mkDialog
 #include <GUI/new_gui.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <ATC/CommStation.hxx>

 using std::string;
--- a/src/ATC/trafficcontrol.cxx
+++ b/src/ATC/trafficcontrol.cxx
@ -48,7 +48,7 @@
 #include <Traffic/TrafficMgr.hxx>
 #include <Airports/groundnetwork.hxx>
 #include <Airports/dynamics.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Radio/radio.hxx>
 #include <signal.h>

--- a/src/ATCDCL/ATC.cxx
+++ b/src/ATCDCL/ATC.cxx
@ -33,7 +33,7 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <ATC/CommStation.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>

 FGATC::FGATC() :
    freq(0),
--- a/src/ATCDCL/ATCutils.hxx
+++ b/src/ATCDCL/ATCutils.hxx
@ -18,7 +18,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>

 #include <math.h>
--- a/src/Airports/CMakeLists.txt
+++ b/src/Airports/CMakeLists.txt
@ -13,7 +13,7 @@ set(SOURCES
 	runwayprefs.cxx
 	runways.cxx
 	sidstar.cxx
-	simple.cxx
+	airport.cxx
 	xmlloader.cxx
 	)

@ -30,7 +30,7 @@ set(HEADERS
 	runwayprefs.hxx
 	runways.hxx
 	sidstar.hxx
-	simple.hxx
+	airport.hxx
 	xmlloader.hxx
 	)
    		
--- a/src/Airports/airport.cxx
+++ b/src/Airports/airport.cxx
@ -28,7 +28,7 @@
 #  include <config.h>
 #endif

-#include "simple.hxx"
+#include "airport.hxx"

 #include <cassert>
 #include <boost/foreach.hpp>
--- a/src/Airports/airport.hxx
+++ b/src/Airports/airport.hxx
@ -1,4 +1,4 @@
-// simple.hxx -- a really simplistic class to manage airport ID,
+// airport.hxx -- a really simplistic class to manage airport ID,
 //                 lat, lon of the center of one of it's runways, and
 //                 elevation in feet.
 //
--- a/src/Airports/apt_loader.cxx
+++ b/src/Airports/apt_loader.cxx
@ -43,7 +43,7 @@

 #include <string>

-#include "simple.hxx"
+#include "airport.hxx"
 #include "runways.hxx"
 #include "pavement.hxx"
 #include <Navaids/NavDataCache.hxx>
--- a/src/Airports/dynamicloader.cxx
+++ b/src/Airports/dynamicloader.cxx
@ -25,7 +25,7 @@

 #include <Navaids/NavDataCache.hxx>
 #include <Airports/dynamics.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>

 /*****************************************************************************
 * Helper function for parsing position string
--- a/src/Airports/dynamics.cxx
+++ b/src/Airports/dynamics.cxx
@ -42,7 +42,7 @@
 #include <ATCDCL/ATCutils.hxx>
 #include <Navaids/NavDataCache.hxx>

-#include "simple.hxx"
+#include "airport.hxx"
 #include "dynamics.hxx"

 using std::string;
--- a/src/Airports/groundnetwork.cxx
+++ b/src/Airports/groundnetwork.cxx
@ -43,7 +43,7 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/timing/timestamp.hxx>

-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/dynamics.hxx>
 #include <Airports/runways.hxx>

--- a/src/Airports/runwayprefs.cxx
+++ b/src/Airports/runwayprefs.cxx
@ -36,7 +36,7 @@
 #include <Airports/runways.hxx>

 #include "runwayprefs.hxx"
-#include "simple.hxx"
+#include "airport.hxx"

 /******************************************************************************
 * ScheduleTime
--- a/src/Airports/runways.cxx
+++ b/src/Airports/runways.cxx
@ -37,7 +37,7 @@

 #include "runways.hxx"

-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Navaids/procedure.hxx>
 #include <Navaids/navrecord.hxx>
 #include <Navaids/NavDataCache.hxx>
--- a/src/Airports/sidstar.cxx
+++ b/src/Airports/sidstar.cxx
@ -30,7 +30,7 @@



-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>


 #include "sidstar.hxx"
--- a/src/Airports/xmlloader.cxx
+++ b/src/Airports/xmlloader.cxx
@ -32,7 +32,7 @@
 #include "runwayprefloader.hxx"

 #include "dynamics.hxx"
-#include "simple.hxx"
+#include "airport.hxx"
 #include "runwayprefs.hxx"

 #include <Navaids/NavDataCache.hxx>
--- a/src/Autopilot/route_mgr.cxx
+++ b/src/Autopilot/route_mgr.cxx
@ -51,7 +51,7 @@
 #include "Navaids/positioned.hxx"
 #include <Navaids/waypoint.hxx>
 #include <Navaids/procedure.hxx>
-#include "Airports/simple.hxx"
+#include "Airports/airport.hxx"
 #include "Airports/runways.hxx"
 #include <GUI/new_gui.hxx>
 #include <GUI/dialog.hxx>
--- a/src/Cockpit/NavDisplay.cxx
+++ b/src/Cockpit/NavDisplay.cxx
@ -70,7 +70,7 @@ using std::string;
 #include <Navaids/navrecord.hxx>
 #include <Navaids/navlist.hxx>
 #include <Navaids/fix.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 #include "od_gauge.hxx"

--- a/src/Cockpit/groundradar.cxx
+++ b/src/Cockpit/groundradar.cxx
@ -38,7 +38,7 @@
 #include <Main/globals.hxx>
 #include <Viewer/renderer.hxx>
 #include <Cockpit/panel.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/pavement.hxx>
 #include <simgear/math/sg_geodesy.hxx>
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@ -43,7 +43,7 @@
 #include "precipitation_mgr.hxx"
 #include "ridge_lift.hxx"
 #include "terrainsampler.hxx"
-#include "Airports/simple.hxx"
+#include "Airports/airport.hxx"
 #include "gravity.hxx"
 #include "magvarmanager.hxx"

--- a/src/Environment/fgclouds.cxx
+++ b/src/Environment/fgclouds.cxx
@ -40,7 +40,7 @@
 #include <Main/globals.hxx>
 #include <Main/util.hxx>
 #include <Viewer/renderer.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>

 #include "fgclouds.hxx"

--- a/src/Environment/metarairportfilter.hxx
+++ b/src/Environment/metarairportfilter.hxx
@ -22,7 +22,7 @@
 #ifndef __METARAIRPORTFILTER_HXX
 #define __METARAIRPORTFILTER_HXX

-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <simgear/props/props.hxx>

 namespace Environment {
--- a/src/Environment/metarproperties.hxx
+++ b/src/Environment/metarproperties.hxx
@ -23,7 +23,7 @@
 #ifndef __METARPROPERTIES_HXX
 #define __METARPROPERTIES_HXX

-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <simgear/props/props.hxx>
 #include <simgear/props/tiedpropertylist.hxx>

--- a/src/GUI/AirportList.cxx
+++ b/src/GUI/AirportList.cxx
@ -3,7 +3,7 @@
 #endif

 #include <Main/globals.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>

 #include "AirportList.hxx"

--- a/src/GUI/MapWidget.cxx
+++ b/src/GUI/MapWidget.cxx
@ -21,7 +21,7 @@
 #include <Navaids/navrecord.hxx>
 #include <Navaids/navlist.hxx>
 #include <Navaids/fix.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 #include <Main/fg_os.hxx>      // fgGetKeyModifiers()
 #include <Navaids/routePath.hxx>
--- a/src/Instrumentation/KLN89/kln89.cxx
+++ b/src/Instrumentation/KLN89/kln89.cxx
@ -48,7 +48,7 @@

 #include <Main/fg_props.hxx>
 #include <simgear/structure/commands.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>

 #include <cstdio>

--- a/src/Instrumentation/KLN89/kln89_page_apt.cxx
+++ b/src/Instrumentation/KLN89/kln89_page_apt.cxx
@ -34,7 +34,7 @@
 #include <ATC/CommStation.hxx>
 #include <Main/globals.hxx>
 #include <Airports/runways.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>

 using std::string;

--- a/src/Instrumentation/dclgps.cxx
+++ b/src/Instrumentation/dclgps.cxx
@ -34,7 +34,7 @@
 #include <Main/fg_props.hxx>
 #include <Navaids/fix.hxx>
 #include <Navaids/navrecord.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>

 #include <fstream>
--- a/src/Instrumentation/gps.cxx
+++ b/src/Instrumentation/gps.cxx
@ -22,7 +22,7 @@
 #include "Navaids/positioned.hxx"
 #include <Navaids/waypoint.hxx>
 #include "Navaids/navrecord.hxx"
-#include "Airports/simple.hxx"
+#include "Airports/airport.hxx"
 #include "Airports/runways.hxx"
 #include "Autopilot/route_mgr.hxx"

--- a/src/Instrumentation/mk_viii.cxx
+++ b/src/Instrumentation/mk_viii.cxx
@ -76,7 +76,7 @@
 using std::string;

 #include <Airports/runways.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>

 #if defined( HAVE_VERSION_H ) && HAVE_VERSION_H
 #  include <Include/version.h>
--- a/src/Instrumentation/mk_viii.hxx
+++ b/src/Instrumentation/mk_viii.hxx
@ -38,7 +38,7 @@ using std::map;
 class SGSampleGroup;

 #include <Airports/runways.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Main/globals.hxx>
 #include <Sound/voiceplayer.hxx>

--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@ -59,7 +59,7 @@
 #include <Aircraft/replay.hxx>
 #include <Aircraft/FlightHistory.hxx>
 #include <Airports/runways.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/dynamics.hxx>

 #include <AIModel/AIManager.hxx>
--- a/src/Main/positioninit.cxx
+++ b/src/Main/positioninit.cxx
@ -32,7 +32,7 @@

 #include <Navaids/navlist.hxx>
 #include <Airports/runways.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/dynamics.hxx>
 #include <AIModel/AIManager.hxx>

--- a/src/Navaids/FlightPlan.hxx
+++ b/src/Navaids/FlightPlan.hxx
@ -25,7 +25,7 @@
 #define FG_FLIGHTPLAN_HXX

 #include <Navaids/route.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>

 typedef SGSharedPtr<FGAirport> FGAirportRef;
    
--- a/src/Navaids/LevelDXML.cxx
+++ b/src/Navaids/LevelDXML.cxx
@ -10,7 +10,7 @@
 #include <simgear/misc/sg_path.hxx>

 #include <Navaids/waypoint.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>

 using std::string;
 using std::vector;
--- a/src/Navaids/NavDataCache.cxx
+++ b/src/Navaids/NavDataCache.cxx
@ -51,7 +51,7 @@
 #include <Main/globals.hxx>
 #include "markerbeacon.hxx"
 #include "navrecord.hxx"
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 #include <ATC/CommStation.hxx>
 #include "fix.hxx"
--- a/src/Navaids/navdb.cxx
+++ b/src/Navaids/navdb.cxx
@ -40,7 +40,7 @@
 #include "navlist.hxx"
 #include <Main/globals.hxx>
 #include <Navaids/markerbeacon.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/xmlloader.hxx>
 #include <Main/fg_props.hxx>
--- a/src/Navaids/navrecord.cxx
+++ b/src/Navaids/navrecord.cxx
@ -37,7 +37,7 @@
 #include <Navaids/navrecord.hxx>
 #include <Navaids/navdb.hxx>
 #include <Airports/runways.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/xmlloader.hxx>
 #include <Main/fg_props.hxx>
 #include <Navaids/NavDataCache.hxx>
--- a/src/Navaids/route.cxx
+++ b/src/Navaids/route.cxx
@ -48,7 +48,7 @@
 #include <Navaids/procedure.hxx>
 #include <Navaids/waypoint.hxx>
 #include <Navaids/LevelDXML.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>

 using std::string;
 using std::vector;
--- a/src/Navaids/waypoint.cxx
+++ b/src/Navaids/waypoint.cxx
@ -25,7 +25,7 @@

 #include <simgear/structure/exception.hxx>

-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>

 using std::string;
--- a/src/Scripting/NasalPositioned.cxx
+++ b/src/Scripting/NasalPositioned.cxx
@ -37,7 +37,7 @@
 #include <simgear/bucket/newbucket.hxx>

 #include <Airports/runways.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/dynamics.hxx>
 #include <Airports/parking.hxx>
 #include <Scripting/NasalSys.hxx>
--- a/src/Traffic/SchedFlight.cxx
+++ b/src/Traffic/SchedFlight.cxx
@ -57,7 +57,7 @@

 #include <AIModel/AIFlightPlan.hxx>
 #include <AIModel/AIManager.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Main/fg_init.hxx>   // That's pretty ugly, but I need fgFindAirportID


--- a/src/Traffic/Schedule.cxx
+++ b/src/Traffic/Schedule.cxx
@ -47,7 +47,7 @@
 #include <AIModel/AIFlightPlan.hxx>
 #include <AIModel/AIManager.hxx>
 #include <AIModel/AIAircraft.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Main/fg_init.hxx>   // That's pretty ugly, but I need fgFindAirportID


--- a/src/Traffic/TrafficMgr.cxx
+++ b/src/Traffic/TrafficMgr.cxx
@ -64,7 +64,7 @@
 #include <AIModel/AIAircraft.hxx>
 #include <AIModel/AIFlightPlan.hxx>
 #include <AIModel/AIBase.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Main/fg_init.hxx>

 #include "TrafficMgr.hxx"