Merge branch 'Dev_0.6.1' of newgeom:newgeom into Dev_0.6.1

[modules/shaper.git] / src / Config / Config_WidgetAPI.cpp

diff --git a/src/Config/Config_WidgetAPI.cpp b/src/Config/Config_WidgetAPI.cpp
index 7d548ea245b838bda4b6a598be0a111a8252aa43..bcf543bd17e21d93e81cfa832545a3672d594d8c 100644 (file)
--- a/src/Config/Config_WidgetAPI.cpp
+++ b/src/Config/Config_WidgetAPI.cpp
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 /*
  * Config_WidgetAPI.cpp
  *
@@ -13,7 +15,6 @@
 #include <libxml/tree.h>
 
 #include <string>
-#include <algorithm>
 
 Config_WidgetAPI::Config_WidgetAPI(std::string theRawXml)
 {
@@ -46,10 +47,10 @@ bool Config_WidgetAPI::toChildWidget()
 {
   if (myCurrentNode && hasChild(myCurrentNode)) {
     myCurrentNode = myCurrentNode->children;
-    while (!isElementNode(myCurrentNode)) {
+    while (myCurrentNode && !isElementNode(myCurrentNode)) {
       myCurrentNode = myCurrentNode->next;
     }
-    return true;
+    return myCurrentNode != NULL;
   }
   return false;
 }
@@ -85,25 +86,12 @@ bool Config_WidgetAPI::isPagedWidget() const
 
 std::string Config_WidgetAPI::getProperty(const char* thePropName) const
 {
-  std::string result = "";
-  char* aPropChars = (char*) xmlGetProp(myCurrentNode, BAD_CAST thePropName);
-  if (!aPropChars || aPropChars[0] == 0)
-    return result;
-  result = std::string(aPropChars);
-  return result;
+  return ::getProperty(myCurrentNode, thePropName);
 }
 
 bool Config_WidgetAPI::getBooleanAttribute(const char* theAttributeName, bool theDefault) const
 {
-  std::string prop = getProperty(theAttributeName);
-  std::transform(prop.begin(), prop.end(), prop.begin(), ::tolower);
-  bool result = theDefault;
-  if (prop == "true" || prop == "1") {
-    result = true;
-  } else if (prop == "false" || prop == "0") {
-    result = false;
-  }
-  return result;
+  return ::getBooleanAttribute(myCurrentNode, theAttributeName, theDefault);
 }
 
 std::string Config_WidgetAPI::widgetId() const
@@ -113,15 +101,15 @@ std::string Config_WidgetAPI::widgetId() const
 
 std::string Config_WidgetAPI::widgetIcon() const
 {
-  return getProperty(ANY_WDG_ICON);
+  return getProperty(ATTR_ICON);
 }
 
 std::string Config_WidgetAPI::widgetLabel() const
 {
-  return getProperty(ANY_WDG_LABEL);
+  return getProperty(ATTR_LABEL);
 }
 
 std::string Config_WidgetAPI::widgetTooltip() const
 {
-  return getProperty(ANY_WDG_TOOLTIP);
+  return getProperty(ATTR_TOOLTIP);
 }