From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Wed, 14 Mar 2018 04:42:31 +0000 (+0900)
Subject: Fix SVACE issue
X-Git-Tag: dali_1.3.16~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F54%2F172454%2F2;p=platform%2Fcore%2Fuifw%2Fdali-core.git

Fix SVACE issue

- Changed KeyValuePair variable name because name 'pair' is already defined
  at 466 line. (In the same scope)

Change-Id: Id20a0b7793f6f87e985b34234c06a3c9b764f63c
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
---

diff --git a/dali/devel-api/scripting/scripting.cpp b/dali/devel-api/scripting/scripting.cpp
index 4a91adf..30bc996 100644
--- a/dali/devel-api/scripting/scripting.cpp
+++ b/dali/devel-api/scripting/scripting.cpp
@@ -546,20 +546,20 @@ void NewAnimation( const Property::Map& map, Dali::AnimationData& outputAnimatio
       Property::Map timeMap = value.Get< Property::Map >();
       for( unsigned int i = 0; i < timeMap.Count(); ++i )
       {
-        const KeyValuePair pair( timeMap.GetKeyValue( i ) );
-        if( pair.first.type == Property::Key::INDEX )
+        const KeyValuePair timePair( timeMap.GetKeyValue( i ) );
+        if( timePair.first.type == Property::Key::INDEX )
         {
           continue;
         }
-        const std::string& key( pair.first.stringKey );
+        const std::string& key( timePair.first.stringKey );
 
         if( key == "delay" )
         {
-          element->timePeriodDelay = pair.second.Get< float >();
+          element->timePeriodDelay = timePair.second.Get< float >();
         }
         else if( key == "duration" )
         {
-          element->timePeriodDuration = pair.second.Get< float >();
+          element->timePeriodDuration = timePair.second.Get< float >();
         }
       }
     }