X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=optional%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Fselectors%2Frotating-selector.h;h=b7514272ab3357016f30f251ce1534ccef991f51;hb=42eeffaa69044c2236996eb543416486ae92335c;hp=b42943475308a8b1b92b3705ddb06aa2eba0c8c9;hpb=e58fa784d19a558e35f458ecf6d262a2344beb4f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/optional/dali-toolkit/public-api/controls/selectors/rotating-selector.h b/optional/dali-toolkit/public-api/controls/selectors/rotating-selector.h index b429434..b751427 100644 --- a/optional/dali-toolkit/public-api/controls/selectors/rotating-selector.h +++ b/optional/dali-toolkit/public-api/controls/selectors/rotating-selector.h @@ -1,27 +1,27 @@ #ifndef __DALI_TOOLKIT_CUSTOM_CHECK_ACTOR_H__ #define __DALI_TOOLKIT_CUSTOM_CHECK_ACTOR_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 #include -namespace Dali DALI_IMPORT_API +namespace Dali { namespace Toolkit @@ -36,7 +36,7 @@ class RotatingSelector; * RotatingSelector is a simple control to switch between two states (selected/unselected). A signal is emitted when the selector switches between * the two states. The control has two faces one behind the other, The control is rotated while switching between the two states */ -class RotatingSelector : public Control +class DALI_IMPORT_API RotatingSelector : public Control { public: //Signal Names @@ -61,8 +61,9 @@ public: RotatingSelector& operator=( const RotatingSelector& rotatingSelector ); /** - * Virtual destructor. - * Dali::Object derived classes typically do not contain member data. + * @brief Destructor + * + * This is non-virtual since derived Handle types must not contain data or virtual methods. */ ~RotatingSelector(); @@ -144,13 +145,13 @@ public: // Not intended for application developers * Creates a handle using the Toolkit::Internal implementation. * @param[in] implementation The Control implementation. */ - RotatingSelector( Internal::RotatingSelector& implementation ); + DALI_INTERNAL RotatingSelector( Internal::RotatingSelector& implementation ); /** * Allows the creation of this Control from an Internal::CustomActor pointer. * @param[in] internal A pointer to the internal CustomActor. */ - RotatingSelector( Dali::Internal::CustomActor* internal ); + explicit DALI_INTERNAL RotatingSelector( Dali::Internal::CustomActor* internal ); }; } // namespace Toolkit