X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fcontrol%2Fcontrol-data-impl.h;h=43cab6948f5bca8dc833a2da88c5ae37be8f2674;hb=0e1683ef848d1d877e26633609fa95e0d2ab36b5;hp=210f6e2ccea3471f9beb7b9f021acdae4018e1f3;hpb=648e3686e41d52a8adfce370156e901369b54716;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/control/control-data-impl.h b/dali-toolkit/internal/controls/control/control-data-impl.h index 210f6e2..43cab69 100755 --- a/dali-toolkit/internal/controls/control/control-data-impl.h +++ b/dali-toolkit/internal/controls/control/control-data-impl.h @@ -125,7 +125,7 @@ public: * @param[in] object The visual whose resources are ready * @note Overriding method in Visual::EventObserver. */ - virtual void ResourceReady( Visual::Base& object ) override; + void ResourceReady( Visual::Base& object ) override; /** * @brief Called when an event occurs. @@ -133,7 +133,7 @@ public: * @param[in] signalId The signal to emit. See Visual to find supported signals * @note Overriding method in Visual::EventObserver. */ - virtual void NotifyVisualEvent( Visual::Base& object, Property::Index signalId ) override; + void NotifyVisualEvent( Visual::Base& object, Property::Index signalId ) override; /** * @copydoc Dali::Toolkit::DevelControl::RegisterVisual() @@ -290,9 +290,9 @@ public: bool IsResourceReady() const; /** - * @copydoc CustomActorImpl::OnStageDisconnection() + * @copydoc CustomActorImpl::OnSceneDisconnection() */ - void OnStageDisconnection(); + void OnSceneDisconnection(); /** * @brief Sets the margin.