X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fitem-view%2Fnavigation-layout.h;h=8fe02cc8e3b03b4faaea6868accd876fe33cc015;hp=050827bfc037db671db71599e3fe038b80475071;hb=d9422274305180b56ab8c17fc87c8fda8cfea68b;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h b/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h index 050827b..8fe02cc 100755 --- a/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h +++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h @@ -1,21 +1,22 @@ #ifndef __DALI_TOOLKIT_NAVIGATION_LAYOUT_H__ #define __DALI_TOOLKIT_NAVIGATION_LAYOUT_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 @@ -43,11 +44,6 @@ public: const float sideMargin)> ResizeFunction; /** - * @deprecated This should not have been added to an ItemLayout - */ - typedef SignalV2< void (int) > NavigationSignalV2; - - /** * Create a new navigation layout */ static NavigationLayoutPtr New(); @@ -58,11 +54,6 @@ public: virtual ~NavigationLayout(); /** - * Get the pan signal - */ - NavigationSignalV2& PanSignal(); - - /** * Set the number of columns in the layout. * @param[in] columns The number of columns. */