Merge "Remove obsolete and non functional SizeChanged signal from actor" into tizen

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

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h b/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h
index 050827b..eb49a07 100755 (executable)
--- a/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h
+++ b/dali-toolkit/public-api/controls/scrollable/item-view/navigation-layout.h
@@ -1,27 +1,27 @@
 #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 <dali/dali.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>
 
-namespace Dali DALI_IMPORT_API
+namespace Dali
 {
 namespace Toolkit
 {
@@ -32,7 +32,7 @@ typedef IntrusivePtr<NavigationLayout> NavigationLayoutPtr;
 /**
  * An ItemView layout which arranges items in navigation mode.
  */
-class NavigationLayout: public ItemLayout
+class DALI_IMPORT_API NavigationLayout: public ItemLayout
 {
 public:
 
@@ -43,11 +43,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 +53,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.
    */