Merge branch 'master' of newgeom:newgeom

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

diff --git a/src/Config/Config_WidgetAPI.cpp b/src/Config/Config_WidgetAPI.cpp
index 9a77d778ac0825da41131e6ffc65a2ef0ea3c88c..333f9219a37594c61f653bdd7b529c76dbc6d216 100644 (file)
--- a/src/Config/Config_WidgetAPI.cpp
+++ b/src/Config/Config_WidgetAPI.cpp
@@ -12,14 +12,12 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-
 Config_WidgetAPI::Config_WidgetAPI(std::string theRawXml)
 {
   myDoc = xmlParseDoc(BAD_CAST theRawXml.c_str());
   myCurrentNode = xmlDocGetRootElement(myDoc);
 }
 
-
 Config_WidgetAPI::~Config_WidgetAPI()
 {
   xmlFreeDoc(myDoc);
@@ -31,9 +29,9 @@ bool Config_WidgetAPI::toNextWidget()
   xmlNodePtr aNextNode = myCurrentNode;
   do {
     aNextNode = aNextNode->next;
-  } while(aNextNode && !isElementNode(aNextNode));
+  } while (aNextNode && !isElementNode(aNextNode));
 
-  if(!aNextNode) {
+  if (!aNextNode) {
     toParentWidget();
     return false;
   }
@@ -43,11 +41,11 @@ bool Config_WidgetAPI::toNextWidget()
 
 bool Config_WidgetAPI::toChildWidget()
 {
-  if(myCurrentNode && hasChild(myCurrentNode)) {
+  if (myCurrentNode && hasChild(myCurrentNode)) {
     myCurrentNode = myCurrentNode->children;
-    while(!isElementNode(myCurrentNode)) {
+    while (!isElementNode(myCurrentNode)) {
       myCurrentNode = myCurrentNode->next;
-    } 
+    }
     return true;
   }
   return false;
@@ -55,34 +53,34 @@ bool Config_WidgetAPI::toChildWidget()
 
 bool Config_WidgetAPI::toParentWidget()
 {
-  if(myCurrentNode) {
+  if (myCurrentNode) {
     myCurrentNode = myCurrentNode->parent;
   }
   return myCurrentNode != NULL;
 }
 
-std::string Config_WidgetAPI::widgetType()
+std::string Config_WidgetAPI::widgetType() const
 {
   std::string result = "";
-  if(myCurrentNode) {
+  if (myCurrentNode) {
     result = std::string((char *) myCurrentNode->name);
   }
   return result;
 }
 
-bool Config_WidgetAPI::isContainerWidget()
+bool Config_WidgetAPI::isContainerWidget() const
 {
   return isNode(myCurrentNode, WDG_GROUP, WDG_CHECK_GROUP,
-                               NULL);
+  NULL);
 }
 
-bool Config_WidgetAPI::isPagedWidget()
+bool Config_WidgetAPI::isPagedWidget() const
 {
   return isNode(myCurrentNode, WDG_TOOLBOX, WDG_SWITCH,
-                               NULL);
+  NULL);
 }
 
-std::string Config_WidgetAPI::getProperty(const char* thePropName)
+std::string Config_WidgetAPI::getProperty(const char* thePropName) const
 {
   std::string result = "";
   char* aPropChars = (char*) xmlGetProp(myCurrentNode, BAD_CAST thePropName);
@@ -92,22 +90,22 @@ std::string Config_WidgetAPI::getProperty(const char* thePropName)
   return result;
 }
 
-std::string Config_WidgetAPI::widgetId()
+std::string Config_WidgetAPI::widgetId() const
 {
-  return getProperty("id");
+  return getProperty(_ID);
 }
 
-std::string Config_WidgetAPI::widgetTooltip()
+std::string Config_WidgetAPI::widgetIcon() const
 {
-  return getProperty("tooltip");
+  return getProperty(ANY_WDG_ICON);
 }
 
-std::string Config_WidgetAPI::widgetIcon()
+std::string Config_WidgetAPI::widgetLabel() const
 {
-  return getProperty("icon");
+  return getProperty(ANY_WDG_LABEL);
 }
 
-std::string Config_WidgetAPI::widgetLabel()
+std::string Config_WidgetAPI::widgetTooltip() const
 {
-  return getProperty("label");
+  return getProperty(ANY_WDG_TOOLTIP);
 }