More fg -> sg namespace changes in simgear.

diff --git a/src/Airports/runways.cxx b/src/Airports/runways.cxx
index 4810410f4ceec3308c4e21920fa3397e1b625c3c..76bfed70ca9e81ece71031fbc890dda39e2a4269 100644 (file)
--- a/src/Airports/runways.cxx
+++ b/src/Airports/runways.cxx
@@ -31,7 +31,7 @@
 #include <simgear/compiler.h>
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
 
 #include STL_STRING
 #include STL_FUNCTIONAL
@@ -173,7 +173,7 @@ int FGRunwaysUtil::load( const string& file ) {
 
     runways.erase( runways.begin(), runways.end() );
 
-    fg_gzifstream in( file );
+    sg_gzifstream in( file );
     if ( !in.is_open() ) {
        SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << file );
        exit(-1);

diff --git a/src/Airports/simple.cxx b/src/Airports/simple.cxx
index 7db6a278787310ac6f64f2fbe26c2f1315c78428..8d02279ab7eb7605618bea94ffb8deb25fdcde8e 100644 (file)
--- a/src/Airports/simple.cxx
+++ b/src/Airports/simple.cxx
@@ -40,7 +40,7 @@
 #include <simgear/compiler.h>
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
 
 #include STL_STRING
 #include STL_FUNCTIONAL
@@ -117,7 +117,7 @@ int FGAirportsUtil::load( const string& file ) {
 
     airports.erase( airports.begin(), airports.end() );
 
-    fg_gzifstream in( file );
+    sg_gzifstream in( file );
     if ( !in.is_open() ) {
        SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << file );
        exit(-1);

diff --git a/src/Autopilot/auto_gui.cxx b/src/Autopilot/auto_gui.cxx
index 24e238b53c0c503354243cb94d0a1da7e0b89ef6..6e8916a8b770e38b900bc0d85b527286722c116a 100644 (file)
--- a/src/Autopilot/auto_gui.cxx
+++ b/src/Autopilot/auto_gui.cxx
@@ -34,7 +34,7 @@
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <Airports/simple.hxx>
 #include <GUI/gui.h>

diff --git a/src/Cockpit/hud.cxx b/src/Cockpit/hud.cxx
index 203714f3c5515fba497b8d2858096d613c38f166..76ecb8f3c1be334b6343ccb864643f9fa064df95 100644 (file)
--- a/src/Cockpit/hud.cxx
+++ b/src/Cockpit/hud.cxx
@@ -684,7 +684,7 @@ int readHud( istream &input )
                
                const SGPropertyNode * node = instrument_group->getChild(i);
 
-               FGPath path( globals->get_fg_root() );
+               SGPath path( globals->get_fg_root() );
                path.append(node->getStringValue("path"));
 
                SG_LOG(SG_INPUT, SG_INFO, "Reading Instrument "
@@ -714,7 +714,7 @@ int fgHUDInit( fgAIRCRAFT * /* current_aircraft */ )
 
     string hud_path =
        fgGetString("/sim/hud/path", "Huds/Default/default.xml");
-       FGPath path(globals->get_fg_root());
+       SGPath path(globals->get_fg_root());
        path.append(hud_path);
        
        ifstream input(path.c_str());
@@ -743,7 +743,7 @@ int fgHUDInit2( fgAIRCRAFT * /* current_aircraft */ )
 
     SG_LOG( SG_COCKPIT, SG_INFO, "Initializing current aircraft HUD" );
 
-       FGPath path(globals->get_fg_root());
+       SGPath path(globals->get_fg_root());
        path.append("Huds/Minimal/default.xml");
 
 

diff --git a/src/Cockpit/panel.cxx b/src/Cockpit/panel.cxx
index 6d0ac50a78f651e32af750ab71aa5d8a62c56975..5f638f44f09a3d19a5a15d07c657421ae88836e8 100644 (file)
--- a/src/Cockpit/panel.cxx
+++ b/src/Cockpit/panel.cxx
@@ -32,7 +32,7 @@
 #include <plib/fnt.h>
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
@@ -66,7 +66,7 @@ FGTextureManager::createTexture (const string &relativePath)
   ssgTexture * texture = _textureMap[relativePath];
   if (texture == 0) {
     cerr << "Texture " << relativePath << " does not yet exist" << endl;
-    FGPath tpath(globals->get_fg_root());
+    SGPath tpath(globals->get_fg_root());
     tpath.append(relativePath);
     texture = new ssgTexture((char *)tpath.c_str(), false, false);
     _textureMap[relativePath] = texture;

diff --git a/src/Cockpit/panel_io.cxx b/src/Cockpit/panel_io.cxx
index a0a5986940262adadc50b479bc6f8ddb91a8b6dc..2ff16bb15f5c3e4358d40612d87224fc745347e9 100644 (file)
--- a/src/Cockpit/panel_io.cxx
+++ b/src/Cockpit/panel_io.cxx
@@ -28,7 +28,7 @@
 
 #include <simgear/compiler.h>
 
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/props.hxx>
 
@@ -760,7 +760,7 @@ fgReadPanel (istream &input)
     for (int i = 0; i < nInstruments; i++) {
       const SGPropertyNode * node = instrument_group->getChild(i);
       
-      FGPath path( globals->get_fg_root() );
+      SGPath path( globals->get_fg_root() );
       path.append(node->getStringValue("path"));
       
       SG_LOG(SG_INPUT, SG_INFO, "Reading instrument "
@@ -815,7 +815,7 @@ FGPanel *
 fgReadPanel (const string &relative_path)
 {
   FGPanel * panel = 0;
-  FGPath path(globals->get_fg_root());
+  SGPath path(globals->get_fg_root());
   path.append(relative_path);
   ifstream input(path.c_str());
   if (!input.good()) {

diff --git a/src/Cockpit/radiostack.cxx b/src/Cockpit/radiostack.cxx
index 7580eab374b85a3d4c0de8d363523569008bcb56..83666ff7b8ee81cea6b12fbe7097b98c5f84f533 100644 (file)
--- a/src/Cockpit/radiostack.cxx
+++ b/src/Cockpit/radiostack.cxx
@@ -106,12 +106,12 @@ FGRadioStack::init ()
     search();
     update();
 
-    FGPath path( globals->get_fg_root() );
-    FGPath term = path;
+    SGPath path( globals->get_fg_root() );
+    SGPath term = path;
     term.append( "Navaids/range.term" );
-    FGPath low = path;
+    SGPath low = path;
     low.append( "Navaids/range.low" );
-    FGPath high = path;
+    SGPath high = path;
     high.append( "Navaids/range.high" );
 
     term_tbl = new SGInterpTable( term.str() );

diff --git a/src/FDM/Balloon.cxx b/src/FDM/Balloon.cxx
index af5ffc7a0a9f742774d046873a7efe9fcda55dab..9af965fb689d0da5de50abe54a9594b2e994663e 100644 (file)
--- a/src/FDM/Balloon.cxx
+++ b/src/FDM/Balloon.cxx
@@ -48,7 +48,7 @@ HISTORY
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Controls/controls.hxx>

diff --git a/src/FDM/JSBSim.cxx b/src/FDM/JSBSim.cxx
index 22359cdecee19dae0737d694d65937a8b105cbd2..1ca1edcce1eb0c887b8ac615e80eebf55cbdf279 100644 (file)
--- a/src/FDM/JSBSim.cxx
+++ b/src/FDM/JSBSim.cxx
@@ -32,7 +32,7 @@
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <Scenery/scenery.hxx>
 
@@ -65,10 +65,10 @@ FGJSBsim::FGJSBsim( double dt ) {
     fgic=new FGInitialCondition(fdmex);
     needTrim=true;
   
-    FGPath aircraft_path( globals->get_fg_root() );
+    SGPath aircraft_path( globals->get_fg_root() );
     aircraft_path.append( "Aircraft" );
 
-    FGPath engine_path( globals->get_fg_root() );
+    SGPath engine_path( globals->get_fg_root() );
     engine_path.append( "Engine" );
     set_delta_t( dt );
     fdmex->GetState()->Setdt( dt );
@@ -104,10 +104,10 @@ void FGJSBsim::init() {
     SG_LOG( SG_FLIGHT, SG_INFO, "Starting and initializing JSBsim" );
 
 #if 0
-    FGPath aircraft_path( globals->get_fg_root() );
+    SGPath aircraft_path( globals->get_fg_root() );
     aircraft_path.append( "Aircraft" );
 
-    FGPath engine_path( globals->get_fg_root() );
+    SGPath engine_path( globals->get_fg_root() );
     engine_path.append( "Engine" );
 
     fdmex->GetState()->Setdt( get_delta_t() );

diff --git a/src/GUI/apt_dlg.cxx b/src/GUI/apt_dlg.cxx
index 7f8f81fb66e34e0eb1acddeadc799ef018840a67..a6a5220f4c847a95a88890ad0883e463bf4ade29 100644 (file)
--- a/src/GUI/apt_dlg.cxx
+++ b/src/GUI/apt_dlg.cxx
@@ -12,7 +12,7 @@
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <Include/general.hxx>
 
@@ -51,7 +51,7 @@ void AptDialog_Cancel(puObject *)
 
 void AptDialog_OK (puObject *)
 {
-       FGPath path( globals->get_fg_root() );
+       SGPath path( globals->get_fg_root() );
        path.append( "Airports" );
        path.append( "simple.mk4" );
        FGAirports airports( path.c_str() );

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index 7d1a3785214daba5acbdcd4f51bb7ccf01bd3412..5bc08bbcddbc6a7f51db771d31097117902d1479 100644 (file)
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -53,7 +53,7 @@
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 #include <simgear/screen/screen-dump.hxx>
 
 #include <Include/general.hxx>
@@ -724,7 +724,7 @@ void guiInit()
     gui_msg_RESET  = msg_RESET;  // "RESET"
 
     // Next check home directory
-    FGPath fntpath;
+    SGPath fntpath;
     char* envp = ::getenv( "FG_FONTS" );
     if ( envp != NULL ) {
         fntpath.set( envp );

diff --git a/src/GUI/mouse.cxx b/src/GUI/mouse.cxx
index 1ade9e00e59e5eea6b9c1637c98dded38f61cb79..bbaf0164df70345f8ff7540ef2b8a56a81bc6568 100644 (file)
--- a/src/GUI/mouse.cxx
+++ b/src/GUI/mouse.cxx
@@ -52,7 +52,7 @@
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 #include <simgear/screen/screen-dump.hxx>
 
 #include <Include/general.hxx>

diff --git a/src/GUI/net_dlg.cxx b/src/GUI/net_dlg.cxx
index 3d7cd34ea8357a6050b3f8de7551d14139dcc0b2..bc8a6a4b3157e71a2a5f4a5c327c07574bfe31dd 100644 (file)
--- a/src/GUI/net_dlg.cxx
+++ b/src/GUI/net_dlg.cxx
@@ -33,7 +33,7 @@
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <Include/general.hxx>
 #include <simgear/xgl/xgl.h>

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index c303be1447fb89323a8af07ef71abc66c3f247de..6b0a02b944fc960c7c9612f85c7246703296d236 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -57,7 +57,7 @@
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/polar3d.hxx>
 #include <simgear/math/sg_geodesy.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 #include <simgear/timing/sg_time.hxx>
 
 #include <Aircraft/aircraft.hxx>
@@ -126,7 +126,7 @@ bool fgInitFGRoot ( int argc, char **argv ) {
     if ( root == "" ) {
        envp = ::getenv( "HOME" );
        if ( envp != NULL ) {
-           FGPath config( envp );
+           SGPath config( envp );
            config.append( ".fgfsrc" );
            char name[256];
            gethostname( name, 256 );
@@ -141,7 +141,7 @@ bool fgInitFGRoot ( int argc, char **argv ) {
     if ( root == "" ) {
        envp = ::getenv( "HOME" );
        if ( envp != NULL ) {
-           FGPath config( envp );
+           SGPath config( envp );
            config.append( ".fgfsrc" );
            root = fgScanForRoot(config.str());
        }
@@ -181,7 +181,7 @@ bool fgInitConfig ( int argc, char **argv ) {
     fgSetDefaults();
 
     // Read global preferences from $FG_ROOT/preferences.xml
-    FGPath props_path(globals->get_fg_root());
+    SGPath props_path(globals->get_fg_root());
     props_path.append("preferences.xml");
     SG_LOG(SG_INPUT, SG_INFO, "Reading global preferences");
     if (!readProperties(props_path.str(), globals->get_props())) {
@@ -195,7 +195,7 @@ bool fgInitConfig ( int argc, char **argv ) {
     // from least precidence to greatest precidence
 
     // Check for $fg_root/system.fgfsrc
-    FGPath config( globals->get_fg_root() );
+    SGPath config( globals->get_fg_root() );
     config.append( "system.fgfsrc" );
     fgParseOptions(config.str());
 
@@ -235,7 +235,7 @@ bool fgInitConfig ( int argc, char **argv ) {
 // find basic airport location info from airport database
 bool fgFindAirportID( const string& id, FGAirport *a ) {
     if ( id.length() ) {
-       FGPath path( globals->get_fg_root() );
+       SGPath path( globals->get_fg_root() );
        path.append( "Airports" );
        path.append( "simple.mk4" );
        FGAirports airports( path.c_str() );
@@ -293,7 +293,7 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
     if ( id.length() ) {
        // set initial position from runway and heading
 
-       FGPath path( globals->get_fg_root() );
+       SGPath path( globals->get_fg_root() );
        path.append( "Airports" );
        path.append( "runways.mk4" );
        FGRunways runways( path.c_str() );
@@ -302,12 +302,12 @@ bool fgSetPosFromAirportIDandHdg( const string& id, double tgt_hdg ) {
                "Attempting to set starting position from runway code "
                << id << " heading " << tgt_hdg );
 
-       // FGPath inpath( globals->get_fg_root() );
+       // SGPath inpath( globals->get_fg_root() );
        // inpath.append( "Airports" );
        // inpath.append( "apt_simple" );
        // airports.load( inpath.c_str() );
 
-       // FGPath outpath( globals->get_fg_root() );
+       // SGPath outpath( globals->get_fg_root() );
        // outpath.append( "Airports" );
        // outpath.append( "simple.gdbm" );
        // airports.dump_gdbm( outpath.c_str() );
@@ -531,7 +531,7 @@ bool fgInitSubsystems( void ) {
     SG_LOG( SG_GENERAL, SG_INFO, "========== ==========");
 
     // Initialize the material property lib
-    FGPath mpath( globals->get_fg_root() );
+    SGPath mpath( globals->get_fg_root() );
     mpath.append( "materials" );
     if ( material_lib.load( mpath.str() ) ) {
     } else {
@@ -738,7 +738,7 @@ bool fgInitSubsystems( void ) {
 
     SG_LOG(SG_GENERAL, SG_INFO, "  VOR/NDB");
     current_navlist = new FGNavList;
-    FGPath p_nav( globals->get_fg_root() );
+    SGPath p_nav( globals->get_fg_root() );
     p_nav.append( "Navaids/default.nav" );
     current_navlist->init( p_nav );
 
@@ -746,13 +746,13 @@ bool fgInitSubsystems( void ) {
     current_beacons = new FGMarkerBeacons;
     current_beacons->init();
     current_ilslist = new FGILSList;
-    FGPath p_ils( globals->get_fg_root() );
+    SGPath p_ils( globals->get_fg_root() );
     p_ils.append( "Navaids/default.ils" );
     current_ilslist->init( p_ils );
 
     SG_LOG(SG_GENERAL, SG_INFO, "  Fixes");
     current_fixlist = new FGFixList;
-    FGPath p_fix( globals->get_fg_root() );
+    SGPath p_fix( globals->get_fg_root() );
     p_fix.append( "Navaids/default.fix" );
     current_fixlist->init( p_fix );
 

diff --git a/src/Main/keyboard.cxx b/src/Main/keyboard.cxx
index 9031d8482cbaa64c1ee8524c7842216ffbd47a9a..f9763949a10ab54e3326c349a3523c34458560e8 100644 (file)
--- a/src/Main/keyboard.cxx
+++ b/src/Main/keyboard.cxx
@@ -47,7 +47,7 @@
 
 #include <simgear/constants.h>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Autopilot/auto_gui.hxx>
@@ -350,7 +350,7 @@ void GLUTkey(unsigned char k, int x, int y) {
            {
                SGBucket p( f->get_Longitude() * SGD_RADIANS_TO_DEGREES,
                            f->get_Latitude() * SGD_RADIANS_TO_DEGREES );
-               FGPath tile_path( globals->get_fg_root() );
+               SGPath tile_path( globals->get_fg_root() );
                tile_path.append( "Scenery" );
                tile_path.append( p.gen_base_path() );
                tile_path.append( p.gen_index_str() );
@@ -464,7 +464,7 @@ void GLUTspecialkey(int k, int x, int y) {
          return;
        }
        case GLUT_KEY_F4: {
-         FGPath props_path(globals->get_fg_root());
+         SGPath props_path(globals->get_fg_root());
          props_path.append("preferences.xml");
          SG_LOG(SG_INPUT, SG_INFO, "Rereading global preferences");
          if (!readProperties(props_path.str(), globals->get_props())) {

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index b363ed314169b3603ef846352c42a4923ecc03db..acbbd9c0460fffa26fa161f312a5849f82de0e9e 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -60,7 +60,7 @@
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/polar3d.hxx>
 #include <simgear/math/sg_random.h>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 #include <simgear/sky/sky.hxx>
 #include <simgear/timing/sg_time.hxx>
 #include <simgear/timing/lowleveltime.h>
@@ -95,7 +95,7 @@
 
 // begin - added Venky
 //    $$$ begin - added VS Renganathan
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
 #include <FDM/flight.hxx>
 #include <FDM/ADA.hxx>
 void fgLoadDCS (void);
@@ -1115,7 +1115,7 @@ static void fgIdleFunction ( void ) {
 #if !defined(WIN32)
        if ( fgGetBool("/sim/startup/intro-music") ) {
            string lockfile = "/tmp/mpg123.running";
-           FGPath mp3file( globals->get_fg_root() );
+           SGPath mp3file( globals->get_fg_root() );
            mp3file.append( "Sounds/intro.mp3" );
 
            string command = "(touch " + lockfile + "; mpg123 "
@@ -1447,7 +1447,7 @@ int main( int argc, char **argv ) {
     }
 
     // Initialize time
-    FGPath zone( globals->get_fg_root() );
+    SGPath zone( globals->get_fg_root() );
     zone.append( "Timezone" );
     SGTime *t = new SGTime( fgGetDouble("/position/longitude") * SGD_DEGREES_TO_RADIANS,
                            fgGetDouble("/position/latitude") * SGD_DEGREES_TO_RADIANS,
@@ -1498,7 +1498,7 @@ int main( int argc, char **argv ) {
        exit(-1);
     }
 
-    FGPath modelpath( globals->get_fg_root() );
+    SGPath modelpath( globals->get_fg_root() );
     ssgModelPath( (char *)modelpath.c_str() );
   
     // Scene graph root
@@ -1509,7 +1509,7 @@ int main( int argc, char **argv ) {
     lighting->setName( "Lighting" );
 
     // Initialize the sky
-    FGPath ephem_data_path( globals->get_fg_root() );
+    SGPath ephem_data_path( globals->get_fg_root() );
     ephem_data_path.append( "Astro" );
     SGEphemeris *ephem = new SGEphemeris( ephem_data_path.c_str() );
     ephem->update( globals->get_time_params()->getMjd(),
@@ -1517,7 +1517,7 @@ int main( int argc, char **argv ) {
                   0.0 );
     globals->set_ephem( ephem );
 
-    FGPath sky_tex_path( globals->get_fg_root() );
+    SGPath sky_tex_path( globals->get_fg_root() );
     sky_tex_path.append( "Textures" );
     sky_tex_path.append( "Sky" );
     thesky = new SGSky;
@@ -1569,7 +1569,7 @@ int main( int argc, char **argv ) {
        + acmodel_path;
     int pos = full_model.rfind("/");
     
-    FGPath texturepath( full_model.substr(0, pos) );
+    SGPath texturepath( full_model.substr(0, pos) );
     cout << "Texture path = " << texturepath.str() << endl;
     ssgTexturePath( (char *)texturepath.c_str() );
 
@@ -1660,19 +1660,19 @@ void fgLoadDCS(void) {
         ship_pos[k]=NULL;
     }
 
-    FGPath tile_path( globals->get_fg_root());
+    SGPath tile_path( globals->get_fg_root());
     tile_path.append( "Scenery" );
     tile_path.append( "Objects.txt" );
-    fg_gzifstream in( tile_path.str() );
+    sg_gzifstream in( tile_path.str() );
     if ( ! in.is_open() ) {
        SG_LOG( SG_TERRAIN, SG_ALERT, "Cannot open file: " << tile_path.str() );
     }
 
-    FGPath modelpath( globals->get_fg_root() );
+    SGPath modelpath( globals->get_fg_root() );
     modelpath.append( "Models" );
     modelpath.append( "Geometry" );
   
-    FGPath texturepath( globals->get_fg_root() );
+    SGPath texturepath( globals->get_fg_root() );
     texturepath.append( "Models" );
     texturepath.append( "Textures" );
  

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 399ba6207db73e61607fd5cfef008447805d1c98..b35c855c4451a8c487d3b68b58eb56e97238662f 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -39,7 +39,7 @@ bool global_fullscreen = true;
 
 #include STL_STRING
 
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
 
 // #include <Include/general.hxx>
 // #include <Airports/simple.hxx>
@@ -492,7 +492,7 @@ parse_wp( const string& arg ) {
 static bool 
 parse_flightplan(const string& arg)
 {
-    fg_gzifstream infile(arg.c_str());
+    sg_gzifstream infile(arg.c_str());
     if ( !infile.is_open() ) {
        return false;
     }
@@ -908,7 +908,7 @@ fgScanForRoot (int argc, char **argv)
 string
 fgScanForRoot (const string& path)
 {
-    fg_gzifstream in( path );
+    sg_gzifstream in( path );
     if ( !in.is_open() )
       return "";
 
@@ -968,7 +968,7 @@ fgParseOptions (int argc, char **argv) {
 // Parse config file options
 void
 fgParseOptions (const string& path) {
-    fg_gzifstream in( path );
+    sg_gzifstream in( path );
     if ( !in.is_open() )
       return;
 

diff --git a/src/Main/splash.cxx b/src/Main/splash.cxx
index 01beffb68224baef860910d1806d12bfd3235946..f2be9494582caeb3c0be04fd76c3674556fe0534 100644 (file)
--- a/src/Main/splash.cxx
+++ b/src/Main/splash.cxx
@@ -41,7 +41,7 @@
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/sg_random.h>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <Objects/texload.h>
 
@@ -79,7 +79,7 @@ void fgSplashInit ( void ) {
     char num_str[256];
     sprintf(num_str, "%d", num);
 
-    FGPath tpath( globals->get_fg_root() );
+    SGPath tpath( globals->get_fg_root() );
     tpath.append( "Textures/Splash" );
     tpath.concat( num_str );
     tpath.concat( ".rgb" );
@@ -88,7 +88,7 @@ void fgSplashInit ( void ) {
          read_rgb_texture(tpath.c_str(), &width, &height)) == NULL )
     {
        // Try compressed
-       FGPath fg_tpath = tpath;
+       SGPath fg_tpath = tpath;
        fg_tpath.concat( ".gz" );
        if ( (splash_texbuf = 
              read_rgb_texture(fg_tpath.c_str(), &width, &height)) == NULL )

diff --git a/src/Navaids/fix.hxx b/src/Navaids/fix.hxx
index 3f2e50083d8259c93ca75750bcc4e5abc886c0be..9a3cf431c31dc7085ea2ae1476f782efdb6474ac 100644 (file)
--- a/src/Navaids/fix.hxx
+++ b/src/Navaids/fix.hxx
@@ -26,7 +26,7 @@
 
 
 #include <simgear/compiler.h>
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>

diff --git a/src/Navaids/fixlist.cxx b/src/Navaids/fixlist.cxx
index bb7c643df343ba8d0cc2c30f718f51ad16431175..f1dfedf9f8bf75ec18d40390dabed981c79cf608 100644 (file)
--- a/src/Navaids/fixlist.cxx
+++ b/src/Navaids/fixlist.cxx
@@ -22,7 +22,7 @@
 
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 
 #include "fixlist.hxx"
@@ -42,12 +42,12 @@ FGFixList::~FGFixList( void ) {
 
 
 // load the navaids and build the map
-bool FGFixList::init( FGPath path ) {
+bool FGFixList::init( SGPath path ) {
     FGFix fix;
 
     fixlist.erase( fixlist.begin(), fixlist.end() );
 
-    fg_gzifstream in( path.str() );
+    sg_gzifstream in( path.str() );
     if ( !in.is_open() ) {
         SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << path.str() );
         exit(-1);

diff --git a/src/Navaids/fixlist.hxx b/src/Navaids/fixlist.hxx
index 9a99efcfd4a38c3d9c5334ec17721fd236b61b53..75d48e2440751424173025656ef041147152b0da 100644 (file)
--- a/src/Navaids/fixlist.hxx
+++ b/src/Navaids/fixlist.hxx
@@ -26,7 +26,7 @@
 
 
 #include <simgear/compiler.h>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <map>
 #include <vector>
@@ -54,7 +54,7 @@ public:
     ~FGFixList();
 
     // load the navaids and build the map
-    bool init( FGPath path );
+    bool init( SGPath path );
 
     // query the database for the specified frequency, lon and lat are
     // in degrees, elev is in meters

diff --git a/src/Navaids/ils.hxx b/src/Navaids/ils.hxx
index 4c59b47df4e3d19bbf9751ed0cfbcef61981ca22..d9d4c3ae1bdf7b6d516b0e22e05ff239ca14ca32 100644 (file)
--- a/src/Navaids/ils.hxx
+++ b/src/Navaids/ils.hxx
@@ -27,7 +27,7 @@
 
 #include <simgear/compiler.h>
 #include <simgear/math/sg_geodesy.hxx>
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <istream>

diff --git a/src/Navaids/ilslist.cxx b/src/Navaids/ilslist.cxx
index b4d24349302cf2292c32002b406277a84a3264d2..8b53fc6bdc25e32f69cde3fc46ef3d9d197f5d1e 100644 (file)
--- a/src/Navaids/ilslist.cxx
+++ b/src/Navaids/ilslist.cxx
@@ -22,7 +22,7 @@
 
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 
 #include "mkrbeacons.hxx"
@@ -43,12 +43,12 @@ FGILSList::~FGILSList( void ) {
 
 
 // load the navaids and build the map
-bool FGILSList::init( FGPath path ) {
+bool FGILSList::init( SGPath path ) {
     FGILS ils;
 
     ilslist.erase( ilslist.begin(), ilslist.end() );
 
-    fg_gzifstream in( path.str() );
+    sg_gzifstream in( path.str() );
     if ( !in.is_open() ) {
         SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << path.str() );
         exit(-1);

diff --git a/src/Navaids/ilslist.hxx b/src/Navaids/ilslist.hxx
index 433e975f3fec79e5581af03b38b62027bf9fc54b..8d13a58798b090fe1613f6f5981a4afde0f67229 100644 (file)
--- a/src/Navaids/ilslist.hxx
+++ b/src/Navaids/ilslist.hxx
@@ -26,7 +26,7 @@
 
 
 #include <simgear/compiler.h>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <map>
 #include <vector>
@@ -57,7 +57,7 @@ public:
     ~FGILSList();
 
     // load the navaids and build the map
-    bool init( FGPath path );
+    bool init( SGPath path );
 
     // query the database for the specified frequency, lon and lat are
     // in degrees, elev is in meters

diff --git a/src/Navaids/mkrbeacons.hxx b/src/Navaids/mkrbeacons.hxx
index c24977d3255cd35d52279abfc035576268067cd4..dcc2e6d1d7b4eecad2edaecf9130fa280e77a2dd 100644 (file)
--- a/src/Navaids/mkrbeacons.hxx
+++ b/src/Navaids/mkrbeacons.hxx
@@ -26,7 +26,7 @@
 
 
 #include <simgear/compiler.h>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <map>
 #include <vector>

diff --git a/src/Navaids/nav.hxx b/src/Navaids/nav.hxx
index de9f28d0bd57ff05dba6314deea36620a38e3a3c..967b6a3cc66e3278fdcf05dca5ee2f361b2a5b83 100644 (file)
--- a/src/Navaids/nav.hxx
+++ b/src/Navaids/nav.hxx
@@ -28,7 +28,7 @@
 
 #include <simgear/compiler.h>
 #include <simgear/math/sg_geodesy.hxx>
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
 #include <simgear/magvar/magvar.hxx>
 #include <simgear/timing/sg_time.hxx>
 

diff --git a/src/Navaids/navlist.cxx b/src/Navaids/navlist.cxx
index 0b0b26f9381c98bfa2385786942ce05556431546..35ac0d5c22253a539cd6ece60f4975381ef1aed3 100644 (file)
--- a/src/Navaids/navlist.cxx
+++ b/src/Navaids/navlist.cxx
@@ -22,7 +22,7 @@
 
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 
 #include "navlist.hxx"
@@ -42,12 +42,12 @@ FGNavList::~FGNavList( void ) {
 
 
 // load the navaids and build the map
-bool FGNavList::init( FGPath path ) {
+bool FGNavList::init( SGPath path ) {
     FGNav n;
 
     navaids.erase( navaids.begin(), navaids.end() );
 
-    fg_gzifstream in( path.str() );
+    sg_gzifstream in( path.str() );
     if ( !in.is_open() ) {
         SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << path.str() );
         exit(-1);

diff --git a/src/Navaids/navlist.hxx b/src/Navaids/navlist.hxx
index 9423537abd4c815d4b5f17dce4d62d2ea532eee2..e46521b738a9cba5bf36889838e6080400bf5cc7 100644 (file)
--- a/src/Navaids/navlist.hxx
+++ b/src/Navaids/navlist.hxx
@@ -26,7 +26,7 @@
 
 
 #include <simgear/compiler.h>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <map>
 #include <vector>
@@ -57,7 +57,7 @@ public:
     ~FGNavList();
 
     // load the navaids and build the map
-    bool init( FGPath path );
+    bool init( SGPath path );
 
     // query the database for the specified frequency, lon and lat are
     // in degrees, elev is in meters

diff --git a/src/Navaids/testnavs.cxx b/src/Navaids/testnavs.cxx
index b41b9c56d4e58c50b87d248f25e386edb0ff6878..3ac45eb7339c68836a339bf634dce8b22127d3ac 100644 (file)
--- a/src/Navaids/testnavs.cxx
+++ b/src/Navaids/testnavs.cxx
@@ -1,4 +1,4 @@
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include "fixlist.hxx"
 #include "ilslist.hxx"
@@ -8,7 +8,7 @@ int main() {
     double heading, dist;
 
     current_navlist = new FGNavList;
-    FGPath p_nav( "/home/curt/FlightGear/Navaids/default.nav" );
+    SGPath p_nav( "/home/curt/FlightGear/Navaids/default.nav" );
     current_navlist->init( p_nav );
     FGNav n;
     if ( current_navlist->query( -93.2, 45.14, 3000, 117.30, &n) ) {
@@ -19,7 +19,7 @@ int main() {
     }
 
     current_ilslist = new FGILSList;
-    FGPath p_ils( "/home/curt/FlightGear/Navaids/default.ils" );
+    SGPath p_ils( "/home/curt/FlightGear/Navaids/default.ils" );
     current_ilslist->init( p_ils );
     FGILS i;
     if ( current_ilslist->query( -93.1, 45.24, 3000, 110.30, &i) ) {
@@ -31,7 +31,7 @@ int main() {
     }
 
     current_fixlist = new FGFixList;
-    FGPath p_fix( "/home/curt/FlightGear/Navaids/default.fix" );
+    SGPath p_fix( "/home/curt/FlightGear/Navaids/default.fix" );
     current_fixlist->init( p_fix );
     FGFix fix;
     if ( current_fixlist->query( "SHELL", -82, 41, 3000,

diff --git a/src/Objects/matlib.cxx b/src/Objects/matlib.cxx
index dcd2dd6c84d83e72eefa1f9ef68e4ca27eefb3cd..b1449a08e3988eb35147da6913b01b28b2442c51 100644 (file)
--- a/src/Objects/matlib.cxx
+++ b/src/Objects/matlib.cxx
@@ -42,8 +42,8 @@
 #include STL_STRING
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgpath.hxx>
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sg_path.hxx>
+#include <simgear/misc/sgstream.hxx>
 
 #include <Include/general.hxx>
 #include <Main/globals.hxx>
@@ -65,7 +65,7 @@ FGMaterialLib::FGMaterialLib ( void ) {
 
 
 static bool local_file_exists( const string& path ) {
-    fg_gzifstream in( path );
+    sg_gzifstream in( path );
     if ( ! in.is_open() ) {
        return false;
     } else {
@@ -90,7 +90,7 @@ static bool local_file_exists( const string& path ) {
 bool FGMaterialLib::load( const string& mpath ) {
     string material_name;
 
-    fg_gzifstream in( mpath );
+    sg_gzifstream in( mpath );
     if ( ! in.is_open() ) {
        SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << mpath );
        exit(-1);
@@ -129,14 +129,14 @@ bool FGMaterialLib::load( const string& mpath ) {
                in >> m;
 
                // build the ssgSimpleState
-               FGPath tex_path( globals->get_fg_root() );
+               SGPath tex_path( globals->get_fg_root() );
                tex_path.append( "Textures.high" );
 
-               FGPath tmp_path = tex_path;
+               SGPath tmp_path = tex_path;
                tmp_path.append( m.get_texture_name() );
                if ( ! local_file_exists(tmp_path.str())
                     || general.get_glMaxTexSize() < 512 ) {
-                   tex_path = FGPath( globals->get_fg_root() );
+                   tex_path = SGPath( globals->get_fg_root() );
                    tex_path.append( "Textures" );
                }
            

diff --git a/src/Objects/newmat.cxx b/src/Objects/newmat.cxx
index a484a20223a9b9f0d1f8e7de156dd8f435ecc211..15c82ad066787fb9d4bde154a26e35822293fa59 100644 (file)
--- a/src/Objects/newmat.cxx
+++ b/src/Objects/newmat.cxx
@@ -32,8 +32,8 @@
 #endif
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgpath.hxx>
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sg_path.hxx>
+#include <simgear/misc/sgstream.hxx>
 
 #include "newmat.hxx"
 
@@ -73,7 +73,7 @@ FGNewMat::FGNewMat ( const string &mat_name, const string &tex_name )
 void FGNewMat::build_ssg_state( const string& path,
                                GLenum shade_model, bool texture_default )
 {
-    FGPath tex_file( path );
+    SGPath tex_file( path );
     tex_file.append( texture_name );
 
     state = new ssgStateSelector(2);

diff --git a/src/Objects/obj.cxx b/src/Objects/obj.cxx
index aa1575f0ba1f1a187de15e42a7ca1a835fbda5a9..bec98f138e9fd10df4786681894d501944a7f419 100644 (file)
--- a/src/Objects/obj.cxx
+++ b/src/Objects/obj.cxx
@@ -46,7 +46,7 @@
 #include <simgear/math/polar3d.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/math/sg_random.h>
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
 #include <simgear/misc/stopwatch.hxx>
 #include <simgear/misc/texcoord.hxx>
 
@@ -375,7 +375,7 @@ static ssgBranch *fgAsciiObjLoad( const string& path, FGTileEntry *t,
     tile -> setName ( (char *)path.c_str() ) ;
 
     // Attempt to open "path.gz" or "path"
-    fg_gzifstream in( path );
+    sg_gzifstream in( path );
     if ( ! in.is_open() ) {
        SG_LOG( SG_TERRAIN, SG_DEBUG, "Cannot open file: " << path );
        SG_LOG( SG_TERRAIN, SG_DEBUG, "default to ocean tile: " << path );

diff --git a/src/Scenery/newcache.cxx b/src/Scenery/newcache.cxx
index c9916a9bbbfcaf636bf7d8c6a113b7d238f066c9..23a990a743b28649f876e546f15327f5e9fa1502 100644 (file)
--- a/src/Scenery/newcache.cxx
+++ b/src/Scenery/newcache.cxx
@@ -38,8 +38,8 @@
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/math/sg_random.h>
-#include <simgear/misc/fgstream.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sgstream.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <Main/globals.hxx>
 #include <Objects/matlib.hxx>
@@ -217,7 +217,7 @@ void FGNewCache::fill_in( const SGBucket& b ) {
     e->terra_range = new ssgRangeSelector;
     e->tile_bucket = b;
 
-    FGPath tile_path;
+    SGPath tile_path;
     if ( globals->get_fg_scenery() != "" ) {
        tile_path.set( globals->get_fg_scenery() );
     } else {
@@ -230,7 +230,7 @@ void FGNewCache::fill_in( const SGBucket& b ) {
     ssgVertexArray *light_pts = new ssgVertexArray( 100 );
 
     // Load the appropriate data file
-    FGPath tile_base = tile_path;
+    SGPath tile_base = tile_path;
     tile_base.append( b.gen_index_str() );
     ssgBranch *new_tile = fgObjLoad( tile_base.str(), e, light_pts, true );
 
@@ -241,13 +241,13 @@ void FGNewCache::fill_in( const SGBucket& b ) {
     // load custom objects
     SG_LOG( SG_TERRAIN, SG_DEBUG, "CUSTOM OBJECTS" );
 
-    FGPath index_path = tile_path;
+    SGPath index_path = tile_path;
     index_path.append( b.gen_index_str() );
     index_path.concat( ".ind" );
 
     SG_LOG( SG_TERRAIN, SG_DEBUG, "Looking in " << index_path.str() );
 
-    fg_gzifstream in( index_path.str() );
+    sg_gzifstream in( index_path.str() );
 
     if ( in.is_open() ) {
        string token, name;
@@ -263,7 +263,7 @@ void FGNewCache::fill_in( const SGBucket& b ) {
            SG_LOG( SG_TERRAIN, SG_DEBUG, "token = " << token
                    << " name = " << name );
 
-           FGPath custom_path = tile_path;
+           SGPath custom_path = tile_path;
            custom_path.append( name );
            ssgBranch *custom_obj = 
                fgObjLoad( custom_path.str(), e, NULL, false );

diff --git a/src/Sound/soundmgr.cxx b/src/Sound/soundmgr.cxx
index 56c1f81ea868b20f5fab0c56d8772c833a784bb6..a4c4878096a119ce086eb3939df8e76963f4577a 100644 (file)
--- a/src/Sound/soundmgr.cxx
+++ b/src/Sound/soundmgr.cxx
@@ -25,7 +25,7 @@
 
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <Main/globals.hxx>
 
@@ -34,7 +34,7 @@
 
 // constructor
 FGSimpleSound::FGSimpleSound( string file ) {
-    FGPath slfile( globals->get_fg_root() );
+    SGPath slfile( globals->get_fg_root() );
     slfile.append( file );
     sample = new slSample ( (char *)slfile.c_str() );
     pitch_envelope = new slEnvelope( 1, SL_SAMPLE_ONE_SHOT );

diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index 2b1c1099132a0b4424236907d57859ec742fd1ab..1759399987dbf56811295c29a46255a6b0b27668 100644 (file)
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -52,7 +52,7 @@ SG_USING_STD(string);
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/interpolater.hxx>
 #include <simgear/math/polar3d.hxx>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Main/globals.hxx>
@@ -75,12 +75,12 @@ void fgLIGHT::Init( void ) {
            "Initializing Lighting interpolation tables." );
 
     // build the path name to the ambient lookup table
-    FGPath path( globals->get_fg_root() );
-    FGPath ambient = path;
+    SGPath path( globals->get_fg_root() );
+    SGPath ambient = path;
     ambient.append( "Lighting/ambient" );
-    FGPath diffuse = path;
+    SGPath diffuse = path;
     diffuse.append( "Lighting/diffuse" );
-    FGPath sky = path;
+    SGPath sky = path;
     sky.append( "Lighting/sky" );
 
     // initialize ambient table

diff --git a/src/Time/tmp.cxx b/src/Time/tmp.cxx
index 5764f4510617b69594faa2904e9fea7252ff0a04..12584951449417807cea82ee6eb91a881805e78f 100644 (file)
--- a/src/Time/tmp.cxx
+++ b/src/Time/tmp.cxx
@@ -25,7 +25,7 @@
 #  include <config.h>
 #endif
 
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 #include <simgear/magvar/magvar.hxx>
 
 #include <FDM/flight.hxx>
@@ -39,7 +39,7 @@
 
 // periodic time updater wrapper
 void fgUpdateLocalTime() {
-    FGPath zone( globals->get_fg_root() );
+    SGPath zone( globals->get_fg_root() );
     zone.append( "Timezone" );
 
     globals->get_time_params()->updateLocal( cur_fdm_state->get_Longitude(),

diff --git a/src/WeatherCM/FGWeatherParse.cpp b/src/WeatherCM/FGWeatherParse.cpp
index dfad23e4dd02282e58a0e224737326770043a58d..7fb7bf2a97667bbd21a3a3a55a0c55385f36c1ba 100644 (file)
--- a/src/WeatherCM/FGWeatherParse.cpp
+++ b/src/WeatherCM/FGWeatherParse.cpp
@@ -77,7 +77,7 @@ void FGWeatherParse::input(const char *file)
 {
     unsigned int nr = 0;
 
-    fg_gzifstream in;
+    sg_gzifstream in;
 
     cerr << "Parsing \"" << file << "\" for weather datas:\n";
     

diff --git a/src/WeatherCM/FGWeatherParse.h b/src/WeatherCM/FGWeatherParse.h
index 5cbc0fd933ec407385a354369c2fd2260ec9cbd6..cdfdfc8eb646d602e8b8e6b4b1141b75c0e00fcf 100644 (file)
--- a/src/WeatherCM/FGWeatherParse.h
+++ b/src/WeatherCM/FGWeatherParse.h
@@ -64,7 +64,7 @@ HISTORY
 #include <simgear/compiler.h>
 #include <vector>
 
-#include <simgear/misc/fgstream.hxx>
+#include <simgear/misc/sgstream.hxx>
 
 #include "FGPhysicalProperties.h"