[dali_2.3.19] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / styling / style-manager.h

diff --git a/dali-toolkit/public-api/styling/style-manager.h b/dali-toolkit/public-api/styling/style-manager.h
index 7f52d85..c2d14a3 100644 (file)
--- 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) 2016 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;
@@ -65,12 +63,11 @@ class StyleManager;
  * | styleChanged            | @ref StyleChangedSignal()        |
  * @SINCE_1_1.32
  */
-class DALI_IMPORT_API StyleManager : public BaseHandle
+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<void(StyleManager, StyleChange::Type)> 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