Merge "Cleanup for removal of ImageAttributes from public API" into tizen

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / dali-toolkit-test-utils / toolkit-style-monitor.h

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
index 1537e05..fc8b8f2 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-style-monitor.h
@@ -24,8 +24,8 @@
 // INTERNAL INCLUDES
 #define __DALI_STYLE_MONITOR_H__
 #include <dali/public-api/object/base-handle.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
-#include <dali/public-api/style-change.h>
+#include <dali/public-api/signals/dali-signal.h>
+#include <dali/public-api/adaptor-framework/style-change.h>
 
 namespace Dali
 {
@@ -41,7 +41,7 @@ class StyleMonitor;
 class StyleMonitor : public BaseHandle
 {
 public: // Typedefs
-  typedef SignalV2< void (StyleMonitor, StyleChange) > StyleChangeSignalV2;
+  typedef Signal< void (StyleMonitor, StyleChange) > StyleChangeSignalType;
   static const std::string DEFAULT_FONT_FAMILY;
   static const float       DEFAULT_FONT_SIZE;
 
@@ -51,7 +51,6 @@ public: // Creation & Destruction
   static StyleMonitor Get();
   ~StyleMonitor();
   static StyleMonitor DownCast( BaseHandle handle );
-  using BaseHandle::operator=;
 
 public: // Style Information
   std::string GetDefaultFontFamily() const;
@@ -60,7 +59,7 @@ public: // Style Information
   void SetTheme(std::string themeFilePath);
 
 public: // Signals
-  StyleChangeSignalV2& StyleChangeSignal();
+  StyleChangeSignalType& StyleChangeSignal();
   void EmitStyleChangeSignal(StyleChange handle);
 
 public: // Operators