Issue #1659 New widget for supporting optional inputs : rename CheckGroupBox to Optio...

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

diff --git a/src/Config/Config_Common.cpp b/src/Config/Config_Common.cpp
index ac274ada8ef73524c07911d8ca5f976664e4dc64..6d89535e7edf6a6553264933b25ff86c0381e338 100644 (file)
--- a/src/Config/Config_Common.cpp
+++ b/src/Config/Config_Common.cpp
@@ -56,14 +56,14 @@ bool isAttributeNode(xmlNodePtr theNode)
     return false;\r
   // it's parent is "feature" or "source" or page ("case" or "box")\r
   if(!hasParent(theNode, NODE_FEATURE, NODE_SOURCE, \r
-                         WDG_GROUP, WDG_CHECK_GROUP,\r
+                         WDG_GROUP, WDG_OPTIONALBOX,\r
                          WDG_TOOLBOX_BOX, WDG_SWITCH_CASE, NULL))\r
     return false;\r
 \r
   //it should not be a "source" or a "validator" node\r
   bool isLogical = isNode(theNode, NODE_SOURCE, NODE_VALIDATOR, NODE_SELFILTER, NULL);\r
   bool isPagedContainer = isNode(theNode, WDG_TOOLBOX, WDG_TOOLBOX_BOX,\r
-                                          WDG_GROUP, WDG_CHECK_GROUP,\r
+                                          WDG_GROUP, WDG_OPTIONALBOX,\r
                                           WDG_SWITCH, WDG_SWITCH_CASE,  NULL);\r
   return !isLogical && !isPagedContainer;\r
 }\r
@@ -73,7 +73,7 @@ bool isWidgetNode(xmlNodePtr theNode)
   if(!isElementNode(theNode))\r
     return false;\r
   // it's parent is "feature" or "source" or a page ("box", "case")\r
-  if(!hasParent(theNode, NODE_FEATURE, NODE_SOURCE, WDG_GROUP, WDG_CHECK_GROUP,\r
+  if(!hasParent(theNode, NODE_FEATURE, NODE_SOURCE, WDG_GROUP, WDG_OPTIONALBOX,\r
                          WDG_TOOLBOX_BOX, WDG_SWITCH_CASE, NULL))\r
     return false;\r
 \r
@@ -87,7 +87,7 @@ bool isCaseNode(xmlNodePtr theNode)
   if(!isElementNode(theNode))\r
     return false;\r
 \r
-  return isNode(theNode, WDG_CHECK_GROUP, WDG_SWITCH_CASE, WDG_TOOLBOX_BOX, NULL);\r
+  return isNode(theNode, WDG_OPTIONALBOX, WDG_SWITCH_CASE, WDG_TOOLBOX_BOX, NULL);\r
 }\r
 \r
 bool hasChild(xmlNodePtr theNode)\r