X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fproperty-string-parser.cpp;h=ec0fc946fb8c3174a5c2e63f1ecdabe5cff78bc1;hp=c120e00c513c7476c8209f057dc956bfb0ed3482;hb=eb86a7e2a223a3876fa8be052872df527aad777f;hpb=dda9d7ca30d6f5c42759647df03a13e52c76228a diff --git a/dali-toolkit/internal/text/property-string-parser.cpp b/dali-toolkit/internal/text/property-string-parser.cpp index c120e00..ec0fc94 100644 --- a/dali-toolkit/internal/text/property-string-parser.cpp +++ b/dali-toolkit/internal/text/property-string-parser.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -28,16 +28,13 @@ namespace Dali { - namespace Toolkit { - namespace Text { - -void CreatePropertyMap( const TreeNode* const node, Property::Map& map ) +void CreatePropertyMap(const TreeNode* const node, Property::Map& map) { - switch( node->GetType() ) + switch(node->GetType()) { case TreeNode::IS_NULL: case TreeNode::OBJECT: @@ -47,7 +44,7 @@ void CreatePropertyMap( const TreeNode* const node, Property::Map& map ) } case TreeNode::STRING: { - map.Insert( node->GetName(), Property::Value( node->GetString() ) ); + map.Insert(node->GetName(), Property::Value(node->GetString())); break; } case TreeNode::INTEGER: @@ -58,44 +55,25 @@ void CreatePropertyMap( const TreeNode* const node, Property::Map& map ) } } - for( TreeNode::ConstIterator it = node->CBegin(), endIt = node->CEnd(); it != endIt; ++it ) + for(TreeNode::ConstIterator it = node->CBegin(), endIt = node->CEnd(); it != endIt; ++it) { const TreeNode::KeyNodePair& pair = *it; - CreatePropertyMap( &pair.second, map ); + CreatePropertyMap(&pair.second, map); } } -void ParsePropertyString( const std::string& property, Property::Map& map ) +void ParsePropertyString(const std::string& property, Property::Map& map) { Toolkit::JsonParser parser = Toolkit::JsonParser::New(); - if( parser.Parse( property ) ) + if(parser.Parse(property)) { const TreeNode* const node = parser.GetRoot(); - - CreatePropertyMap( node, map ); - } -} - -void StringOffsetToVector2( const std::string& offsetStr, - Vector2& offset ) -{ - offset = Vector2::ZERO; - - unsigned int wsIndex = 0u; - for( std::string::const_iterator it = offsetStr.begin(), - endIt = offsetStr.end(); - it != endIt; - ++it, ++wsIndex ) - { - if( *it == ' ' ) + if(node) { - break; + CreatePropertyMap(node, map); } } - - offset[0] = StringToFloat( offsetStr.c_str() ); - offset[1] = StringToFloat( offsetStr.c_str() + wsIndex ); } } //namespace Text