X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Ftext%2Ftext-visual.h;h=136a23f23e894bfaf24a2df8ee6197eafc78cdcc;hp=16da39abe010be017780b1b034012f741598cdaa;hb=091d04794a201f1171294e54ab0cb8e69ac2c807;hpb=1af4cb78028c7aae2f0df9efd0c52d6cd9bbabaa diff --git a/dali-toolkit/internal/visuals/text/text-visual.h b/dali-toolkit/internal/visuals/text/text-visual.h index 16da39a..136a23f 100755 --- a/dali-toolkit/internal/visuals/text/text-visual.h +++ b/dali-toolkit/internal/visuals/text/text-visual.h @@ -81,9 +81,10 @@ public: /** * @brief Converts all strings keys in property map to index keys. Property Map can then be merged correctly. - * @param[in,out] propertyMap containing string keys or a mix of strings and indexes. Will be changed to index keys. + * @param[in] propertyMap containing string keys or a mix of strings and indexes. + * @return Property::Map containing index keys. */ - static void ConvertStringKeysToIndexKeys( Property::Map& propertyMap ); + static Property::Map ConvertStringKeysToIndexKeys( const Property::Map& propertyMap ); /** * @brief Retrieve the text's controller. @@ -167,14 +168,14 @@ protected: void DoSetProperties( const Property::Map& propertyMap ) override; /** - * @copydoc Visual::Base::DoSetOnStage() + * @copydoc Visual::Base::DoSetOnScene() */ - void DoSetOnStage( Actor& actor ) override; + void DoSetOnScene( Actor& actor ) override; /** - * @copydoc Visual::Base::DoSetOffStage() + * @copydoc Visual::Base::DoSetOffScene() */ - void DoSetOffStage( Actor& actor ) override; + void DoSetOffScene( Actor& actor ) override; /** * @copydoc Visual::Base::OnSetTransform