X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Fwxradar.hxx;h=7aff7771718b2be81c13b5b560f3de7d2b8a3223;hb=e59fabaf8276a0f49266e47ff2f59a93b0c7700c;hp=2b696430a7f8baf65d5f59ec8d8df3c5f3585dd1;hpb=e174561c67e0f707d4c69679c7236278a2f92f7f;p=flightgear.git diff --git a/src/Instrumentation/wxradar.hxx b/src/Instrumentation/wxradar.hxx index 2b696430a..7aff77717 100644 --- a/src/Instrumentation/wxradar.hxx +++ b/src/Instrumentation/wxradar.hxx @@ -34,9 +34,6 @@ #include #include -using std::vector; -using std::string; - class FGODGauge; class wxRadarBg : public SGSubsystem, public SGPropertyChangeListener { @@ -51,15 +48,15 @@ public: virtual void valueChanged(SGPropertyNode *); protected: - string _name; + std::string _name; int _num; double _time; double _interval; double _elapsed_time; double _persistance; - bool _sim_init_done; SGPropertyNode_ptr _serviceable_node; + SGPropertyNode_ptr _sceneryLoaded; SGPropertyNode_ptr _Instrument; SGPropertyNode_ptr _radar_mode_control_node; @@ -78,7 +75,7 @@ protected: double elapsed_time; }ground_echo; - typedef vector ground_echo_vector_type; + typedef std::vector ground_echo_vector_type; typedef ground_echo_vector_type::iterator ground_echo_vector_iterator; ground_echo_vector_type ground_echoes; @@ -90,7 +87,7 @@ protected: SGPropertyNode *getInstrumentNode(const char *name, DefaultType value); private: - string _texture_path; + std::string _texture_path; typedef enum { ARC, MAP, PLAN, ROSE, BSCAN} DisplayMode; DisplayMode _display_mode;