Remove CAPI from Toolkit

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

diff --git a/base/dali-toolkit/public-api/styling/style-manager.h b/base/dali-toolkit/public-api/styling/style-manager.h
index 6b42f8d..6ac2662 100644 (file)
--- a/base/dali-toolkit/public-api/styling/style-manager.h
+++ b/base/dali-toolkit/public-api/styling/style-manager.h
@@ -1,21 +1,21 @@
 #ifndef __DALI_TOOLKIT_STYLE_MANAGER_H__
 #define __DALI_TOOLKIT_STYLE_MANAGER_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 // EXTERNAL INCLUDES
 
@@ -63,7 +63,7 @@ class StyleManager : public BaseHandle
 public:
 
   // Signals
-  typedef SignalV2< void ( StyleManager ) > ThemeChangeSignalType;
+  typedef SignalV2< void ( StyleManager, StyleChange ) >  StyleChangeSignalType;
 
   /**
    * @brief Create a StyleManager handle; this can be initialised with StyleManager::Get()
@@ -72,9 +72,11 @@ public:
   StyleManager();
 
   /**
-   * @brief Virtual destructor.
+   * @brief Destructor
+   *
+   * This is non-virtual since derived Handle types must not contain data or virtual methods.
    */
-  virtual ~StyleManager();
+  ~StyleManager();
 
   /**
    * @brief Get the singleton of StyleManager object.
@@ -162,14 +164,14 @@ public:
 public: // Signals
 
   /**
-   * @brief This signal is emitted whenever the theme is changed on device
+   * @brief This signal is emitted whenever the style (e.g. theme/font change) is changed on device
    * A callback of the following type may be connected:
    * @code
-   *   void YourCallbackName( StyleManager styleManager );
+   *   void YourCallbackName( StyleManager styleManager, StyleChange change );
    * @endcode
    * @return The signal to connect to.
    */
-  ThemeChangeSignalType& ThemeChangeSignal();
+  StyleChangeSignalType& StyleChangeSignal();
 
 public: