From b07ad149aebeb1d060bc9a0d505fdc1ca1081654 Mon Sep 17 00:00:00 2001 From: mfranz Date: Thu, 14 May 2009 20:55:09 +0000 Subject: [PATCH] turn a few #include paths from the "foo" form to The quotes form is normally only used for headers with path relative to the including file's path, though the standard doesn't strictly mandate this. This is consistent with the rest of sg/fg, it makes the code's intent clearer and helps to find headers. (And it's a few milliseconds faster, too.) --- src/Airports/runwaybase.hxx | 2 +- src/Airports/runways.hxx | 2 +- src/Airports/simple.hxx | 2 +- src/Cockpit/cockpit.hxx | 2 +- src/Environment/environment_ctrl.cxx | 2 +- src/Environment/environment_ctrl.hxx | 4 ++-- src/Instrumentation/KLN89/kln89.cxx | 2 +- src/Instrumentation/KLN89/kln89_page_apt.cxx | 8 ++++---- src/Instrumentation/KLN89/kln89_page_int.cxx | 4 ++-- src/Instrumentation/KLN89/kln89_page_ndb.cxx | 2 +- src/Instrumentation/KLN89/kln89_page_vor.cxx | 2 +- src/Instrumentation/gps.cxx | 6 +++--- src/Instrumentation/mk_viii.cxx | 10 +++++----- src/Instrumentation/mk_viii.hxx | 6 +++--- src/Navaids/fixlist.cxx | 4 ++-- src/Navaids/markerbeacon.cxx | 6 +++--- src/Navaids/navdb.cxx | 6 +++--- src/Navaids/navrecord.cxx | 8 ++++---- 18 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/Airports/runwaybase.hxx b/src/Airports/runwaybase.hxx index aa34df7a7..1f7e58f12 100644 --- a/src/Airports/runwaybase.hxx +++ b/src/Airports/runwaybase.hxx @@ -28,7 +28,7 @@ #include -#include "Navaids/positioned.hxx" +#include #include diff --git a/src/Airports/runways.hxx b/src/Airports/runways.hxx index b61b6a079..397db7651 100644 --- a/src/Airports/runways.hxx +++ b/src/Airports/runways.hxx @@ -26,7 +26,7 @@ #include -#include "Airports/runwaybase.hxx" +#include // forward decls class FGAirport; diff --git a/src/Airports/simple.hxx b/src/Airports/simple.hxx index dc4d7c319..80b690e0d 100644 --- a/src/Airports/simple.hxx +++ b/src/Airports/simple.hxx @@ -32,7 +32,7 @@ #include #include -#include "Navaids/positioned.hxx" +#include // forward decls class FGAirportDynamics; diff --git a/src/Cockpit/cockpit.hxx b/src/Cockpit/cockpit.hxx index e9caab6de..9c7a5c9d2 100644 --- a/src/Cockpit/cockpit.hxx +++ b/src/Cockpit/cockpit.hxx @@ -33,7 +33,7 @@ #include -#include "Aircraft/aircraft.hxx" +#include #include "panel.hxx" bool fgCockpitInit( fgAIRCRAFT *cur_aircraft ); diff --git a/src/Environment/environment_ctrl.cxx b/src/Environment/environment_ctrl.cxx index 14354efee..f0798ea6d 100644 --- a/src/Environment/environment_ctrl.cxx +++ b/src/Environment/environment_ctrl.cxx @@ -34,7 +34,7 @@ #include
#include
-#include "Environment/fgmetar.hxx" +#include "fgmetar.hxx" #include "environment_mgr.hxx" #include "environment_ctrl.hxx" diff --git a/src/Environment/environment_ctrl.hxx b/src/Environment/environment_ctrl.hxx index b49610e32..f11f47fdb 100644 --- a/src/Environment/environment_ctrl.hxx +++ b/src/Environment/environment_ctrl.hxx @@ -34,8 +34,8 @@ #include #include -#include "Navaids/positioned.hxx" -#include "Environment/environment.hxx" +#include +#include // forward decls class SGPropertyNode; diff --git a/src/Instrumentation/KLN89/kln89.cxx b/src/Instrumentation/KLN89/kln89.cxx index dd8a6c62d..56328eae9 100644 --- a/src/Instrumentation/KLN89/kln89.cxx +++ b/src/Instrumentation/KLN89/kln89.cxx @@ -46,7 +46,7 @@ #include #include
#include -#include "Airports/simple.hxx" +#include using std::cout; diff --git a/src/Instrumentation/KLN89/kln89_page_apt.cxx b/src/Instrumentation/KLN89/kln89_page_apt.cxx index 62031c760..5ba94a3c5 100644 --- a/src/Instrumentation/KLN89/kln89_page_apt.cxx +++ b/src/Instrumentation/KLN89/kln89_page_apt.cxx @@ -26,10 +26,10 @@ #endif #include "kln89_page_apt.hxx" -#include "ATCDCL/commlist.hxx" -#include "Main/globals.hxx" -#include "Airports/runways.hxx" -#include "Airports/simple.hxx" +#include +#include
+#include +#include // This function is copied from Airports/runways.cxx // TODO - Make the original properly available and remove this instance!!!! diff --git a/src/Instrumentation/KLN89/kln89_page_int.cxx b/src/Instrumentation/KLN89/kln89_page_int.cxx index de5803416..694e06ce6 100644 --- a/src/Instrumentation/KLN89/kln89_page_int.cxx +++ b/src/Instrumentation/KLN89/kln89_page_int.cxx @@ -26,8 +26,8 @@ #endif #include "kln89_page_int.hxx" -#include "Navaids/fix.hxx" -#include "Navaids/navrecord.hxx" +#include +#include KLN89IntPage::KLN89IntPage(KLN89* parent) : KLN89Page(parent) { diff --git a/src/Instrumentation/KLN89/kln89_page_ndb.cxx b/src/Instrumentation/KLN89/kln89_page_ndb.cxx index d118e5abb..0a70f1d63 100644 --- a/src/Instrumentation/KLN89/kln89_page_ndb.cxx +++ b/src/Instrumentation/KLN89/kln89_page_ndb.cxx @@ -26,7 +26,7 @@ #endif #include "kln89_page_ndb.hxx" -#include "Navaids/navrecord.hxx" +#include KLN89NDBPage::KLN89NDBPage(KLN89* parent) : KLN89Page(parent) { diff --git a/src/Instrumentation/KLN89/kln89_page_vor.cxx b/src/Instrumentation/KLN89/kln89_page_vor.cxx index c0caaba72..a7719f495 100644 --- a/src/Instrumentation/KLN89/kln89_page_vor.cxx +++ b/src/Instrumentation/KLN89/kln89_page_vor.cxx @@ -26,7 +26,7 @@ #endif #include "kln89_page_vor.hxx" -#include "Navaids/navrecord.hxx" +#include KLN89VorPage::KLN89VorPage(KLN89* parent) : KLN89Page(parent) { diff --git a/src/Instrumentation/gps.cxx b/src/Instrumentation/gps.cxx index 424ed3e90..981c35af2 100644 --- a/src/Instrumentation/gps.cxx +++ b/src/Instrumentation/gps.cxx @@ -11,9 +11,9 @@ #include #include -#include "Main/fg_props.hxx" -#include "Main/util.hxx" // for fgLowPass -#include "Navaids/positioned.hxx" +#include
+#include
// for fgLowPass +#include #include #include diff --git a/src/Instrumentation/mk_viii.cxx b/src/Instrumentation/mk_viii.cxx index 3bbdc4235..4645ceef5 100755 --- a/src/Instrumentation/mk_viii.cxx +++ b/src/Instrumentation/mk_viii.cxx @@ -74,13 +74,13 @@ using std::string; -#include "Airports/runways.hxx" -#include "Airports/simple.hxx" +#include +#include #ifndef _MSC_VER -# include "Include/version.h" +# include #endif -#include "Main/fg_props.hxx" -#include "Main/globals.hxx" +#include
+#include
#include "instrument_mgr.hxx" #include "mk_viii.hxx" diff --git a/src/Instrumentation/mk_viii.hxx b/src/Instrumentation/mk_viii.hxx index 4db4b45ce..afacd10fd 100755 --- a/src/Instrumentation/mk_viii.hxx +++ b/src/Instrumentation/mk_viii.hxx @@ -36,9 +36,9 @@ using std::vector; using std::deque; using std::map; -#include "Airports/runways.hxx" -#include "Airports/simple.hxx" -#include "Main/globals.hxx" +#include +#include +#include
/////////////////////////////////////////////////////////////////////////////// // MK_VIII //////////////////////////////////////////////////////////////////// diff --git a/src/Navaids/fixlist.cxx b/src/Navaids/fixlist.cxx index 1f685e193..f9fc37a5d 100644 --- a/src/Navaids/fixlist.cxx +++ b/src/Navaids/fixlist.cxx @@ -33,8 +33,8 @@ #include #include "fixlist.hxx" -#include "Navaids/fix.hxx" -#include "Airports/simple.hxx" +#include +#include FGFix::FGFix(const std::string& aIdent, const SGGeod& aPos) : FGPositioned(FIX, aIdent, aPos) diff --git a/src/Navaids/markerbeacon.cxx b/src/Navaids/markerbeacon.cxx index 71584504f..3a49e3280 100644 --- a/src/Navaids/markerbeacon.cxx +++ b/src/Navaids/markerbeacon.cxx @@ -27,9 +27,9 @@ #include #include -#include "Navaids/markerbeacon.hxx" -#include "Airports/runways.hxx" -#include "Navaids/navdb.hxx" +#include +#include +#include using std::string; diff --git a/src/Navaids/navdb.cxx b/src/Navaids/navdb.cxx index 95f7f77ee..add542987 100644 --- a/src/Navaids/navdb.cxx +++ b/src/Navaids/navdb.cxx @@ -38,9 +38,9 @@ #include "navrecord.hxx" #include "navlist.hxx" #include "navdb.hxx" -#include "Main/globals.hxx" -#include "Navaids/markerbeacon.hxx" -#include "Airports/simple.hxx" +#include
+#include +#include using std::string; diff --git a/src/Navaids/navrecord.cxx b/src/Navaids/navrecord.cxx index c2ab0e9a7..0695010cd 100644 --- a/src/Navaids/navrecord.cxx +++ b/src/Navaids/navrecord.cxx @@ -30,10 +30,10 @@ #include #include -#include "Navaids/navrecord.hxx" -#include "Navaids/navdb.hxx" -#include "Airports/runways.hxx" -#include "Main/fg_props.hxx" +#include +#include +#include +#include
FGNavRecord::FGNavRecord(Type aTy, const std::string& aIdent, const std::string& aName, const SGGeod& aPos, -- 2.39.5