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=fc8b8f2fa9566f05e9a3476ec7523aec4477d7d2;hb=6139b6465e2d76173980f08b731ba512dcff38c3;hp=1537e0565e273c50234e678e94542d6532a5a97b;hpb=b987c87a4fb8f149be93e84e520a0a6ac3866343;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 1537e05..fc8b8f2 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 -#include -#include +#include +#include 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