projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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-timer.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp
index
4ab6a57
..
864e41e
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-timer.cpp
@@
-20,7
+20,7
@@
// INTERNAL INCLUDES
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/object/base-object.h>
// INTERNAL INCLUDES
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/object/base-object.h>
-#include <dali/public-api/signals/dali-signal
-v2
.h>
+#include <dali/public-api/signals/dali-signal.h>
namespace Dali
{
namespace Dali
{
@@
-53,7
+53,7
@@
public:
public: // Signals
public: // Signals
- Dali::Timer::TimerSignal
V2
& TickSignal();
+ Dali::Timer::TimerSignal
Type
& TickSignal();
private: // Implementation
private: // Implementation
@@
-63,7
+63,7
@@
private: // Implementation
private: // Data
private: // Data
- Dali::Timer::TimerSignal
V2
mTickSignal;
+ Dali::Timer::TimerSignal
Type
mTickSignal;
unsigned int mInterval;
};
unsigned int mInterval;
};
@@
-128,7
+128,7
@@
bool Timer::Tick()
return false;
}
return false;
}
-Dali::Timer::TimerSignal
V2
& Timer::TickSignal()
+Dali::Timer::TimerSignal
Type
& Timer::TickSignal()
{
return mTickSignal;
}
{
return mTickSignal;
}
@@
-196,7
+196,7
@@
bool Timer::IsRunning() const
return true;
}
return true;
}
-Timer::TimerSignal
V2
& Timer::TickSignal()
+Timer::TimerSignal
Type
& Timer::TickSignal()
{
return Internal::Adaptor::GetImplementation( *this ).TickSignal();
}
{
return Internal::Adaptor::GetImplementation( *this ).TickSignal();
}