Revert "[3.0] Fix Svace warning issue"

This reverts commit 91fc346901bee6eed25e38c17a85da015285a4e6.

Change-Id: Ic45bdf9242416e27e34178d5b26558c5feac0250

diff --git a/dali-toolkit/internal/builder/builder-impl.cpp b/dali-toolkit/internal/builder/builder-impl.cpp
index 1d648c3..d9672bb 100644 (file)
--- a/dali-toolkit/internal/builder/builder-impl.cpp
+++ b/dali-toolkit/internal/builder/builder-impl.cpp
@@ -1014,13 +1014,10 @@ bool Builder::ConvertChildValue( const TreeNode& mappingRoot, KeyStack& keyStack
     case Property::MAP:
     {
       Property::Map* map = child.GetMap();
-      if( map )
+      for( Property::Map::SizeType i=0; i < map->Count(); ++i )
       {
-        for( Property::Map::SizeType i=0; i < map->Count(); ++i )
-        {
-          Property::Value& child = map->GetValue(i);
-          ConvertChildValue(mappingRoot, keyStack, child);
-        }
+        Property::Value& child = map->GetValue(i);
+        ConvertChildValue(mappingRoot, keyStack, child);
       }
       break;
     }
@@ -1028,13 +1025,10 @@ bool Builder::ConvertChildValue( const TreeNode& mappingRoot, KeyStack& keyStack
     case Property::ARRAY:
     {
       Property::Array* array = child.GetArray();
-      if( array )
+      for( Property::Array::SizeType i=0; i < array->Count(); ++i )
       {
-        for( Property::Array::SizeType i=0; i < array->Count(); ++i )
-        {
-          Property::Value& child = array->GetElementAt(i);
-          ConvertChildValue(mappingRoot, keyStack, child);
-        }
+        Property::Value& child = array->GetElementAt(i);
+        ConvertChildValue(mappingRoot, keyStack, child);
       }
       break;
     }

diff --git a/dali-toolkit/internal/text/property-string-parser.cpp b/dali-toolkit/internal/text/property-string-parser.cpp
index 42b1050..c120e00 100644 (file)
--- a/dali-toolkit/internal/text/property-string-parser.cpp
+++ b/dali-toolkit/internal/text/property-string-parser.cpp
@@ -72,10 +72,8 @@ void ParsePropertyString( const std::string& property, Property::Map& map )
   if( parser.Parse( property ) )
   {
     const TreeNode* const node = parser.GetRoot();
-    if( node )
-    {
-      CreatePropertyMap( node, map );
-    }
+
+    CreatePropertyMap( node, map );
   }
 }
 

diff --git a/dali-toolkit/internal/text/text-effects-style.cpp b/dali-toolkit/internal/text/text-effects-style.cpp
index 31580a2..7172f23 100644 (file)
--- a/dali-toolkit/internal/text/text-effects-style.cpp
+++ b/dali-toolkit/internal/text/text-effects-style.cpp
@@ -113,7 +113,6 @@ bool SetUnderlineProperties( ControllerPtr controller, const Property::Value& va
             controller->SetUnderlineHeight( thickness );
             update = true;
           }
-          break;
         }
         case EffectStyle::INPUT:
         {
@@ -227,7 +226,6 @@ bool SetShadowProperties( ControllerPtr controller, const Property::Value& value
             controller->SetShadowOffset( offset );
             update = true;
           }
-          break;
         }
         case EffectStyle::INPUT:
         {