httpd: better handling of first-time notifications

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

diff --git a/src/Instrumentation/dclgps.hxx b/src/Instrumentation/dclgps.hxx
index 9037e97f15d56d1237578a20899852ee61d65077..a49fafda864c0ffc2a9936c61272ac8164fc7789 100644 (file)
--- a/src/Instrumentation/dclgps.hxx
+++ b/src/Instrumentation/dclgps.hxx
@@ -26,7 +26,8 @@
 #ifndef _DCLGPS_HXX
 #define _DCLGPS_HXX
 
-#include "render_area_2d.hxx"
+#include <Cockpit/render_area_2d.hxx>
+
 #include <string>
 #include <list>
 #include <vector>
@@ -96,7 +97,7 @@ typedef gps_waypoint_map::const_iterator gps_waypoint_map_const_iterator;
 class GPSFlightPlan {
 public:
   std::vector<GPSWaypoint*> waypoints;
-       inline bool IsEmpty() { return(waypoints.size() == 0); }
+       inline bool IsEmpty() { return waypoints.empty(); }
 };
 
 // TODO - probably de-public the internals of the next 2 classes and add some methods!
@@ -435,9 +436,6 @@ protected:
        // Configuration that affects flightplan operation
        bool _turnAnticipationEnabled;
 
-       // Magvar stuff.  Might get some of this stuff (such as time) from FG in future.
-       SGTime* _time;
-
        std::list<std::string> _messageStack;
 
        virtual void CreateFlightPlan(GPSFlightPlan* fp, std::vector<std::string> ids, std::vector<GPSWpType> wps);