X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-style-monitor.h;h=8aa55e558c0d582630c15a5fe4b9c62e00d0ecaf;hb=e50ad843a871ba17493a375d47e7197aa91de584;hp=19adcbda4ef1eb12285bd1485ec674af0aac3a2a;hpb=a881757839b7abb008873a68c67e17b3ba39669b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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 19adcbd..8aa55e5 100644
--- 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/adaptor-framework/common/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::Type) > StyleChangeSignalType;
   static const std::string DEFAULT_FONT_FAMILY;
   static const float       DEFAULT_FONT_SIZE;
 
@@ -49,9 +49,8 @@ public: // Creation & Destruction
   StyleMonitor();
   StyleMonitor(const StyleMonitor& monitor);
   static StyleMonitor Get();
-  virtual ~StyleMonitor();
+  ~StyleMonitor();
   static StyleMonitor DownCast( BaseHandle handle );
-  using BaseHandle::operator=;
 
 public: // Style Information
   std::string GetDefaultFontFamily() const;
@@ -60,8 +59,8 @@ public: // Style Information
   void SetTheme(std::string themeFilePath);
 
 public: // Signals
-  StyleChangeSignalV2& StyleChangeSignal();
-  void EmitStyleChangeSignal(StyleChange handle);
+  StyleChangeSignalType& StyleChangeSignal();
+  void EmitStyleChangeSignal(StyleChange::Type handle);
 
 public: // Operators
   StyleMonitor& operator=(const StyleMonitor& monitor);