X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Ftransition-effects%2Fcube-transition-fold-effect.h;h=44c9871cb85af9c2692214e448e087ef8bab8575;hb=c62063a98f6870f4ba10ef6945a9ced75eeced0e;hp=b2ca86f62c52b0184385f3b9e99d759010cb3522;hpb=e2eda444afbe82e9591fe198eef339227f90a616;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h b/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h index b2ca86f..44c9871 100644 --- a/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h +++ b/dali-toolkit/public-api/transition-effects/cube-transition-fold-effect.h @@ -1,25 +1,26 @@ #ifndef __DALI_TOOLKIT_CUBE_TRANSITION_FOLD_EFFECT_H__ #define __DALI_TOOLKIT_CUBE_TRANSITION_FOLD_EFFECT_H__ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * Copyright (c) 2015 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ // INTERNAL INCLUDES #include -namespace Dali DALI_IMPORT_API +namespace Dali { namespace Toolkit @@ -38,7 +39,7 @@ namespace Internal DALI_INTERNAL * SubClass of CubeTransitionEffect * Rotate the neighboring cubes in opposite directions to transite from one image to another */ -class CubeTransitionFoldEffect : public CubeTransitionEffect +class DALI_IMPORT_API CubeTransitionFoldEffect : public CubeTransitionEffect { public: @@ -59,7 +60,7 @@ public: // Not intended for developer use * This constructor is used by Dali New() methods. * @param [in] impl A pointer to a newly allocated Dali resource */ - CubeTransitionFoldEffect( Internal::CubeTransitionFoldEffect* impl ); + explicit DALI_INTERNAL CubeTransitionFoldEffect( Internal::CubeTransitionFoldEffect* impl ); }; // class CubeTransitionFoldEffect