X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fstyling%2Fstyle-manager.h;h=c2d14a374839da37d0c1fc778322c785c6e161f4;hp=de6bfb1e4c4e8232623eae758a22c7dbb840dc90;hb=HEAD;hpb=9eecb41468197eb2fc03e55c151011ea387e1bed diff --git a/dali-toolkit/public-api/styling/style-manager.h b/dali-toolkit/public-api/styling/style-manager.h index de6bfb1..c2d14a3 100644 --- a/dali-toolkit/public-api/styling/style-manager.h +++ b/dali-toolkit/public-api/styling/style-manager.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_STYLE_MANAGER_H__ -#define __DALI_TOOLKIT_STYLE_MANAGER_H__ +#ifndef DALI_TOOLKIT_STYLE_MANAGER_H +#define DALI_TOOLKIT_STYLE_MANAGER_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -25,10 +25,8 @@ namespace Dali { - namespace Toolkit { - namespace Internal DALI_INTERNAL { class StyleManager; @@ -68,9 +66,8 @@ class StyleManager; class DALI_TOOLKIT_API StyleManager : public BaseHandle { public: - /// @brief Style Changed signal. Emitted after controls have been updated. - typedef Signal< void ( StyleManager, StyleChange::Type ) > StyleChangedSignalType; + typedef Signal StyleChangedSignalType; /** * @brief Creates a StyleManager handle; this can be initialized with StyleManager::Get(). @@ -113,7 +110,7 @@ public: * @param[in] themeFile If a relative path is specified, then this is relative * to the directory returned by Application::GetResourcePath() */ - void ApplyTheme( const std::string& themeFile ); + void ApplyTheme(const std::string& themeFile); /** * @brief Applies the default Toolkit theme. @@ -135,7 +132,7 @@ public: * @param[in] key The key of the constant * @param[in] value The value of the constant */ - void SetStyleConstant( const std::string& key, const Property::Value& value ); + void SetStyleConstant(const std::string& key, const Property::Value& value); /** * @brief Returns the style constant set for a specific key. @@ -146,7 +143,7 @@ public: * * @return If the constant for key exists, then return the constant in valueOut and return true */ - bool GetStyleConstant( const std::string& key, Property::Value& valueOut ); + bool GetStyleConstant(const std::string& key, Property::Value& valueOut); /** * @brief Applies the specified style to the control. @@ -158,10 +155,9 @@ public: * returned by Application::GetResourcePath() * @param[in] styleName The name of the style within the JSON file to apply */ - void ApplyStyle( Toolkit::Control control, const std::string& jsonFileName, const std::string& styleName ); + void ApplyStyle(Toolkit::Control control, const std::string& jsonFileName, const std::string& styleName); public: // Signals - /** * @brief This signal is emitted after the style (e.g. theme/font change) has changed * and the controls have been informed. @@ -176,7 +172,6 @@ public: // Signals StyleChangedSignalType& StyleChangedSignal(); public: - /// @cond internal /** * @brief Allows the creation of a StyleManager handle from an internal pointer. @@ -185,7 +180,7 @@ public: * @SINCE_1_1.32 * @param[in] impl A pointer to the object */ - explicit DALI_INTERNAL StyleManager( Internal::StyleManager *impl ); + explicit DALI_INTERNAL StyleManager(Internal::StyleManager* impl); /// @endcond }; // class StyleManager @@ -193,9 +188,9 @@ public: /** * @} */ + } // namespace Toolkit } // namespace Dali - -#endif /* __DALI_TOOLKIT_STYLE_MANAGER_H__ */ +#endif // DALI_TOOLKIT_STYLE_MANAGER_H