turn a few #include paths from the "foo" form to <foo>

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.)

diff --git a/src/Airports/runwaybase.hxx b/src/Airports/runwaybase.hxx
index aa34df7a747915b689ca534d0d6c2fa0343a4933..1f7e58f12033837ca65b525812305cf4e1e79af7 100644 (file)
--- a/src/Airports/runwaybase.hxx
+++ b/src/Airports/runwaybase.hxx
@@ -28,7 +28,7 @@
 
 #include <simgear/math/sg_geodesy.hxx>
 
-#include "Navaids/positioned.hxx"
+#include <Navaids/positioned.hxx>
 
 #include <string>
 

diff --git a/src/Airports/runways.hxx b/src/Airports/runways.hxx
index b61b6a079ec6c45de16792b35b44380bf9e3e859..397db76518294fb534c7ed0f51867b9b7156d9ae 100644 (file)
--- a/src/Airports/runways.hxx
+++ b/src/Airports/runways.hxx
@@ -26,7 +26,7 @@
 
 #include <simgear/compiler.h>
 
-#include "Airports/runwaybase.hxx"
+#include <Airports/runwaybase.hxx>
 
 // forward decls
 class FGAirport;

diff --git a/src/Airports/simple.hxx b/src/Airports/simple.hxx
index dc4d7c319a3e60891003b3d16cb20ef542b0b850..80b690e0df70a2743daf276e5f04b2a693c5be3d 100644 (file)
--- a/src/Airports/simple.hxx
+++ b/src/Airports/simple.hxx
@@ -32,7 +32,7 @@
 #include <string>
 #include <vector>
 
-#include "Navaids/positioned.hxx"
+#include <Navaids/positioned.hxx>
 
 // forward decls
 class FGAirportDynamics;

diff --git a/src/Cockpit/cockpit.hxx b/src/Cockpit/cockpit.hxx
index e9caab6dec0beb46988802e5a2d2c00f1468c5c5..9c7a5c9d279bc1a93a35b5b3679a6e49cbde7543 100644 (file)
--- a/src/Cockpit/cockpit.hxx
+++ b/src/Cockpit/cockpit.hxx
@@ -33,7 +33,7 @@
 
 #include <osg/State>
 
-#include "Aircraft/aircraft.hxx"
+#include <Aircraft/aircraft.hxx>
 #include "panel.hxx"
 
 bool fgCockpitInit( fgAIRCRAFT *cur_aircraft );

diff --git a/src/Environment/environment_ctrl.cxx b/src/Environment/environment_ctrl.cxx
index 14354efeec770166d5a5fb958be28c60759f6dc8..f0798ea6d6492e0594a49cde4b2458d9ace6e2c1 100644 (file)
--- a/src/Environment/environment_ctrl.cxx
+++ b/src/Environment/environment_ctrl.cxx
@@ -34,7 +34,7 @@
 #include <Main/fg_props.hxx>
 #include <Main/util.hxx>
 
-#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 b49610e328a998474d1adbf63ddf7b6f4c078f70..f11f47fdbc17a14178adac7d0f47cfe3b17bda81 100644 (file)
--- a/src/Environment/environment_ctrl.hxx
+++ b/src/Environment/environment_ctrl.hxx
@@ -34,8 +34,8 @@
 #include <queue>
 #include <vector>
 
-#include "Navaids/positioned.hxx"
-#include "Environment/environment.hxx"
+#include <Navaids/positioned.hxx>
+#include <Environment/environment.hxx>
 
 // forward decls
 class SGPropertyNode;

diff --git a/src/Instrumentation/KLN89/kln89.cxx b/src/Instrumentation/KLN89/kln89.cxx
index dd8a6c62dcc343b1def393a8b6e9905ade310dde..56328eae91b8b38e5c2edbbb2536ad8c9519a2b4 100644 (file)
--- a/src/Instrumentation/KLN89/kln89.cxx
+++ b/src/Instrumentation/KLN89/kln89.cxx
@@ -46,7 +46,7 @@
 #include <ATCDCL/ATCProjection.hxx>
 #include <Main/fg_props.hxx>
 #include <simgear/math/SGMath.hxx>
-#include "Airports/simple.hxx"
+#include <Airports/simple.hxx>
 
 using std::cout;
 

diff --git a/src/Instrumentation/KLN89/kln89_page_apt.cxx b/src/Instrumentation/KLN89/kln89_page_apt.cxx
index 62031c760b6bbd7f299c0c6c971bb787eb3b474a..5ba94a3c5df121fefd077c99df13b8fd5620bfbf 100644 (file)
--- 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 <ATCDCL/commlist.hxx>
+#include <Main/globals.hxx>
+#include <Airports/runways.hxx>
+#include <Airports/simple.hxx>
 
 // 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 de5803416b3b640e39cadc77c9dce7dd7a3d4791..694e06ce6cccd8f7630429e35f63490939493f7b 100644 (file)
--- 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 <Navaids/fix.hxx>
+#include <Navaids/navrecord.hxx>
 
 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 d118e5abbc0d4a467e0bf422e4e1f0680bce6890..0a70f1d633d7260dd2f67777085a22ee1a2f9181 100644 (file)
--- 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 <Navaids/navrecord.hxx>
 
 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 c0caaba722929a532baffab36fdb25eb8c8e31ad..a7719f495ebacc5629ab5ccc374628b5abff3d1c 100644 (file)
--- 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 <Navaids/navrecord.hxx>
 
 KLN89VorPage::KLN89VorPage(KLN89* parent) 
 : KLN89Page(parent) {

diff --git a/src/Instrumentation/gps.cxx b/src/Instrumentation/gps.cxx
index 424ed3e90bdfb5bbb0ab3f4e893ba6b014b3be77..981c35af2e9978ab74eeb6f8c0b5ac7204745e28 100644 (file)
--- a/src/Instrumentation/gps.cxx
+++ b/src/Instrumentation/gps.cxx
@@ -11,9 +11,9 @@
 
 #include <simgear/compiler.h>
 #include <Aircraft/aircraft.hxx>
-#include "Main/fg_props.hxx"
-#include "Main/util.hxx" // for fgLowPass
-#include "Navaids/positioned.hxx"
+#include <Main/fg_props.hxx>
+#include <Main/util.hxx> // for fgLowPass
+#include <Navaids/positioned.hxx>
 
 #include <simgear/math/sg_random.h>
 #include <simgear/sg_inlines.h>

diff --git a/src/Instrumentation/mk_viii.cxx b/src/Instrumentation/mk_viii.cxx
index 3bbdc4235d73c902f64e4300a0b5a7a3b27dff67..4645ceef5d51d9881ea6174f4f825beeab13424b 100755 (executable)
--- 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 <Airports/runways.hxx>
+#include <Airports/simple.hxx>
 #ifndef _MSC_VER
-#  include "Include/version.h"
+#  include <Include/version.h>
 #endif
-#include "Main/fg_props.hxx"
-#include "Main/globals.hxx"
+#include <Main/fg_props.hxx>
+#include <Main/globals.hxx>
 #include "instrument_mgr.hxx"
 #include "mk_viii.hxx"
 

diff --git a/src/Instrumentation/mk_viii.hxx b/src/Instrumentation/mk_viii.hxx
index 4db4b45cec27bcb3a4fb75808e6c4fa6ec03d864..afacd10fd4bc0cbd89fcf786db085bf6efcd3c8d 100755 (executable)
--- 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 <Airports/runways.hxx>
+#include <Airports/simple.hxx>
+#include <Main/globals.hxx>
 
 ///////////////////////////////////////////////////////////////////////////////
 // MK_VIII ////////////////////////////////////////////////////////////////////

diff --git a/src/Navaids/fixlist.cxx b/src/Navaids/fixlist.cxx
index 1f685e193fa719b98a8a14904e9e99c303116e59..f9fc37a5d3a2436ed24d9c03d1f4a4bb9e146299 100644 (file)
--- a/src/Navaids/fixlist.cxx
+++ b/src/Navaids/fixlist.cxx
@@ -33,8 +33,8 @@
 #include <simgear/math/sg_geodesy.hxx>
 
 #include "fixlist.hxx"
-#include "Navaids/fix.hxx"
-#include "Airports/simple.hxx"
+#include <Navaids/fix.hxx>
+#include <Airports/simple.hxx>
 
 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 71584504f3a312f4fa4ccee1ff47e6b31db3bb27..3a49e328056fb4f0cedad3b82c10f3ffee051d17 100644 (file)
--- a/src/Navaids/markerbeacon.cxx
+++ b/src/Navaids/markerbeacon.cxx
@@ -27,9 +27,9 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/debug/logstream.hxx>
 
-#include "Navaids/markerbeacon.hxx"
-#include "Airports/runways.hxx"
-#include "Navaids/navdb.hxx"
+#include <Navaids/markerbeacon.hxx>
+#include <Airports/runways.hxx>
+#include <Navaids/navdb.hxx>
 
 using std::string;
 

diff --git a/src/Navaids/navdb.cxx b/src/Navaids/navdb.cxx
index 95f7f77eef15f1b72d1e4f32cefc360fa9331230..add542987d80ce01a0b10ba0adf41115cfe1a0b0 100644 (file)
--- 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 <Main/globals.hxx>
+#include <Navaids/markerbeacon.hxx>
+#include <Airports/simple.hxx>
 
 using std::string;
 

diff --git a/src/Navaids/navrecord.cxx b/src/Navaids/navrecord.cxx
index c2ab0e9a7706df98c2b24cae498f69ffa10ca41a..0695010cdf60df96e30b9a8dface8928f290f63f 100644 (file)
--- a/src/Navaids/navrecord.cxx
+++ b/src/Navaids/navrecord.cxx
@@ -30,10 +30,10 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/debug/logstream.hxx>
 
-#include "Navaids/navrecord.hxx"
-#include "Navaids/navdb.hxx"
-#include "Airports/runways.hxx"
-#include "Main/fg_props.hxx"
+#include <Navaids/navrecord.hxx>
+#include <Navaids/navdb.hxx>
+#include <Airports/runways.hxx>
+#include <Main/fg_props.hxx>
 
 FGNavRecord::FGNavRecord(Type aTy, const std::string& aIdent, 
   const std::string& aName, const SGGeod& aPos,