X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-timer.h;h=e0c886ca49a1f1d82455113c42dae16be7db7768;hb=fbb1f2f599b2fc1a54b327039ce6111f4b4ba4cf;hp=c479fb87f526d4264b50b229ddbd487fa3e7e591;hpb=ee2779d9e1060f8527589169fb2f0dbf6f0f8815;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h index c479fb8..e0c886c 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_TOOLKIT_TIMER_H__ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 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. @@ -24,7 +24,7 @@ // PUBLIC INCLUDES #define __DALI_TIMER_H__ #include -#include +#include namespace Dali { @@ -40,7 +40,10 @@ class Timer; class Timer : public BaseHandle { public: - typedef SignalV2< bool () > TimerSignalV2; + void MockEmitSignal(); + +public: + typedef Signal< bool () > TimerSignalType; Timer(); static Timer New( unsigned int milliSec ); Timer( const Timer& timer ); @@ -52,7 +55,7 @@ public: void SetInterval( unsigned int milliSec ); unsigned int GetInterval() const; bool IsRunning() const; - TimerSignalV2& TickSignal(); + TimerSignalType& TickSignal(); private: Timer(Internal::Adaptor::Timer* timer); };