Merge base & optional

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / scrollable / item-view / navigation-layout.cpp

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp b/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp
index 295c2f4..d415d5e 100755 (executable)
--- a/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp
+++ b/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.cpp
@@ -1,25 +1,25 @@
-//
-// 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.
+ *
+ */
 
 #include <algorithm>
 
 #include <dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h>
 using namespace Dali;
 using namespace Dali::Toolkit;
-using namespace std;
 
 namespace // unnamed namespace
 {
@@ -347,8 +347,6 @@ struct NavigationLayout::Impl
   ItemLayout::QuaternionFunction mRotationConstraint[4];
 
   ItemLayout::Vector4Function mColorConstraint;
-
-  NavigationLayout::NavigationSignalV2 mSignalPanV2;/*the signal to notify the application the selected item*/
 };
 
 NavigationLayoutPtr NavigationLayout::New()
@@ -467,7 +465,6 @@ ItemRange NavigationLayout::GetItemsWithinArea(float firstItemPosition, Vector3
   int firstItemIndex = std::max(0.0f, -firstItemPosition -1.0f  );
   int lastItemIndex = std::max(0.0f, -(firstItemPosition) + itemsPerPage );
 
-  mImpl->mSignalPanV2.Emit(lastItemIndex - mImpl->mNumberOfColumns);
   return ItemRange(firstItemIndex , lastItemIndex );
 }
 
@@ -541,11 +538,6 @@ bool NavigationLayout::GetVisibilityConstraint(unsigned int itemId, ItemLayout::
   return true;
 }
 
-NavigationLayout::NavigationSignalV2& NavigationLayout::PanSignal()
-{
-  return mImpl->mSignalPanV2;
-}
-
 Degree NavigationLayout::GetScrollDirection() const
 {
   Degree scrollDirection(0);