replace depreciated plib symbols with their new forms

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

diff --git a/src/Navaids/navlist.cxx b/src/Navaids/navlist.cxx
index 84c3b430c763b9f9bf7e0fd1d0d571ff4bcd79e9..4b058e7252a39270da97d73a3587debec4756b35 100644 (file)
--- a/src/Navaids/navlist.cxx
+++ b/src/Navaids/navlist.cxx
@@ -143,10 +143,6 @@ bool FGTACANList::add( FGTACANRecord *c ) {
     return true;
 }
 
-// Query the database for the specified frequency.  It is assumed that
-// there will be multiple stations with matching frequencies so a
-// position must be specified.  Lon and lat are in degrees, elev is in
-// meters.
 FGNavRecord *FGNavList::findByFreq( double freq, double lon, double lat, double elev )
 {
     nav_list_type stations = navaids[(int)(freq*100.0 + 0.5)];
@@ -300,8 +296,8 @@ FGNavRecord *FGNavList::findClosest( double lon_rad, double lat_rad,
     // cout << "Master index = " << master_index << endl;
     // cout << "beacon search length = " << beacons.size() << endl;
 
-    nav_list_iterator current = navs.begin();
-    nav_list_iterator last = navs.end();
+    nav_list_const_iterator current = navs.begin();
+    nav_list_const_iterator last = navs.end();
 
     Point3D aircraft = sgGeodToCart( Point3D(lon_rad,
                                              lat_rad,
@@ -338,7 +334,7 @@ FGNavRecord *FGNavList::findClosest( double lon_rad, double lat_rad,
 }
 
 // Given a TACAN Channel return the first matching frequency
-FGTACANRecord *FGTACANList::findByChannel( string channel )
+FGTACANRecord *FGTACANList::findByChannel( const string& channel )
 {
     tacan_list_type stations = ident_channels[channel];
     SG_LOG( SG_INSTR, SG_DEBUG, "findByChannel " << channel<< " size " << stations.size()  );