don't initialize iterator twice

[flightgear.git] / src / GUI / dialog.cxx

diff --git a/src/GUI/dialog.cxx b/src/GUI/dialog.cxx
index 55ec36f68f4e919d11ef652510bfb31b35829e15..929f4f8a52d758703f1e5e65ef41ee0ec05c0e1d 100644 (file)
--- a/src/GUI/dialog.cxx
+++ b/src/GUI/dialog.cxx
@@ -4,20 +4,17 @@
 #  include "config.h"
 #endif
 
-#include <stdlib.h>            // atof()
-
 #include <Input/input.hxx>
 #include <Scripting/NasalSys.hxx>
 
 #include "dialog.hxx"
 #include "new_gui.hxx"
-
 #include "AirportList.hxx"
 #include "property_list.hxx"
 #include "layout.hxx"
 
 
-enum format_type { INVALID, INT, LONG, FLOAT, DOUBLE, STRING };
+enum format_type { f_INVALID, f_INT, f_LONG, f_FLOAT, f_DOUBLE, f_STRING };
 static const int FORMAT_BUFSIZE = 255;
 
 /**
@@ -39,8 +36,8 @@ validate_format(const char *f)
         }
     }
     if (*f++ != '%')
-        return INVALID;
-    if (*f == ' ' || *f == '+' || *f == '-' || *f == '#')
+        return f_INVALID;
+    while (*f == ' ' || *f == '+' || *f == '-' || *f == '#' || *f == '0')
         f++;
     while (*f && isdigit(*f))
         f++;
@@ -54,22 +51,22 @@ validate_format(const char *f)
         l = true, f++;
 
     if (*f == 'd') {
-        type = l ? LONG : INT;
+        type = l ? f_LONG : f_INT;
     } else if (*f == 'f')
-        type = l ? DOUBLE : FLOAT;
+        type = l ? f_DOUBLE : f_FLOAT;
     else if (*f == 's') {
         if (l)
-            return INVALID;
-        type = STRING;
+            return f_INVALID;
+        type = f_STRING;
     } else
-        return INVALID;
+        return f_INVALID;
 
     for (++f; *f; f++) {
         if (*f == '%') {
             if (f[1] == '%')
                 f++;
             else
-                return INVALID;
+                return f_INVALID;
         }
     }
     return type;
@@ -102,7 +99,7 @@ GUIInfo::GUIInfo (FGDialog * d)
       key(-1),
       text(0),
       fmt_string(0),
-      fmt_type(INVALID)
+      fmt_type(f_INVALID)
 {
 }
 
@@ -118,13 +115,13 @@ GUIInfo::~GUIInfo ()
 
 char *GUIInfo::format(SGPropertyNode *n)
 {
-    if (fmt_type == INT)
+    if (fmt_type == f_INT)
         snprintf(text, FORMAT_BUFSIZE, fmt_string, n->getIntValue());
-    else if (fmt_type == LONG)
+    else if (fmt_type == f_LONG)
         snprintf(text, FORMAT_BUFSIZE, fmt_string, n->getLongValue());
-    else if (fmt_type == FLOAT)
+    else if (fmt_type == f_FLOAT)
         snprintf(text, FORMAT_BUFSIZE, fmt_string, n->getFloatValue());
-    else if (fmt_type == DOUBLE)
+    else if (fmt_type == f_DOUBLE)
         snprintf(text, FORMAT_BUFSIZE, fmt_string, n->getDoubleValue());
     else
         snprintf(text, FORMAT_BUFSIZE, fmt_string, n->getStringValue());
@@ -164,7 +161,7 @@ int fgPopup::checkKey(int key, int updown)
 puObject *fgPopup::getKeyObject(puObject *object, int key)
 {
     puObject *ret;
-    if(object->getType() & PUCLASS_GROUP)
+    if (object->getType() & PUCLASS_GROUP)
         for (puObject *obj = ((puGroup *)object)->getFirstChild();
                 obj; obj = obj->getNextObject())
             if ((ret = getKeyObject(obj, key)))
@@ -180,7 +177,7 @@ puObject *fgPopup::getKeyObject(puObject *object, int key)
 puObject *fgPopup::getActiveInputField(puObject *object)
 {
     puObject *ret;
-    if(object->getType() & PUCLASS_GROUP)
+    if (object->getType() & PUCLASS_GROUP)
         for (puObject *obj = ((puGroup *)object)->getFirstChild();
                 obj; obj = obj->getNextObject())
             if ((ret = getActiveInputField(obj)))
@@ -199,7 +196,7 @@ int fgPopup::checkHit(int button, int updown, int x, int y)
 {
     int result = puPopup::checkHit(button, updown, x, y);
 
-    if ( !_draggable)
+    if (!_draggable)
        return result;
 
     // This is annoying.  We would really want a true result from the
@@ -208,12 +205,12 @@ int fgPopup::checkHit(int button, int updown, int x, int y)
     // intersection test (again) to make sure we don't start a drag
     // when inside controls.
 
-    if(updown == PU_DOWN && !_dragging) {
-        if(!result)
+    if (updown == PU_DOWN && !_dragging) {
+        if (!result)
             return 0;
 
         int hit = getHitObjects(this, x, y);
-        if(hit & (PUCLASS_BUTTON|PUCLASS_ONESHOT|PUCLASS_INPUT))
+        if (hit & (PUCLASS_BUTTON|PUCLASS_ONESHOT|PUCLASS_INPUT))
             return result;
 
         int px, py;
@@ -221,7 +218,7 @@ int fgPopup::checkHit(int button, int updown, int x, int y)
         _dragging = true;
         _dX = px - x;
         _dY = py - y;
-    } else if(updown == PU_DRAG && _dragging) {
+    } else if (updown == PU_DRAG && _dragging) {
         setPosition(x + _dX, y + _dY);
     } else {
         _dragging = false;
@@ -235,7 +232,7 @@ int fgPopup::getHitObjects(puObject *object, int x, int y)
         return 0;
 
     int type = 0;
-    if(object->getType() & PUCLASS_GROUP)
+    if (object->getType() & PUCLASS_GROUP)
         for (puObject *obj = ((puGroup *)object)->getFirstChild();
                 obj; obj = obj->getNextObject())
             type |= getHitObjects(obj, x, y);
@@ -243,7 +240,7 @@ int fgPopup::getHitObjects(puObject *object, int x, int y)
     int cx, cy, cw, ch;
     object->getAbsolutePosition(&cx, &cy);
     object->getSize(&cw, &ch);
-    if(x >= cx && x < cx + cw && y >= cy && y < cy + ch)
+    if (x >= cx && x < cx + cw && y >= cy && y < cy + ch)
         type |= object->getType();
     return type;
 }
@@ -288,11 +285,10 @@ copy_to_pui (SGPropertyNode * node, puObject * object)
     // from properties.
     if (object->getType() & PUCLASS_TEXT) {
         GUIInfo *info = (GUIInfo *)object->getUserData();
-        if (info && info->fmt_string) {
+        if (info && info->fmt_string)
             object->setLabel(info->format(node));
-        } else {
+        else
             object->setLabel(node->getStringValue());
-        }
         return;
     }
 
@@ -738,7 +734,7 @@ FGDialog::setupObject (puObject * object, SGPropertyNode * props)
 
         PropertyObject* po = new PropertyObject(name, object, node);
         _propertyObjects.push_back(po);
-        if(props->getBoolValue("live"))
+        if (props->getBoolValue("live"))
             _liveObjects.push_back(po);
     }
 
@@ -752,7 +748,7 @@ FGDialog::setupObject (puObject * object, SGPropertyNode * props)
 
         for (unsigned int i = 0; i < bindings.size(); i++) {
             unsigned int j = 0;
-            SGPropertyNode *binding;
+            SGPropertyNode_ptr binding;
             while (dest->getChild("binding", j))
                 j++;
 
@@ -773,10 +769,13 @@ FGDialog::setupObject (puObject * object, SGPropertyNode * props)
             const char *format = props->getStringValue("format", 0);
             if (format) {
                 info->fmt_type = validate_format(props->getStringValue("format", 0));
-                if (info->fmt_type != INVALID) {
+                if (info->fmt_type != f_INVALID) {
                     info->text = new char[FORMAT_BUFSIZE + 1];
                     info->fmt_string = new char[strlen(format) + 1];
                     strcpy(info->fmt_string, format);
+                } else {
+                    SG_LOG(SG_GENERAL, SG_ALERT, "DIALOG: invalid <format> '"
+                            << format << '\'');
                 }
             }
         }