From ed6c18e8d8a1cf59b02152939de4b7a365ee4f9e Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Wed, 14 Mar 2018 13:42:31 +0900 Subject: [PATCH] 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 --- dali/devel-api/scripting/scripting.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 >(); } } } -- 2.7.4