X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=optional%2Fdali-toolkit%2Finternal%2Fcontrols%2Fbubble-effect%2Fbubble-emitter-impl.h;h=d5ad2b03a55ae2cfcd1d79a64da76c882b1707c0;hp=5a42bc71c498e0fac23b6984de4ab4198b54f2e4;hb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e diff --git a/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h b/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h index 5a42bc7..d5ad2b0 100644 --- a/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h +++ b/optional/dali-toolkit/internal/controls/bubble-effect/bubble-emitter-impl.h @@ -1,21 +1,22 @@ #ifndef __DALI_TOOLKIT_INTERNAL_BUBBLE_EMITTER_IMPL_H__ #define __DALI_TOOLKIT_INTERNAL_BUBBLE_EMITTER_IMPL_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 @@ -37,7 +38,7 @@ namespace Internal /** * BubbleEmitter implementation class. */ -class BubbleEmitter : public ControlImpl +class BubbleEmitter : public Control { public: