Merge branch 'maint2' into next

[flightgear.git] / src / Navaids / navdb.hxx

diff --git a/src/Navaids/navdb.hxx b/src/Navaids/navdb.hxx
index b05dd72ac47eed8a3e2c38d139cf23d0b2a5a098..87e510825b2f228d616e9393edcc558ff0a49cf8 100644 (file)
--- a/src/Navaids/navdb.hxx
+++ b/src/Navaids/navdb.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -26,33 +26,15 @@
 
 
 #include <simgear/compiler.h>
-#include <simgear/misc/sg_path.hxx>
-
-// #include <map>
-// #include <vector>
-// #include STL_STRING
-
-#include "navlist.hxx"
-#include "fixlist.hxx"
-
-// SG_USING_STD(map);
-// SG_USING_STD(vector);
-// SG_USING_STD(string);
 
+class FGNavList;
+class FGTACANList;
 
 // load and initialize the navigational databases
-bool fgNavDBInit( FGAirportList *airports,
-                  FGNavList *navlist, FGNavList *loclist, FGNavList *gslist,
-                  FGNavList *dmelist, FGNavList *mkrbeacons,
+bool fgNavDBInit( FGNavList *navlist, FGNavList *loclist, FGNavList *gslist,
+                  FGNavList *dmelist,
                   FGNavList *tacanlist, FGNavList *carrierlist,
                   FGTACANList *channellist );
 
-// This routines traverses the localizer list and attempts to match
-// each entry with it's corresponding runway.  When it is successful,
-// it then "moves" the localizer and updates it's heading so it
-// *perfectly* aligns with the runway, but is still the same distance
-// from the runway threshold.
-void fgNavDBAlignLOCwithRunway( FGRunwayList *runways, FGNavList *loclist,
-                                double threshold );
 
 #endif // _FG_NAVDB_HXX