X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_Common.cpp;h=3f8bac413d0624c142994c453a7c5d697b010e26;hb=aba714fbb23139b15272ed816c9a30595165106c;hp=544e7a7ea4c41b925c8207ac0217aebb0ab6f5af;hpb=87b6a30a3afb8fb32e7e43ade8d9c947d9eb1684;p=modules%2Fshaper.git

diff --git a/src/Config/Config_Common.cpp b/src/Config/Config_Common.cpp
index 544e7a7ea..3f8bac413 100644
--- a/src/Config/Config_Common.cpp
+++ b/src/Config/Config_Common.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2021  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,9 @@
 //
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include "Config_Common.h"
@@ -68,7 +67,8 @@ bool isAttributeNode(xmlNodePtr theNode)
   // it's parent is "feature" or "source" or page ("case" or "box")
   if(!hasParent(theNode, NODE_FEATURE, NODE_SOURCE,
                          WDG_GROUP, WDG_OPTIONALBOX,
-                         WDG_TOOLBOX_BOX, WDG_SWITCH_CASE, NULL))
+                         WDG_TOOLBOX_BOX, WDG_RADIOBOX_ITEM,
+                         WDG_SWITCH_CASE, NULL))
     return false;
 
   //it should not be a "source" or a "validator" node
@@ -86,21 +86,24 @@ bool isWidgetNode(xmlNodePtr theNode)
     return false;
   // it's parent is "feature" or "source" or a page ("box", "case")
   if(!hasParent(theNode, NODE_FEATURE, NODE_SOURCE, WDG_GROUP, WDG_OPTIONALBOX,
-                         WDG_TOOLBOX_BOX, WDG_SWITCH_CASE, NULL))
+    WDG_TOOLBOX_BOX, WDG_RADIOBOX_ITEM, WDG_SWITCH_CASE, WDG_FILTER, NULL))
     return false;
 
   //it should not be a "source" or a "validator" node
   return !isNode(theNode, NODE_SOURCE, NODE_VALIDATOR, NULL);
 }
 
+// LCOV_EXCL_START
 // widget api?
 bool isCaseNode(xmlNodePtr theNode)
 {
   if(!isElementNode(theNode))
     return false;
 
-  return isNode(theNode, WDG_OPTIONALBOX, WDG_SWITCH_CASE, WDG_TOOLBOX_BOX, NULL);
+  return isNode(theNode, WDG_OPTIONALBOX, WDG_SWITCH_CASE, WDG_TOOLBOX_BOX,
+    WDG_RADIOBOX_ITEM, NULL);
 }
+// LCOV_EXCL_STOP
 
 bool hasChild(xmlNodePtr theNode)
 {
@@ -205,7 +208,7 @@ bool getParametersInfo(xmlNodePtr theNode, std::string& outPropertyId,
     std::stringstream aPropStringStream(aPropString);
     char COMMA_DELIM = ',';
     std::string aParameter;
-    while (std::getline(aPropStringStream, aParameter, ',')) {
+    while (std::getline(aPropStringStream, aParameter, COMMA_DELIM)) {
       outValidatorParameters.push_back(aParameter);
     }
   }
@@ -249,6 +252,7 @@ std::string getProperty(xmlNodePtr theNode, const char* thePropName)
   return result;
 }
 
+// LCOV_EXCL_START
 std::string getContent(xmlNodePtr theNode)
 {
   std::string result = "";
@@ -259,6 +263,7 @@ std::string getContent(xmlNodePtr theNode)
   xmlFree(aContent);
   return result;
 }
+// LCOV_EXCL_STOP
 
 std::string getNormalizedProperty(xmlNodePtr theNode, const char* thePropName)
 {
@@ -277,16 +282,10 @@ bool getBooleanAttribute(xmlNodePtr theNode, const char* theAttributeName, bool
   return result;
 }
 
-CONFIG_EXPORT std::string normalize(const char* theString)
-{
-  if (!theString)
-    return std::string();
-  return normalize(std::string(theString));
-}
-
 CONFIG_EXPORT std::string normalize(const std::string& theString)
 {
   std::string result = theString;
-  std::transform(result.begin(), result.end(), result.begin(), ::tolower);
+  std::transform(result.begin(), result.end(), result.begin(),
+                 [](char c) { return static_cast<char>(::tolower(c)); });
   return result;
 }