X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftransition-effects%2Fcube-transition-cross-effect-impl.h;h=9d6c2d16a6bfa8e94a9a01c6a0b54d45461bb5c0;hp=8f6fda9d1f425846a48e454e78830479f53a479a;hb=73e02f6f3ea83cbdf3d894a7d067c4dafc0ac54d;hpb=ed318176506ba6763f189728d7c14c00e9e0b909 diff --git a/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h b/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h index 8f6fda9..9d6c2d1 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h +++ b/dali-toolkit/internal/transition-effects/cube-transition-cross-effect-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_CROSS_EFFECT_H__ -#define __DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_CROSS_EFFECT_H__ +#ifndef DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_CROSS_EFFECT_H +#define DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_CROSS_EFFECT_H /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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,12 +52,12 @@ protected: /** * @copydoc Toolkit::Internal::CubeTransitionEffect::OnInitialize */ - virtual void OnInitialize(); + void OnInitialize() override; /** * @copydoc Toolkit::Internal::CubeTransitionEffect::OnStartTransition */ - virtual void OnStartTransition( Vector2 panPosition, Vector2 panDisplacement ); + void OnStartTransition( Vector2 panPosition, Vector2 panDisplacement ) override; private: @@ -118,4 +118,4 @@ inline const Internal::CubeTransitionCrossEffect& GetImpl( const Dali::Toolkit:: } // namespace Dali -#endif /* __DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_CROSS_EFFECT_H_ */ +#endif // DALI_TOOLKIT_INTERNAL_CUBE_TRANSITION_CROSS_EFFECT_H