From 027086a7150b7b8d78c5f079dc172e0a14bca7af Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Thu, 3 Sep 2020 14:40:30 +0100 Subject: [PATCH] Remove use of deprecated Control flag REQUIRES_STYLE_CHANGE_SIGNALS Change-Id: Ic99cbf5d597c659fefc44b943109f50d311445ae --- examples/simple-visuals-control/my-control-impl.cpp | 4 ++-- examples/styling/image-channel-control-impl.cpp | 2 +- examples/text-label/expanding-buttons-impl.cpp | 4 ++-- examples/transitions/shadow-button-impl.cpp | 2 +- examples/visual-transitions/beat-control-impl.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/simple-visuals-control/my-control-impl.cpp b/examples/simple-visuals-control/my-control-impl.cpp index 995259b..84e0acd 100644 --- a/examples/simple-visuals-control/my-control-impl.cpp +++ b/examples/simple-visuals-control/my-control-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -62,7 +62,7 @@ DALI_ENUM_TO_STRING_TABLE_END( VISUAL_PROPERTIES ) Internal::MyControl::MyControl() -: Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ) +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ) { } diff --git a/examples/styling/image-channel-control-impl.cpp b/examples/styling/image-channel-control-impl.cpp index f494cc4..40065ce 100644 --- a/examples/styling/image-channel-control-impl.cpp +++ b/examples/styling/image-channel-control-impl.cpp @@ -68,7 +68,7 @@ DALI_TYPE_REGISTRATION_END(); Internal::ImageChannelControl::ImageChannelControl() -: Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ), +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), mChannels( 1.0f, 1.0f, 1.0f ), mChannelIndex( Property::INVALID_INDEX ), mVisibility(true), diff --git a/examples/text-label/expanding-buttons-impl.cpp b/examples/text-label/expanding-buttons-impl.cpp index a4892a8..73003fc 100644 --- a/examples/text-label/expanding-buttons-impl.cpp +++ b/examples/text-label/expanding-buttons-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -52,7 +52,7 @@ void ResetControls( std::vector< WeakHandle< Control > > controls, unsigned int Internal::ExpandingButtons::ExpandingButtons() -: Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ), +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), mStyleButtonsHidden( false ) { } diff --git a/examples/transitions/shadow-button-impl.cpp b/examples/transitions/shadow-button-impl.cpp index 4b48e92..51867d6 100644 --- a/examples/transitions/shadow-button-impl.cpp +++ b/examples/transitions/shadow-button-impl.cpp @@ -80,7 +80,7 @@ Toolkit::TransitionData ConvertPropertyToTransition( const Property::Value& valu Internal::ShadowButton::ShadowButton() -: Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ), +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), mCheckState(false), mActiveState(false) { diff --git a/examples/visual-transitions/beat-control-impl.cpp b/examples/visual-transitions/beat-control-impl.cpp index 47f2e47..956fe11 100644 --- a/examples/visual-transitions/beat-control-impl.cpp +++ b/examples/visual-transitions/beat-control-impl.cpp @@ -75,7 +75,7 @@ Toolkit::TransitionData ConvertPropertyToTransition( const Property::Value& valu Internal::BeatControl::BeatControl() -: Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ), +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), mTransformSize(1.0f, 1.0f), mTransformOrigin(Align::CENTER), mTransformAnchorPoint(Align::CENTER), -- 2.7.4