X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Ftransition-effects%2Fcube-transition-cross-effect.h;h=a9ff0c3051f46ff1ae1836848e5fcf8865f806c0;hb=7d111072958166af00faf617d329537b3d992a88;hp=79828b83b5e87fc3b7c6541c2860d9baa61ae88d;hpb=e2eda444afbe82e9591fe198eef339227f90a616;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h b/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h index 79828b8..a9ff0c3 100644 --- a/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h +++ b/dali-toolkit/public-api/transition-effects/cube-transition-cross-effect.h @@ -1,25 +1,26 @@ #ifndef __DALI_TOOLKIT_CUBE_TRANSITION_CROSS_EFFECT_H__ #define __DALI_TOOLKIT_CUBE_TRANSITION_CROSS_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) 2014 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 perpendicular directions to transite from one image to another */ -class CubeTransitionCrossEffect : public CubeTransitionEffect +class DALI_IMPORT_API CubeTransitionCrossEffect : 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 */ - CubeTransitionCrossEffect( Internal::CubeTransitionCrossEffect* impl ); + explicit DALI_INTERNAL CubeTransitionCrossEffect( Internal::CubeTransitionCrossEffect* impl ); }; // class CubeTransitionCrossEffect