Revert "Revert "[SRUK] (StyleManager) Create a style manager""

[platform/core/uifw/dali-toolkit.git] / base / dali-toolkit / public-api / builder / builder.h

diff --git a/optional/dali-toolkit/public-api/builder/builder.h b/base/dali-toolkit/public-api/builder/builder.h
similarity index 95%
rename from optional/dali-toolkit/public-api/builder/builder.h
rename to base/dali-toolkit/public-api/builder/builder.h
index 2d67093..723b675 100644 (file)
--- a/optional/dali-toolkit/public-api/builder/builder.h
+++ b/base/dali-toolkit/public-api/builder/builder.h
@@ -140,7 +140,9 @@ typedef std::map<std::string, Property::Value> PropertyValueMap;
    * @brief Adds or modifies a user defined constant to all future style template or animation expansions
    *
    * e.g.
-   *  builder.AddConstant( "IMAGE_DIRECTORY", "/usr/share/images" );
+   * @code
+   * builder.AddConstant( "IMAGE_DIRECTORY", "/usr/share/images" );
+   * @endcode
    *
    * @pre The Builder has been initialized.
    * @param key The constant name to add or update
@@ -152,9 +154,11 @@ typedef std::map<std::string, Property::Value> PropertyValueMap;
    * @brief Gets all currently defined constants.
    *
    * e.g.
-   *  PropertyValueMap map = builder.GetConstants(); // get copy of current constants
-   *  map["IMAGE_DIRECTORY"] = "/usr/share/images";  // make modification
-   *  builder.AddConstants( map );                   // write back changes
+   * @code
+   * PropertyValueMap map = builder.GetConstants(); // get copy of current constants
+   * map["IMAGE_DIRECTORY"] = "/usr/share/images";  // make modification
+   * builder.AddConstants( map );                   // write back changes
+   * @endcode
    *
    * @pre The Builder has been initialized.
    * @return A reference to the currently defined constants.
@@ -165,9 +169,11 @@ typedef std::map<std::string, Property::Value> PropertyValueMap;
    * @brief Gets a currently defined constant, or returns Property::INVALID
    *
    * e.g.
-   *  PropertyValueMap map = builder.GetConstants(); // get copy of current constants
-   *  map["IMAGE_DIRECTORY"] = "/usr/share/images";  // make modification
-   *  builder.AddConstants( map );                   // write back changes
+   * @code
+   * PropertyValueMap map = builder.GetConstants(); // get copy of current constants
+   * map["IMAGE_DIRECTORY"] = "/usr/share/images";  // make modification
+   * builder.AddConstants( map );                   // write back changes
+   * @endcode
    *
    * @pre The Builder has been initialized.
    * @param key The constant name to search for.
@@ -292,8 +298,10 @@ typedef std::map<std::string, Property::Value> PropertyValueMap;
    * @pre Preconditions have been met for creating dali objects ie Images, Actors etc
    * @param styleName The name of the set of style properties to set on the handle object.
    * @param handle Then handle of the object on which to set the properties.
+   *
+   * @return Return true if the style was found
    */
-  void ApplyStyle( const std::string& styleName, Handle& handle );
+  bool ApplyStyle( const std::string& styleName, Handle& handle );
 
   /**
    * Add the actor tree in the "stage" section to the actor toActor.