From: György Straub Date: Fri, 28 Aug 2020 12:32:57 +0000 (+0100) Subject: Renaming of enum values for coding standards compliance. X-Git-Tag: dali_1.9.28~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F68%2F242668%2F4;p=platform%2Fcore%2Fuifw%2Fdali-core.git Renaming of enum values for coding standards compliance. Change-Id: I9a718cb49886146a169f82bb3cd5acf81d121fa2 Signed-off-by: György Straub --- diff --git a/automated-tests/src/dali/utc-Dali-Actor.cpp b/automated-tests/src/dali/utc-Dali-Actor.cpp index 57a9d73..b74132d 100644 --- a/automated-tests/src/dali/utc-Dali-Actor.cpp +++ b/automated-tests/src/dali/utc-Dali-Actor.cpp @@ -7251,7 +7251,7 @@ int utcDaliActorCulled(void) DALI_TEST_EQUALS( actor.GetProperty< bool >( Actor::Property::CULLED ), false, TEST_LOCATION ); PropertyNotification notification = actor.AddPropertyNotification( Actor::Property::CULLED, LessThanCondition( 0.5f ) ); - notification.SetNotifyMode( PropertyNotification::NotifyOnChanged ); + notification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED ); // Connect NotifySignal bool propertyNotificationSignal( false ); diff --git a/automated-tests/src/dali/utc-Dali-Constraint.cpp b/automated-tests/src/dali/utc-Dali-Constraint.cpp index 678d2ad..2e4b354 100644 --- a/automated-tests/src/dali/utc-Dali-Constraint.cpp +++ b/automated-tests/src/dali/utc-Dali-Constraint.cpp @@ -485,7 +485,7 @@ int UtcDaliConstraintCloneCheckSourcesAndSetters(void) constraint.AddSource( LocalSource( Actor::Property::ORIENTATION ) ); constraint.AddSource( LocalSource( Actor::Property::COLOR ) ); constraint.AddSource( LocalSource( Actor::Property::VISIBLE ) ); - constraint.SetRemoveAction( Constraint::Discard ); + constraint.SetRemoveAction( Constraint::DISCARD ); constraint.SetTag( 123 ); // Clone the constraint & apply the clone @@ -751,11 +751,11 @@ int UtcDaliConstraintRemoveActionP(void) Constraint constraint = Constraint::New< Vector3 >( actor, Actor::Property::POSITION, &BasicFunction< Vector3 > ); DALI_TEST_EQUALS( constraint.GetRemoveAction(), Constraint::DEFAULT_REMOVE_ACTION, TEST_LOCATION ); - constraint.SetRemoveAction( Constraint::Discard ); - DALI_TEST_EQUALS( constraint.GetRemoveAction(), Constraint::Discard, TEST_LOCATION ); + constraint.SetRemoveAction( Constraint::DISCARD ); + DALI_TEST_EQUALS( constraint.GetRemoveAction(), Constraint::DISCARD, TEST_LOCATION ); - constraint.SetRemoveAction( Constraint::Bake ); - DALI_TEST_EQUALS( constraint.GetRemoveAction(), Constraint::Bake, TEST_LOCATION ); + constraint.SetRemoveAction( Constraint::BAKE ); + DALI_TEST_EQUALS( constraint.GetRemoveAction(), Constraint::BAKE, TEST_LOCATION ); END_TEST; } @@ -769,7 +769,7 @@ int UtcDaliConstraintSetRemoveActionN(void) Constraint constraint; try { - constraint.SetRemoveAction( Constraint::Discard ); + constraint.SetRemoveAction( Constraint::DISCARD ); DALI_TEST_CHECK( false ); // Should not reach here! } catch( ... ) @@ -819,7 +819,7 @@ int UtcDaliConstraintBakeRemoveAction(void) // Create a constraint that constrains to position Constraint constraint = Constraint::New< Vector3 >( actor, Actor::Property::POSITION, SetValueFunctor< Vector3 >( position ) ); - constraint.SetRemoveAction( Constraint::Bake ); + constraint.SetRemoveAction( Constraint::BAKE ); constraint.Apply(); application.SendNotification(); @@ -859,7 +859,7 @@ int UtcDaliConstraintDiscardRemoveAction(void) // Create a constraint that constrains to position Constraint constraint = Constraint::New< Vector3 >( actor, Actor::Property::POSITION, SetValueFunctor< Vector3 >( position ) ); - constraint.SetRemoveAction( Constraint::Discard ); + constraint.SetRemoveAction( Constraint::DISCARD ); constraint.Apply(); application.SendNotification(); @@ -1309,7 +1309,7 @@ int UtcDaliConstraintEnsureResetterAppliedOnSceneRemoval(void) // Create a constraint whose value is discarded when it is removed Constraint constraint = Constraint::New< Vector4 >( actor, Actor::Property::COLOR, SetHalfOpacity ); - constraint.SetRemoveAction( Constraint::RemoveAction::Discard ); + constraint.SetRemoveAction( Constraint::RemoveAction::DISCARD ); constraint.Apply(); // Check value after one render, it should be constrained @@ -1364,7 +1364,7 @@ int UtcDaliConstraintOnActorAddedAndRemoved(void) // Create a constraint whose value is discarded when it is removed Constraint constraint = Constraint::New< Vector4 >( actor, Actor::Property::COLOR, SetHalfOpacity ); - constraint.SetRemoveAction( Constraint::RemoveAction::Discard ); + constraint.SetRemoveAction( Constraint::RemoveAction::DISCARD ); constraint.Apply(); // Check value after one render, it should be constrained @@ -1428,7 +1428,7 @@ int UtcDaliConstraintSetRemoveActionNegative(void) Dali::Constraint instance; try { - Dali::Constraint::RemoveAction arg1(Constraint::Bake); + Dali::Constraint::RemoveAction arg1(Constraint::BAKE); instance.SetRemoveAction(arg1); DALI_TEST_CHECK(false); // Should not get here } diff --git a/automated-tests/src/dali/utc-Dali-PropertyNotification.cpp b/automated-tests/src/dali/utc-Dali-PropertyNotification.cpp index a9a45e2..7e65a8e 100644 --- a/automated-tests/src/dali/utc-Dali-PropertyNotification.cpp +++ b/automated-tests/src/dali/utc-Dali-PropertyNotification.cpp @@ -459,10 +459,10 @@ int UtcDaliPropertyNotificationGetNotifyMode(void) PropertyNotification notification = actor.AddPropertyNotification(Actor::Property::POSITION_X, GreaterThanCondition(100.0f)); - notification.SetNotifyMode(PropertyNotification::NotifyOnChanged); + notification.SetNotifyMode(PropertyNotification::NOTIFY_ON_CHANGED); PropertyNotification::NotifyMode notifyMode = notification.GetNotifyMode(); - DALI_TEST_EQUALS( notifyMode, PropertyNotification::NotifyOnChanged, TEST_LOCATION ); + DALI_TEST_EQUALS( notifyMode, PropertyNotification::NOTIFY_ON_CHANGED, TEST_LOCATION ); END_TEST; } @@ -475,7 +475,7 @@ int UtcDaliPropertyNotificationGetNotifyResultP(void) PropertyNotification notification = actor.AddPropertyNotification(Actor::Property::POSITION_X, GreaterThanCondition(100.0f)); - notification.SetNotifyMode(PropertyNotification::NotifyOnChanged); + notification.SetNotifyMode(PropertyNotification::NOTIFY_ON_CHANGED); gCallBackCalled = false; notification.NotifySignal().Connect( &TestCallback ); @@ -840,7 +840,7 @@ int UtcDaliPropertyNotificationSetSizeResultP(void) Actor actor = Actor::New(); PropertyNotification notification = actor.AddPropertyNotification( Actor::Property::SIZE, StepCondition( 1.0f, 1.0f ) ); - notification.SetNotifyMode(PropertyNotification::NotifyOnChanged); + notification.SetNotifyMode(PropertyNotification::NOTIFY_ON_CHANGED); gCallBackCalled = false; notification.NotifySignal().Connect( &TestCallback ); diff --git a/automated-tests/src/dali/utc-Dali-TouchEventCombiner.cpp b/automated-tests/src/dali/utc-Dali-TouchEventCombiner.cpp index 81475c7..09fb6aa 100644 --- a/automated-tests/src/dali/utc-Dali-TouchEventCombiner.cpp +++ b/automated-tests/src/dali/utc-Dali-TouchEventCombiner.cpp @@ -232,7 +232,7 @@ int UtcDaliTouchEventCombinerSingleTouchNormal(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -247,7 +247,7 @@ int UtcDaliTouchEventCombinerSingleTouchNormal(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::MOTION, 101.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -262,7 +262,7 @@ int UtcDaliTouchEventCombinerSingleTouchNormal(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::MOTION, 101.0f, 101.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -275,7 +275,7 @@ int UtcDaliTouchEventCombinerSingleTouchNormal(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); } time++; @@ -286,7 +286,7 @@ int UtcDaliTouchEventCombinerSingleTouchNormal(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -301,7 +301,7 @@ int UtcDaliTouchEventCombinerSingleTouchNormal(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); } // Up event, no time diff, no movement @@ -310,7 +310,7 @@ int UtcDaliTouchEventCombinerSingleTouchNormal(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::UP, 102.0f, 102.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -330,7 +330,7 @@ int UtcDaliTouchEventCombinerSingleTouchMotionWithoutDown(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::MOTION, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchHover, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_HOVER, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), PointState::STARTED, TEST_LOCATION ); @@ -345,7 +345,7 @@ int UtcDaliTouchEventCombinerSingleTouchMotionWithoutDown(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchHover, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_HOVER, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -365,7 +365,7 @@ int UtcDaliTouchEventCombinerSingleTouchMotionFollowedByDown(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::MOTION, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchHover, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_HOVER, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), PointState::STARTED, TEST_LOCATION ); @@ -380,7 +380,7 @@ int UtcDaliTouchEventCombinerSingleTouchMotionFollowedByDown(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchHover, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_HOVER, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -395,7 +395,7 @@ int UtcDaliTouchEventCombinerSingleTouchMotionFollowedByDown(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::MOTION, 103.0f, 103.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchHover, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_HOVER, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -410,7 +410,7 @@ int UtcDaliTouchEventCombinerSingleTouchMotionFollowedByDown(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::DOWN, 103.0f, 103.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchBoth, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_BOTH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -434,7 +434,7 @@ int UtcDaliTouchEventCombinerSingleTouchTwoDowns(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -449,7 +449,7 @@ int UtcDaliTouchEventCombinerSingleTouchTwoDowns(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); } END_TEST; } @@ -465,7 +465,7 @@ int UtcDaliTouchEventCombinerSingleTouchUpWithoutDown(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); } time++; @@ -476,7 +476,7 @@ int UtcDaliTouchEventCombinerSingleTouchUpWithoutDown(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::UP, 102.0f, 102.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); } END_TEST; } @@ -492,7 +492,7 @@ int UtcDaliTouchEventCombinerSingleTouchTwoUps(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -507,7 +507,7 @@ int UtcDaliTouchEventCombinerSingleTouchTwoUps(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -522,7 +522,7 @@ int UtcDaliTouchEventCombinerSingleTouchTwoUps(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); } END_TEST; } @@ -538,7 +538,7 @@ int UtcDaliTouchEventCombinerSingleTouchUpWithDifferentId(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -553,7 +553,7 @@ int UtcDaliTouchEventCombinerSingleTouchUpWithDifferentId(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 2, PointState::UP, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); } time++; @@ -564,7 +564,7 @@ int UtcDaliTouchEventCombinerSingleTouchUpWithDifferentId(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -584,7 +584,7 @@ int UtcDaliTouchEventCombinerSingleTouchMotionWithDifferentId(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -599,7 +599,7 @@ int UtcDaliTouchEventCombinerSingleTouchMotionWithDifferentId(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 2, PointState::MOTION, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchHover, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_HOVER, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), PointState::STARTED, TEST_LOCATION ); @@ -614,7 +614,7 @@ int UtcDaliTouchEventCombinerSingleTouchMotionWithDifferentId(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -634,7 +634,7 @@ int UtcDaliTouchEventCombinerMultiTouchNormal(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -649,7 +649,7 @@ int UtcDaliTouchEventCombinerMultiTouchNormal(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 2, PointState::DOWN, 200.0f, 200.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 2u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[1].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), PointState::STATIONARY, TEST_LOCATION ); @@ -665,7 +665,7 @@ int UtcDaliTouchEventCombinerMultiTouchNormal(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::MOTION, 101.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 2u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -679,7 +679,7 @@ int UtcDaliTouchEventCombinerMultiTouchNormal(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 2, PointState::MOTION, 200.0f, 200.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); } time++; @@ -690,7 +690,7 @@ int UtcDaliTouchEventCombinerMultiTouchNormal(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 2, PointState::MOTION, 201.0f, 201.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 2u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[1].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), PointState::STATIONARY, TEST_LOCATION ); @@ -706,7 +706,7 @@ int UtcDaliTouchEventCombinerMultiTouchNormal(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::UP, 101.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 2u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -722,7 +722,7 @@ int UtcDaliTouchEventCombinerMultiTouchNormal(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 2, PointState::MOTION, 202.0f, 202.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -737,7 +737,7 @@ int UtcDaliTouchEventCombinerMultiTouchNormal(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 2, PointState::UP, 202.0f, 202.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -759,7 +759,7 @@ int UtcDaliTouchEventCombinerSeveralPoints(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( pointCount, PointState::DOWN, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time++, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time++, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), pointCount, TEST_LOCATION ); } @@ -770,7 +770,7 @@ int UtcDaliTouchEventCombinerSeveralPoints(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( pointCount, PointState::UP, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time++, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time++, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), pointCount, TEST_LOCATION ); } END_TEST; @@ -787,7 +787,7 @@ int UtcDaliTouchEventCombinerReset(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -805,7 +805,7 @@ int UtcDaliTouchEventCombinerReset(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); } END_TEST; } @@ -821,7 +821,7 @@ int UtcDaliTouchEventCombinerSingleTouchInterrupted(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); @@ -836,7 +836,7 @@ int UtcDaliTouchEventCombinerSingleTouchInterrupted(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::INTERRUPTED, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchBoth, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_BOTH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION ); @@ -850,7 +850,7 @@ int UtcDaliTouchEventCombinerSingleTouchInterrupted(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); } END_TEST; } @@ -868,7 +868,7 @@ int UtcDaliTouchEventCombinerMultiTouchInterrupted(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( pointCount, PointState::DOWN, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), pointCount, TEST_LOCATION ); } @@ -878,7 +878,7 @@ int UtcDaliTouchEventCombinerMultiTouchInterrupted(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::INTERRUPTED, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchBoth, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_BOTH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION ); DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION ); DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION ); @@ -892,7 +892,7 @@ int UtcDaliTouchEventCombinerMultiTouchInterrupted(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); } END_TEST; } @@ -908,7 +908,7 @@ int UtcDaliTouchEventCombinerInvalidState(void) Integration::HoverEvent hoverEvent; Integration::Point point = GeneratePoint( 1, PointState::STATIONARY, 100.0f, 100.0f ); - DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); + DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION ); } END_TEST; } diff --git a/dali/integration-api/events/touch-event-combiner.cpp b/dali/integration-api/events/touch-event-combiner.cpp index 768b741..d73291b 100644 --- a/dali/integration-api/events/touch-event-combiner.cpp +++ b/dali/integration-api/events/touch-event-combiner.cpp @@ -86,7 +86,7 @@ TouchEventCombiner::~TouchEventCombiner() TouchEventCombiner::EventDispatchType TouchEventCombiner::GetNextTouchEvent( const Point& point, uint32_t time, TouchEvent& touchEvent, HoverEvent& hoverEvent ) { - TouchEventCombiner::EventDispatchType dispatchEvent( TouchEventCombiner::DispatchNone ); + TouchEventCombiner::EventDispatchType dispatchEvent( TouchEventCombiner::DISPATCH_NONE ); const PointState::Type state = point.GetState(); const int deviceId = point.GetDeviceId(); @@ -121,7 +121,7 @@ TouchEventCombiner::EventDispatchType TouchEventCombiner::GetNextTouchEvent( con { mPressedPoints.push_back( PointInfo( point, time ) ); touchEvent.AddPoint( point ); - dispatchEvent = TouchEventCombiner::DispatchTouch; // Only dispatch touch event if just added to container + dispatchEvent = TouchEventCombiner::DISPATCH_TOUCH; // Only dispatch touch event if just added to container // Check whether hover event was dispatched previously if ( !mHoveredPoints.empty() ) @@ -148,7 +148,7 @@ TouchEventCombiner::EventDispatchType TouchEventCombiner::GetNextTouchEvent( con if ( match != mHoveredPoints.end() ) { mHoveredPoints.erase( match ); - dispatchEvent = TouchEventCombiner::DispatchBoth; // We should only dispatch hover events if the point was actually hovered in this window + dispatchEvent = TouchEventCombiner::DISPATCH_BOTH; // We should only dispatch hover events if the point was actually hovered in this window } } } @@ -181,7 +181,7 @@ TouchEventCombiner::EventDispatchType TouchEventCombiner::GetNextTouchEvent( con if ( match != mPressedPoints.end() ) { mPressedPoints.erase( match ); - dispatchEvent = TouchEventCombiner::DispatchTouch; // We should only dispatch touch events if the point was actually pressed in this window + dispatchEvent = TouchEventCombiner::DISPATCH_TOUCH; // We should only dispatch touch events if the point was actually pressed in this window // Iterate through already stored touch points for HoverEvent and delete them for ( PointInfoContainer::iterator iter = mHoveredPoints.begin(), endIter = mHoveredPoints.end(); iter != endIter; ++iter ) @@ -245,7 +245,7 @@ TouchEventCombiner::EventDispatchType TouchEventCombiner::GetNextTouchEvent( con PointInfo matchedPoint( point, time ); std::swap( *match, matchedPoint ); - dispatchEvent = TouchEventCombiner::DispatchTouch; // Dispatch touch event + dispatchEvent = TouchEventCombiner::DISPATCH_TOUCH; // Dispatch touch event } else if(!ignore) { @@ -312,13 +312,13 @@ TouchEventCombiner::EventDispatchType TouchEventCombiner::GetNextTouchEvent( con std::swap( *match, matchedPoint ); } - if(dispatchEvent == TouchEventCombiner::DispatchTouch) + if(dispatchEvent == TouchEventCombiner::DISPATCH_TOUCH) { - dispatchEvent = TouchEventCombiner::DispatchBoth; + dispatchEvent = TouchEventCombiner::DISPATCH_BOTH; } else { - dispatchEvent = TouchEventCombiner::DispatchHover; + dispatchEvent = TouchEventCombiner::DISPATCH_HOVER; } } } @@ -332,7 +332,7 @@ TouchEventCombiner::EventDispatchType TouchEventCombiner::GetNextTouchEvent( con // We should still tell core about the interruption. touchEvent.AddPoint( point ); hoverEvent.AddPoint( point ); - dispatchEvent = TouchEventCombiner::DispatchBoth; + dispatchEvent = TouchEventCombiner::DISPATCH_BOTH; break; } diff --git a/dali/integration-api/events/touch-event-combiner.h b/dali/integration-api/events/touch-event-combiner.h index 2849380..6ed9402 100644 --- a/dali/integration-api/events/touch-event-combiner.h +++ b/dali/integration-api/events/touch-event-combiner.h @@ -54,10 +54,10 @@ public: enum EventDispatchType { - DispatchTouch, ///< The touch event should be dispatched. - DispatchHover, ///< The hover event should be dispatched. - DispatchBoth, ///< Both touch event and hover event should be dispatched. - DispatchNone ///< Neither touch event nor hover event should be dispatched. + DISPATCH_TOUCH, ///< The touch event should be dispatched. + DISPATCH_HOVER, ///< The hover event should be dispatched. + DISPATCH_BOTH, ///< Both touch event and hover event should be dispatched. + DISPATCH_NONE ///< Neither touch event nor hover event should be dispatched. }; /** diff --git a/dali/internal/event/animation/linear-constrainer-impl.cpp b/dali/internal/event/animation/linear-constrainer-impl.cpp index b346519..c357e41 100644 --- a/dali/internal/event/animation/linear-constrainer-impl.cpp +++ b/dali/internal/event/animation/linear-constrainer-impl.cpp @@ -143,7 +143,7 @@ void LinearConstrainer::Apply( Property target, Property source, const Vector2& constraint.AddSource( Dali::Source(source.object, source.propertyIndex ) ); constraint.SetTag( static_cast( reinterpret_cast( this ) ) ); // taking 32bits of this as tag - constraint.SetRemoveAction( Dali::Constraint::Discard ); + constraint.SetRemoveAction( Dali::Constraint::DISCARD ); constraint.Apply(); //Start observing the object diff --git a/dali/internal/event/animation/path-constrainer-impl.cpp b/dali/internal/event/animation/path-constrainer-impl.cpp index 877a938..63eb9f7 100644 --- a/dali/internal/event/animation/path-constrainer-impl.cpp +++ b/dali/internal/event/animation/path-constrainer-impl.cpp @@ -166,7 +166,7 @@ void PathConstrainer::Apply( Property target, Property source, const Vector2& ra constraint.AddSource( Dali::Source(source.object, source.propertyIndex ) ); constraint.SetTag( static_cast( reinterpret_cast( this ) ) ); // taking 32bits of this as tag - constraint.SetRemoveAction( Dali::Constraint::Discard ); + constraint.SetRemoveAction( Dali::Constraint::DISCARD ); constraint.Apply(); } else if( propertyType == Dali::Property::ROTATION ) @@ -176,7 +176,7 @@ void PathConstrainer::Apply( Property target, Property source, const Vector2& ra constraint.AddSource( Dali::Source(source.object, source.propertyIndex ) ); constraint.SetTag( static_cast( reinterpret_cast( this ) ) ); // taking 32bits of this as tag - constraint.SetRemoveAction( Dali::Constraint::Discard ); + constraint.SetRemoveAction( Dali::Constraint::DISCARD ); constraint.Apply(); } diff --git a/dali/internal/event/common/property-notification-impl.cpp b/dali/internal/event/common/property-notification-impl.cpp index ab1260e..33222bf 100644 --- a/dali/internal/event/common/property-notification-impl.cpp +++ b/dali/internal/event/common/property-notification-impl.cpp @@ -68,7 +68,7 @@ PropertyNotification::PropertyNotification( UpdateManager& updateManager, mPropertyType( Property::NONE ), mComponentIndex( componentIndex ), mCondition( condition ), - mNotifyMode( Dali::PropertyNotification::NotifyOnTrue ), + mNotifyMode( Dali::PropertyNotification::NOTIFY_ON_TRUE ), mNotifyResult( false ), mCompare( false ) { diff --git a/dali/internal/event/common/property-notification-manager.cpp b/dali/internal/event/common/property-notification-manager.cpp index 54980c8..45cec79 100644 --- a/dali/internal/event/common/property-notification-manager.cpp +++ b/dali/internal/event/common/property-notification-manager.cpp @@ -61,7 +61,7 @@ void PropertyNotificationManager::NotifyProperty( SceneGraph::PropertyNotificati // found one with the matching SceneGraph::PropertyNotification? if( (*iter)->CompareSceneObject( propertyNotification ) ) { - // allow application to access the value that triggered this emit incase of NotifyOnChanged mode + // allow application to access the value that triggered this emit incase of NOTIFY_ON_CHANGED mode (*iter)->SetNotifyResult(validity); // yes..emit signal (*iter)->EmitSignalNotify(); diff --git a/dali/internal/update/animation/scene-graph-constraint.h b/dali/internal/update/animation/scene-graph-constraint.h index 19149b3..ef12cb7 100644 --- a/dali/internal/update/animation/scene-graph-constraint.h +++ b/dali/internal/update/animation/scene-graph-constraint.h @@ -89,7 +89,7 @@ public: mFunc->Apply( updateBufferIndex, current ); // Optionally bake the final value - if ( Dali::Constraint::Bake == mRemoveAction ) + if ( Dali::Constraint::BAKE == mRemoveAction ) { mTargetProperty.Bake( updateBufferIndex, current ); } diff --git a/dali/internal/update/common/scene-graph-property-notification.cpp b/dali/internal/update/common/scene-graph-property-notification.cpp index 57a78eb..d2d32f3 100644 --- a/dali/internal/update/common/scene-graph-property-notification.cpp +++ b/dali/internal/update/common/scene-graph-property-notification.cpp @@ -62,7 +62,7 @@ PropertyNotification::PropertyNotification(Object& object, mConditionType(condition), mArguments(arguments), mValid(false), - mNotifyMode( Dali::PropertyNotification::Disabled ), + mNotifyMode( Dali::PropertyNotification::DISABLED ), mConditionFunction(NULL) { SetNotifyMode(notifyMode); @@ -163,22 +163,22 @@ bool PropertyNotification::Check( BufferIndex bufferIndex ) // means don't notify so notifyRequired stays false switch( mNotifyMode ) { - case Dali::PropertyNotification::Disabled: + case Dali::PropertyNotification::DISABLED: { // notify never, already initialized to false break; } - case Dali::PropertyNotification::NotifyOnTrue: + case Dali::PropertyNotification::NOTIFY_ON_TRUE: { notifyRequired = mValid; // notify if value is true break; } - case Dali::PropertyNotification::NotifyOnFalse: + case Dali::PropertyNotification::NOTIFY_ON_FALSE: { notifyRequired = !mValid; // notify when its false break; } - case Dali::PropertyNotification::NotifyOnChanged: + case Dali::PropertyNotification::NOTIFY_ON_CHANGED: { notifyRequired = true; // notify whenever changed break; diff --git a/dali/public-api/animation/constraint.cpp b/dali/public-api/animation/constraint.cpp index 1302ab7..8c2648d 100644 --- a/dali/public-api/animation/constraint.cpp +++ b/dali/public-api/animation/constraint.cpp @@ -38,7 +38,7 @@ Internal::PropertyConstraint< P >* CreatePropertyConstraint( CallbackBase* func } // unnamed namespace -const Constraint::RemoveAction Constraint::DEFAULT_REMOVE_ACTION = Constraint::Bake; +const Constraint::RemoveAction Constraint::DEFAULT_REMOVE_ACTION = Constraint::BAKE; Constraint::Constraint() { diff --git a/dali/public-api/animation/constraint.h b/dali/public-api/animation/constraint.h index 57c0aa3..8dc25ea 100644 --- a/dali/public-api/animation/constraint.h +++ b/dali/public-api/animation/constraint.h @@ -276,11 +276,11 @@ public: */ enum RemoveAction { - Bake, ///< When the constraint is fully-applied, the constrained value is saved. @SINCE_1_0.0 - Discard ///< When the constraint is removed, the constrained value is discarded. @SINCE_1_0.0 + BAKE, ///< When the constraint is fully-applied, the constrained value is saved. @SINCE_1_9.28 + DISCARD ///< When the constraint is removed, the constrained value is discarded. @SINCE_1_9.28 }; - static const RemoveAction DEFAULT_REMOVE_ACTION; ///< Bake + static const RemoveAction DEFAULT_REMOVE_ACTION; ///< BAKE /** * @brief Creates an uninitialized Constraint; this can be initialized with Constraint::New(). @@ -489,10 +489,10 @@ public: Dali::Property::Index GetTargetProperty(); /** - * @brief Sets the remove action. Constraint::Bake will "bake" a value when fully-applied. + * @brief Sets the remove action. Constraint::BAKE will "bake" a value when fully-applied. * - * In case of Constraint::Discard, the constrained value will be discarded, when the constraint is removed. - * The default value is Constraint::Bake. + * In case of Constraint::DISCARD, the constrained value will be discarded, when the constraint is removed. + * The default value is Constraint::BAKE. * @SINCE_1_0.0 * @param[in] action The remove-action */ diff --git a/dali/public-api/object/property-notification.h b/dali/public-api/object/property-notification.h index c0e01c5..8178a14 100644 --- a/dali/public-api/object/property-notification.h +++ b/dali/public-api/object/property-notification.h @@ -52,10 +52,10 @@ public: */ enum NotifyMode { - Disabled, ///< Don't notify, regardless of result of Condition @SINCE_1_0.0 - NotifyOnTrue, ///< Notify whenever condition changes from false to true. @SINCE_1_0.0 - NotifyOnFalse, ///< Notify whenever condition changes from true to false. @SINCE_1_0.0 - NotifyOnChanged ///< Notify whenever condition changes (false to true, and true to false) @SINCE_1_0.0 + DISABLED, ///< Don't notify, regardless of result of Condition @SINCE_1_9.28 + NOTIFY_ON_TRUE, ///< Notify whenever condition changes from false to true. @SINCE_1_9.28 + NOTIFY_ON_FALSE, ///< Notify whenever condition changes from true to false. @SINCE_1_9.28 + NOTIFY_ON_CHANGED ///< Notify whenever condition changes (false to true, and true to false) @SINCE_1_9.28 }; public: @@ -162,7 +162,7 @@ public: * notification should respond to the result of a condition. * * @SINCE_1_0.0 - * @param[in] mode Notification mode (Default is PropertyNotification::NotifyOnTrue) + * @param[in] mode Notification mode (Default is PropertyNotification::NOTIFY_ON_TRUE) */ void SetNotifyMode( NotifyMode mode ); @@ -176,7 +176,7 @@ public: /** * @brief Gets the result of the last condition check that caused a signal emit, - * useful when using NotifyOnChanged mode and need to know what it changed to. + * useful when using NOTIFY_ON_CHANGED mode and need to know what it changed to. * * @SINCE_1_0.0 * @return whether condition result that triggered last emit was true or false