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
New Popup implementation
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-orientation.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp
index
e7e2568
..
30dd65f
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-orientation.cpp
@@
-19,7
+19,7
@@
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/object/base-object.h>
#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
{
@@
-58,7
+58,7
@@
public: // Setters & Getters
public: // Signals
public: // Signals
- Dali::Orientation::OrientationSignal
V2
& ChangedSignal();
+ Dali::Orientation::OrientationSignal
Type
& ChangedSignal();
void EmitChangedSignal()
{
void EmitChangedSignal()
{
@@
-67,7
+67,7
@@
public: // Signals
private:
private:
- Dali::Orientation::OrientationSignal
V2
mChangedSignal;
+ Dali::Orientation::OrientationSignal
Type
mChangedSignal;
ToolkitOrientation* mToolkitOrientation;
ToolkitOrientation* mToolkitOrientation;
@@
-102,7
+102,7
@@
float Orientation::GetRadians() const
return Math::PI * (float)mOrientation / 180.0f;
}
return Math::PI * (float)mOrientation / 180.0f;
}
-Dali::Orientation::OrientationSignal
V2
& Orientation::ChangedSignal()
+Dali::Orientation::OrientationSignal
Type
& Orientation::ChangedSignal()
{
mToolkitOrientation->mFunctionsCalled.ChangedSignal = true;
return mChangedSignal;
{
mToolkitOrientation->mFunctionsCalled.ChangedSignal = true;
return mChangedSignal;