- simplify number/name handling

- consistent member naming
- coding style fixes in clock.*

diff --git a/src/Instrumentation/adf.hxx b/src/Instrumentation/adf.hxx
index 060899ee06ae42f4ac2c39443ba2f09ff27aa7e4..69831a6f22093777c7bcb98f9c58591cdf2fa225 100644 (file)
--- a/src/Instrumentation/adf.hxx
+++ b/src/Instrumentation/adf.hxx
@@ -51,7 +51,6 @@ class ADF : public SGSubsystem
 public:
 
     ADF ( SGPropertyNode *node );
-    ADF ();
     virtual ~ADF ();
 
     virtual void init ();

diff --git a/src/Instrumentation/clock.cxx b/src/Instrumentation/clock.cxx
index e5778d5385e20633ac4c266e9cb7b73cd059bb5e..5d581e6f42de05cbb51174692a1a55d5d82bc413 100644 (file)
--- a/src/Instrumentation/clock.cxx
+++ b/src/Instrumentation/clock.cxx
@@ -15,47 +15,19 @@
 #include <Main/util.hxx>
 
 
-Clock::Clock ( SGPropertyNode *node )
-    : _is_serviceable(true),
-      _gmt_time_sec(0),
-      _offset_sec(0),
-      _indicated_sec(0),
-      _indicated_min(0),
-      _indicated_hour(0),
-      _local_hour(0),
-      _standstill_offset(0),
-      name("clock"),
-      num(0)
+Clock::Clock(SGPropertyNode *node) :
+    _name(node->getStringValue("name", "clock")),
+    _num(node->getIntValue("number", 0)),
+    _is_serviceable(true),
+    _gmt_time_sec(0),
+    _offset_sec(0),
+    _indicated_sec(0),
+    _indicated_min(0),
+    _indicated_hour(0),
+    _local_hour(0),
+    _standstill_offset(0)
 {
     _indicated_string[0] = '\0';
-
-    int i;
-    for ( i = 0; i < node->nChildren(); ++i ) {
-        SGPropertyNode *child = node->getChild(i);
-        string cname = child->getName();
-        string cval = child->getStringValue();
-        if ( cname == "name" ) {
-            name = cval;
-        } else if ( cname == "number" ) {
-            num = child->getIntValue();
-        } else {
-            SG_LOG( SG_INSTR, SG_WARN, "Error in clock config logic" );
-            if ( name.length() ) {
-                SG_LOG( SG_INSTR, SG_WARN, "Section = " << name );
-            }
-        }
-    }
-}
-
-Clock::Clock ()
-    : _is_serviceable(true),
-      _gmt_time_sec(0),
-      _offset_sec(0),
-      _indicated_sec(0),
-      _standstill_offset(0)
-{
-    _indicated_string[0] = '\0';
-    _indicated_short_string[0] = '\0';
 }
 
 Clock::~Clock ()
@@ -66,9 +38,9 @@ void
 Clock::init ()
 {
     string branch;
-    branch = "/instrumentation/" + name;
+    branch = "/instrumentation/" + _name;
 
-    SGPropertyNode *node = fgGetNode(branch.c_str(), num, true );
+    SGPropertyNode *node = fgGetNode(branch.c_str(), _num, true );
     _serviceable_node = node->getChild("serviceable", 0, true);
     _offset_node = node->getChild("offset-sec", 0, true);
     _sec_node = node->getChild("indicated-sec", 0, true);
@@ -99,8 +71,10 @@ Clock::update (double delta_time_sec)
     // compute local time zone hour
     int tzoffset_hours = globals->get_time_params()->get_local_offset() / 3600;
     int lhour = hour + tzoffset_hours;
-    if ( lhour < 0 ) { lhour += 24; }
-    if ( lhour >= 24 ) { lhour -= 24; }
+    if (lhour < 0)
+        lhour += 24;
+    if (lhour >= 24)
+        lhour -= 24;
 
     long gmt = (hour * 60 + min) * 60 + sec;
     int offset = _offset_node->getLongValue();
@@ -152,8 +126,6 @@ Clock::update (double delta_time_sec)
     _hour_node->setLongValue(_indicated_hour);
     _local_hour = lhour;
     _lhour_node->setLongValue(_local_hour);
-
-    
 }
 
 

diff --git a/src/Instrumentation/clock.hxx b/src/Instrumentation/clock.hxx
index b9d0a7da29a757e6d642829b6d13c4038ac5c1c9..307fe469e4038b9304d43f109d541b56bc1edd7c 100644 (file)
--- a/src/Instrumentation/clock.hxx
+++ b/src/Instrumentation/clock.hxx
@@ -9,10 +9,6 @@
 #ifndef __INSTRUMENTS_CLOCK_HXX
 #define __INSTRUMENTS_CLOCK_HXX 1
 
-#ifndef __cplusplus
-# error This library requires C++
-#endif
-
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 
@@ -30,19 +26,17 @@
  * /instrumentation/clock/indicated-sec
  * /instrumentation/clock/indicated-string
  */
-class Clock : public SGSubsystem
-{
-
+class Clock : public SGSubsystem {
 public:
+    Clock(SGPropertyNode *node);
+    virtual ~Clock();
 
-    Clock ( SGPropertyNode *node );
-    Clock ();
-    virtual ~Clock ();
-
-    virtual void init ();
-    virtual void update (double dt);
+    virtual void init();
+    virtual void update(double dt);
 
 private:
+    string _name;
+    unsigned int _num;
 
     bool _is_serviceable;
     long _gmt_time_sec;
@@ -56,9 +50,6 @@ private:
     char _local_short_string[16];
     long _standstill_offset;
 
-    string name;
-    int num;
-
     SGPropertyNode_ptr _serviceable_node;
     SGPropertyNode_ptr _offset_node;
     SGPropertyNode_ptr _sec_node;
@@ -68,7 +59,6 @@ private:
     SGPropertyNode_ptr _string_node;
     SGPropertyNode_ptr _string_node1;
     SGPropertyNode_ptr _string_node2;
-
 };
 
 #endif // __INSTRUMENTS_CLOCK_HXX

diff --git a/src/Instrumentation/tacan.hxx b/src/Instrumentation/tacan.hxx
index 4a1826b7ffd47ae8f8f0ef92a74901cb7d947269..2aa0ef6a87806a24e850178231c9c07114b652d3 100755 (executable)
--- a/src/Instrumentation/tacan.hxx
+++ b/src/Instrumentation/tacan.hxx
@@ -42,7 +42,6 @@ class TACAN : public SGSubsystem, public SGPropertyChangeListener
 public:
 
     TACAN ( SGPropertyNode *node );
-    TACAN ();
     virtual ~TACAN ();
 
     virtual void init ();