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
DALi signals refactor to remove V2 naming
[platform/core/uifw/dali-toolkit.git]
/
optional
/
dali-toolkit
/
internal
/
controls
/
view
/
view-impl.cpp
diff --git
a/optional/dali-toolkit/internal/controls/view/view-impl.cpp
b/optional/dali-toolkit/internal/controls/view/view-impl.cpp
index
8bf9811
..
82b91b7
100644
(file)
--- a/
optional/dali-toolkit/internal/controls/view/view-impl.cpp
+++ b/
optional/dali-toolkit/internal/controls/view/view-impl.cpp
@@
-16,10
+16,12
@@
*/
// CLASS HEADER
*/
// CLASS HEADER
-
#include "view-impl.h"
// EXTERNAL INCLUDES
#include "view-impl.h"
// EXTERNAL INCLUDES
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/common/stage.h>
+#include <dali/public-api/object/type-registry.h>
// INTERNAL INCLUDES
// INTERNAL INCLUDES
@@
-232,7
+234,7
@@
void View::OrientationChanged( Dali::Orientation orientation )
}
Toolkit::View handle( GetOwner() );
}
Toolkit::View handle( GetOwner() );
- mOrientationAnimationStartedSignal
V2
.Emit( handle, mRotateAnimation, orientation );
+ mOrientationAnimationStartedSignal.Emit( handle, mRotateAnimation, orientation );
mRotateAnimation.Play();
}
mRotateAnimation.Play();
}
@@
-242,9
+244,9
@@
void View::SetAutoRotate( bool enabled )
mAutoRotateEnabled = enabled;
}
mAutoRotateEnabled = enabled;
}
-Toolkit::View::OrientationAnimationStartedSignal
V2
& View::OrientationAnimationStartedSignal()
+Toolkit::View::OrientationAnimationStartedSignal
Type
& View::OrientationAnimationStartedSignal()
{
{
- return mOrientationAnimationStartedSignal
V2
;
+ return mOrientationAnimationStartedSignal;
}
bool View::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
}
bool View::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )