Change from Dave Perry:

[flightgear.git] / src / Instrumentation / dclgps.hxx

diff --git a/src/Instrumentation/dclgps.hxx b/src/Instrumentation/dclgps.hxx
index 00b7943b35a90b75492dd0931415d604d6564ad8..5ae64b35ce8ad99a56024ab9dafffdd3453c6b8a 100644 (file)
--- a/src/Instrumentation/dclgps.hxx
+++ b/src/Instrumentation/dclgps.hxx
@@ -19,7 +19,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$
 
@@ -32,8 +32,6 @@
 #include <vector>
 #include <map>
 
-#include <Cockpit/panel.hxx>
-
 #include <Navaids/navrecord.hxx>
 #include <Navaids/navlist.hxx>
 #include <Navaids/fixlist.hxx>
@@ -179,14 +177,14 @@ public:
        virtual void LooseFocus();
        
        // Allows pages that display info for a given ID to have it set/get if they implement these functions.
-       virtual void SetId(string s);
-       virtual string GetId();
+       virtual void SetId(const string& s);
+       virtual const string& GetId()=0;
        
        inline int GetSubPage() { return(_subPage); }
        
        inline int GetNSubPages() { return(_nSubPages); }
        
-       inline string GetName() { return(_name); }
+       inline const string& GetName() { return(_name); }
        
 protected:
        DCLGPS* _parent;
@@ -203,7 +201,7 @@ typedef vector<GPSPage*> gps_page_list_type;
 typedef gps_page_list_type::iterator gps_page_list_itr;
 
 // TODO - merge generic GPS functions instead and split out KLN specific stuff.
-class DCLGPS : public SGSubsystem, public FGPanelInstrument {
+class DCLGPS : public SGSubsystem {
        
        friend class GPSPage;
        
@@ -274,7 +272,7 @@ public:
        // Returns -1 if no active waypoint.
        int GetActiveWaypointIndex();
        // Ditto for an arbitrary waypoint id
-       int GetWaypointIndex(string id);
+       int GetWaypointIndex(const string& id);
        
        // Returns meters
        inline float GetDistToActiveWaypoint() { return _dist2Act; }
@@ -292,7 +290,7 @@ public:
        // returns -1 if groundspeed is less than 30kts.
        // If the waypoint is an unreached part of the active flight plan the time will be via each leg.
        // otherwise it will be a direct-to time.
-       double GetTimeToWaypoint(string id);
+       double GetTimeToWaypoint(const string& id);
        
        // Return true if waypoint alerting is occuring
        inline bool GetWaypointAlert() const { return(_waypointAlert); }
@@ -313,7 +311,7 @@ public:
        inline bool GetToFlag() const { return(_headingBugTo); }
        
        // Initiate Direct To operation to the supplied ID.
-       void DtoInitiate(string id);
+       void DtoInitiate(const string& id);
        // Cancel Direct To operation
        void DtoCancel();
        
@@ -377,14 +375,14 @@ protected:
        gps_waypoint_map _waypoints;
 private:
        // Worker function for the below.
-       const GPSWaypoint* ActualFindFirstById(string id, bool exact = false);
+       const GPSWaypoint* ActualFindFirstById(const string& id, bool exact = false);
 protected:
        // Find first of any type of waypoint by id.  (TODO - Possibly we should return multiple waypoints here).
-       const GPSWaypoint* FindFirstById(string id, bool &multi, bool exact = false); 
-       FGNavRecord* FindFirstVorById(string id, bool &multi, bool exact = false);
-       FGNavRecord* FindFirstNDBById(string id, bool &multi, bool exact = false);
-       const FGAirport* FindFirstAptById(string id, bool &multi, bool exact = false);
-       const FGFix* FindFirstIntById(string id, bool &multi, bool exact = false);
+       const GPSWaypoint* FindFirstById(const string& id, bool &multi, bool exact = false); 
+       FGNavRecord* FindFirstVorById(const string& id, bool &multi, bool exact = false);
+       FGNavRecord* FindFirstNDBById(const string& id, bool &multi, bool exact = false);
+       const FGAirport* FindFirstAptById(const string& id, bool &multi, bool exact = false);
+       const FGFix* FindFirstIntById(const string& id, bool &multi, bool exact = false);
        // Find the closest VOR to a position in RADIANS.
        FGNavRecord* FindClosestVor(double lat_rad, double lon_rad);