From a759908c7658562a573de86f68dd14a7cfab398c Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Fri, 21 Apr 2000 16:42:01 +0000
Subject: [PATCH] More name changing.
---
src/Navaids/nav.hxx | 18 +++++++++---------
src/Navaids/navlist.cxx | 12 ++++++------
src/Navaids/navlist.hxx | 18 +++++++++---------
src/Navaids/testnavs.cxx | 4 ++--
4 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/Navaids/nav.hxx b/src/Navaids/nav.hxx
index b6a110ab7..265bc5911 100644
--- a/src/Navaids/nav.hxx
+++ b/src/Navaids/nav.hxx
@@ -1,4 +1,4 @@
-// navaid.hxx -- navaid class
+// nav.hxx -- vor/dme/ndb class
//
// Written by Curtis Olson, started April 2000.
//
@@ -21,8 +21,8 @@
// $Id$
-#ifndef _FG_NAVAID_HXX
-#define _FG_NAVAID_HXX
+#ifndef _FG_NAV_HXX
+#define _FG_NAV_HXX
#include <simgear/compiler.h>
@@ -43,7 +43,7 @@ FG_USING_STD(istream);
#endif
-class FGNavaid {
+class FGNav {
char type;
double lon, lat;
@@ -55,8 +55,8 @@ class FGNavaid {
public:
- inline FGNavaid(void) {}
- inline ~FGNavaid(void) {}
+ inline FGNav(void) {}
+ inline ~FGNav(void) {}
inline char get_type() const { return type; }
inline double get_lon() const { return lon; }
@@ -76,12 +76,12 @@ public:
inline void set_dme( bool b ) { dme = b; }
inline void set_ident( char *i ) { strncpy( ident, i, 5 ); }
- friend istream& operator>> ( istream&, FGNavaid& );
+ friend istream& operator>> ( istream&, FGNav& );
};
inline istream&
-operator >> ( istream& in, FGNavaid& n )
+operator >> ( istream& in, FGNav& n )
{
double f;
char c;
@@ -99,4 +99,4 @@ operator >> ( istream& in, FGNavaid& n )
}
-#endif // _FG_NAVAID_HXX
+#endif // _FG_NAV_HXX
diff --git a/src/Navaids/navlist.cxx b/src/Navaids/navlist.cxx
index a23bef3a5..18f0cb2cc 100644
--- a/src/Navaids/navlist.cxx
+++ b/src/Navaids/navlist.cxx
@@ -29,18 +29,18 @@
// Constructor
-FGNavaids::FGNavaids( void ) {
+FGNavList::FGNavList( void ) {
}
// Destructor
-FGNavaids::~FGNavaids( void ) {
+FGNavList::~FGNavList( void ) {
}
// load the navaids and build the map
-bool FGNavaids::init( FGPath path ) {
- FGNavaid n;
+bool FGNavList::init( FGPath path ) {
+ FGNav n;
navaids.erase( navaids.begin(), navaids.end() );
@@ -92,8 +92,8 @@ bool FGNavaids::init( FGPath path ) {
// query the database for the specified frequency, lon and lat are in
// degrees, elev is in meters
-bool FGNavaids::query( double lon, double lat, double elev, double freq,
- FGNavaid *n, double *heading, double *dist )
+bool FGNavList::query( double lon, double lat, double elev, double freq,
+ FGNav *n, double *heading, double *dist )
{
nav_list_type stations = navaids[(int)(freq*100.0)];
diff --git a/src/Navaids/navlist.hxx b/src/Navaids/navlist.hxx
index 85312ef8e..1ae80e5b0 100644
--- a/src/Navaids/navlist.hxx
+++ b/src/Navaids/navlist.hxx
@@ -1,4 +1,4 @@
-// navaids.hxx -- navaids management class
+// navlist.hxx -- navaids management class
//
// Written by Curtis Olson, started April 2000.
//
@@ -21,8 +21,8 @@
// $Id$
-#ifndef _FG_NAVAIDS_HXX
-#define _FG_NAVAIDS_HXX
+#ifndef _FG_NAVLIST_HXX
+#define _FG_NAVLIST_HXX
#include <simgear/compiler.h>
@@ -37,10 +37,10 @@ FG_USING_STD(map);
FG_USING_STD(vector);
-class FGNavaids {
+class FGNavList {
// convenience types
- typedef vector < FGNavaid > nav_list_type;
+ typedef vector < FGNav > nav_list_type;
typedef nav_list_type::iterator nav_list_iterator;
typedef nav_list_type::const_iterator nav_list_const_iterator;
@@ -52,8 +52,8 @@ class FGNavaids {
public:
- FGNavaids();
- ~FGNavaids();
+ FGNavList();
+ ~FGNavList();
// load the navaids and build the map
bool init( FGPath path );
@@ -61,8 +61,8 @@ public:
// query the database for the specified frequency, lon and lat are
// in degrees, elev is in meters
bool query( double lon, double lat, double elev, double freq,
- FGNavaid *n, double *heading, double *dist);
+ FGNav *n, double *heading, double *dist);
};
-#endif // _FG_NAVAIDS_HXX
+#endif // _FG_NAVLIST_HXX
diff --git a/src/Navaids/testnavs.cxx b/src/Navaids/testnavs.cxx
index 59a5c678c..81990f55c 100644
--- a/src/Navaids/testnavs.cxx
+++ b/src/Navaids/testnavs.cxx
@@ -3,13 +3,13 @@
#include "navlist.hxx"
int main() {
- FGNavaids navs;
+ FGNavList navs;
FGPath p( "/export/data2/curt/FlightGear/Navaids/default.nav" );
navs.init( p );
- FGNavaid n;
+ FGNav n;
double heading, dist;
if ( navs.query( -93.2, 45.14, 3000, 117.30,
&n, &heading, &dist) ) {