X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Fbuilder-impl.cpp;h=73facc7abe90d43316dab7af147ee961ee683449;hp=e5da81e403a5bd39dafac305dbee5a33180acb86;hb=ed980a3b418d7a235d4774b786d84974421650fd;hpb=e37f48bb34e81585a6ed436bd7a2f9dce02c19f5

diff --git a/dali-toolkit/internal/builder/builder-impl.cpp b/dali-toolkit/internal/builder/builder-impl.cpp
index e5da81e..73facc7 100644
--- a/dali-toolkit/internal/builder/builder-impl.cpp
+++ b/dali-toolkit/internal/builder/builder-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -820,13 +820,13 @@ void Builder::LoadConfiguration( const TreeNode& root, Property::Map& intoMap )
                   // try to find other "{","}" pair after current left position.
                   pos = leftPos+1;
 
-                  for( unsigned int i = 0; i < mReplacementMap.Count() ; i++ )
+                  for( uint32_t i = 0; i < mReplacementMap.Count() ; i++ )
                   {
-                    std::string constant = mReplacementMap.GetKey(i);
+                    Property::Key constant = mReplacementMap.GetKeyAt(i);
 
                     // Compare string which is between "{" and "}" with constant string
                     // If they are same, change string in stringConfigValue to mapped constant value.
-                    if ( stringConfigValue.compare( leftPos+1, rightPos-leftPos-1,constant) == 0 )
+                    if ( 0 == stringConfigValue.compare( leftPos+1, rightPos-leftPos-1, constant.stringKey ) )
                     {
                       std::string replaceString;
                       mReplacementMap.GetValue(i).Get( replaceString );