- adjusted for no-value constructor for FGPanel

[flightgear.git] / src / Navaids / fixlist.cxx

diff --git a/src/Navaids/fixlist.cxx b/src/Navaids/fixlist.cxx
index b03d9924137b8f3900972e231d4a7644db397bc0..55a083166f9d3737b72771c443ba007ea4624948 100644 (file)
--- a/src/Navaids/fixlist.cxx
+++ b/src/Navaids/fixlist.cxx
@@ -21,9 +21,13 @@
 // $Id$
 
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/misc/sgstream.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 
 #include "fixlist.hxx"
 
@@ -42,14 +46,14 @@ 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() ) {
-        FG_LOG( FG_GENERAL, FG_ALERT, "Cannot open file: " << path.str() );
+        SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << path.str() );
         exit(-1);
     }
 
@@ -61,10 +65,10 @@ bool FGFixList::init( FGPath path ) {
 #ifdef __MWERKS__
 
     char c = 0;
-    while ( in.get(c) && c != '\0' && fix.get_ident() != "[End]" ) {
+    while ( in.get(c) && c != '\0' && fix.get_ident() != (string)"[End]" ) {
         in.putback(c);
         in >> fix;
-       if ( fix.get_ident() != "[End]" ) {
+       if ( fix.get_ident() != (string)"[End]" ) {
            fixlist[fix.get_ident()] = fix;
        }
         in >> skipcomment;
@@ -72,7 +76,7 @@ bool FGFixList::init( FGPath path ) {
 
 #else
 
-    while ( ! in.eof() && fix.get_ident() != "[End]" ) {
+    while ( ! in.eof() && fix.get_ident() != (string)"[End]" ) {
         in >> fix;
        /* cout << "id = " << n.get_ident() << endl;
        cout << " type = " << n.get_type() << endl;
@@ -81,7 +85,7 @@ bool FGFixList::init( FGPath path ) {
        cout << " elev = " << n.get_elev() << endl;
        cout << " freq = " << n.get_freq() << endl;
        cout << " range = " << n.get_range() << endl; */
-       if ( fix.get_ident() != "[End]" ) {
+       if ( fix.get_ident() != (string)"[End]" ) {
            fixlist[fix.get_ident()] = fix;
        }
         in >> skipcomment;