Move some public apis in toolkit to devel

Change-Id: Id5437c362cfb8ab7c0aa7ce5477aec25ff7025cd

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff17e64..4d45c64 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,7 @@ INCLUDE_DIRECTORIES(
 SET( devel_api_src_dir dali-toolkit/devel-api )\r
 \r
 SET ( SOURCES ${SOURCES}\r
+  ${devel_api_src_dir}/accessibility-manager/accessibility-manager.cpp\r
   ${devel_api_src_dir}/builder/builder.cpp\r
   ${devel_api_src_dir}/builder/json-parser.cpp\r
   ${devel_api_src_dir}/builder/tree-node.cpp\r
@@ -266,7 +267,6 @@ SET( SOURCES ${SOURCES}
   ${public_api_src_dir}/image-loader/async-image-loader.cpp\r
   ${public_api_src_dir}/image-loader/sync-image-loader.cpp\r
   ${public_api_src_dir}/styling/style-manager.cpp\r
-  ${public_api_src_dir}/accessibility-manager/accessibility-manager.cpp\r
   ${public_api_src_dir}/focus-manager/keyboard-focus-manager.cpp\r
   ${public_api_src_dir}/dali-toolkit-version.cpp\r
   ${public_api_src_dir}/enums.cpp\r

diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Control-internal.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Control-internal.cpp
index 74bb7a4..315ccd8 100644 (file)
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Control-internal.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Control-internal.cpp
@@ -25,6 +25,7 @@
 #include <dummy-visual.h>
 #include <../dali-toolkit/dali-toolkit-test-utils/dummy-control.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 #include <dali-toolkit/internal/controls/control/control-debug.h>
 
 

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp
index 25d0149..9ea8bc3 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-AccessibilityManager.cpp
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/accessibility-manager/accessibility-manager.h>
 
 #include <dali-toolkit-test-suite-utils.h>
 #include <toolkit-accessibility-adaptor.h>

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp
index ff0a478..3b1a6f8 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp
@@ -24,6 +24,7 @@
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali/integration-api/events/key-event-integ.h>
 #include <dali/integration-api/events/touch-event-integ.h>
+#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
 #include <dali-toolkit/dali-toolkit.h>
 
 using namespace Dali;

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
index 6b09326..e7b096a 100755 (executable)
--- a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp
@@ -26,6 +26,7 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/public-api/align-enumerations.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visuals/image-visual-actions-devel.h>
 

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
index cdecb16..d6fd3fa 100755 (executable)
--- a/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
@@ -26,6 +26,7 @@
 #include <dali/integration-api/events/key-event-integ.h>
 #include <dali-toolkit/devel-api/focus-manager/keyboard-focus-manager-devel.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp
index 5a2b43f..1d32e33 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp
@@ -21,6 +21,7 @@
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/devel-api/actors/actor-devel.h>
+#include <dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h>
 
 using namespace Dali;
 using namespace Toolkit;

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
index 29807e0..6beeda4 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp
@@ -20,6 +20,7 @@
 #include <sstream>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 
 using namespace Dali;
 using namespace Toolkit;

diff --git a/dali-toolkit/dali-toolkit.h b/dali-toolkit/dali-toolkit.h
index c6fafad..d037d95 100644 (file)
--- a/dali-toolkit/dali-toolkit.h
+++ b/dali-toolkit/dali-toolkit.h
@@ -20,7 +20,6 @@
 
 #include <dali/dali.h>
 
-#include <dali-toolkit/public-api/controls/alignment/alignment.h>
 #include <dali-toolkit/public-api/controls/buttons/button.h>
 #include <dali-toolkit/public-api/controls/buttons/check-box-button.h>
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
@@ -31,7 +30,6 @@
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
 #include <dali-toolkit/public-api/controls/model3d-view/model3d-view.h>
 #include <dali-toolkit/public-api/controls/progress-bar/progress-bar.h>
-#include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout-property.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>
@@ -44,7 +42,6 @@
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 #include <dali-toolkit/public-api/controls/slider/slider.h>
-#include <dali-toolkit/public-api/controls/table-view/table-view.h>
 #include <dali-toolkit/public-api/controls/text-controls/hidden-input-properties.h>
 #include <dali-toolkit/public-api/controls/text-controls/placeholder-properties.h>
 #include <dali-toolkit/public-api/controls/text-controls/text-editor.h>
@@ -55,8 +52,6 @@
 #include <dali-toolkit/public-api/image-loader/async-image-loader.h>
 #include <dali-toolkit/public-api/image-loader/sync-image-loader.h>
 
-#include <dali-toolkit/public-api/accessibility-manager/accessibility-manager.h>
-
 #include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
 
 #include <dali-toolkit/public-api/styling/style-manager.h>

diff --git a/dali-toolkit/public-api/accessibility-manager/accessibility-manager.cpp b/dali-toolkit/devel-api/accessibility-manager/accessibility-manager.cpp
similarity index 99%
rename from dali-toolkit/public-api/accessibility-manager/accessibility-manager.cpp
rename to dali-toolkit/devel-api/accessibility-manager/accessibility-manager.cpp
index a683838..92f2572 100644 (file)
--- a/dali-toolkit/public-api/accessibility-manager/accessibility-manager.cpp
+++ b/dali-toolkit/devel-api/accessibility-manager/accessibility-manager.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/accessibility-manager/accessibility-manager.h>
+#include <dali-toolkit/devel-api/accessibility-manager/accessibility-manager.h>
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>

diff --git a/dali-toolkit/public-api/accessibility-manager/accessibility-manager.h b/dali-toolkit/devel-api/accessibility-manager/accessibility-manager.h
similarity index 100%
rename from dali-toolkit/public-api/accessibility-manager/accessibility-manager.h
rename to dali-toolkit/devel-api/accessibility-manager/accessibility-manager.h

diff --git a/dali-toolkit/public-api/controls/alignment/alignment.cpp b/dali-toolkit/devel-api/controls/alignment/alignment.cpp
similarity index 97%
rename from dali-toolkit/public-api/controls/alignment/alignment.cpp
rename to dali-toolkit/devel-api/controls/alignment/alignment.cpp
index 6778b63..ad609b8 100644 (file)
--- a/dali-toolkit/public-api/controls/alignment/alignment.cpp
+++ b/dali-toolkit/devel-api/controls/alignment/alignment.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/controls/alignment/alignment.h>
+#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>

diff --git a/dali-toolkit/public-api/controls/alignment/alignment.h b/dali-toolkit/devel-api/controls/alignment/alignment.h
similarity index 100%
rename from dali-toolkit/public-api/controls/alignment/alignment.h
rename to dali-toolkit/devel-api/controls/alignment/alignment.h

diff --git a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp b/dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.cpp
similarity index 98%
rename from dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp
rename to dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.cpp
index b55f29c..784b518 100755 (executable)
--- a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.cpp
+++ b/dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
+#include <dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h>

diff --git a/dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h b/dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h
similarity index 100%
rename from dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h
rename to dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h

diff --git a/dali-toolkit/public-api/controls/table-view/table-view.cpp b/dali-toolkit/devel-api/controls/table-view/table-view.cpp
similarity index 98%
rename from dali-toolkit/public-api/controls/table-view/table-view.cpp
rename to dali-toolkit/devel-api/controls/table-view/table-view.cpp
index 126c254..3054bce 100644 (file)
--- a/dali-toolkit/public-api/controls/table-view/table-view.cpp
+++ b/dali-toolkit/devel-api/controls/table-view/table-view.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali-toolkit/public-api/controls/table-view/table-view.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/table-view/table-view-impl.h>

diff --git a/dali-toolkit/public-api/controls/table-view/table-view.h b/dali-toolkit/devel-api/controls/table-view/table-view.h
similarity index 100%
rename from dali-toolkit/public-api/controls/table-view/table-view.h
rename to dali-toolkit/devel-api/controls/table-view/table-view.h

diff --git a/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h b/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h
index a9ad2e0..e3ec99a 100644 (file)
--- a/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h
+++ b/dali-toolkit/devel-api/controls/tool-bar/tool-bar.h
@@ -22,7 +22,7 @@
 #include <string>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/alignment/alignment.h>
+#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/devel-api/file.list b/dali-toolkit/devel-api/file.list
index 36f0649..5faa5d6 100755 (executable)
--- a/dali-toolkit/devel-api/file.list
+++ b/dali-toolkit/devel-api/file.list
@@ -3,6 +3,7 @@ SET( devel_api_src_dir ${ROOT_SRC_DIR}/dali-toolkit/devel-api )
 
 # Add local source files here
 SET( devel_api_src_files
+  ${devel_api_src_dir}/accessibility-manager/accessibility-manager.cpp
   ${devel_api_src_dir}/asset-manager/asset-manager.cpp
   ${devel_api_src_dir}/builder/base64-encoding.cpp
   ${devel_api_src_dir}/builder/builder.cpp
@@ -11,6 +12,7 @@ SET( devel_api_src_files
   ${devel_api_src_dir}/controls/control-devel.cpp
   ${devel_api_src_dir}/controls/control-wrapper.cpp
   ${devel_api_src_dir}/controls/control-wrapper-impl.cpp
+  ${devel_api_src_dir}/controls/alignment/alignment.cpp
   ${devel_api_src_dir}/controls/bloom-view/bloom-view.cpp
   ${devel_api_src_dir}/controls/bubble-effect/bubble-emitter.cpp
   ${devel_api_src_dir}/controls/buttons/toggle-button.cpp
@@ -24,8 +26,10 @@ SET( devel_api_src_files
   ${devel_api_src_dir}/controls/popup/popup.cpp
   ${devel_api_src_dir}/controls/progress-bar/progress-bar-devel.cpp
   ${devel_api_src_dir}/controls/scene3d-view/scene3d-view.cpp
+  ${devel_api_src_dir}/controls/scroll-bar/scroll-bar.cpp
   ${devel_api_src_dir}/controls/shadow-view/shadow-view.cpp
   ${devel_api_src_dir}/controls/super-blur-view/super-blur-view.cpp
+  ${devel_api_src_dir}/controls/table-view/table-view.cpp
   ${devel_api_src_dir}/controls/text-controls/text-editor-devel.cpp
   ${devel_api_src_dir}/controls/text-controls/text-field-devel.cpp
   ${devel_api_src_dir}/controls/text-controls/text-selection-popup.cpp
@@ -61,6 +65,10 @@ SET( devel_api_header_files
   ${devel_api_src_dir}/toolkit-property-index-ranges.h
 )
 
+SET( devel_api_accessibility-manager_header_files
+  ${devel_api_src_dir}/accessibility-manager/accessibility-manager.h
+)
+
 SET( devel_api_controls_header_files
   ${devel_api_src_dir}/controls/control-depth-index-ranges.h
   ${devel_api_src_dir}/controls/control-devel.h
@@ -68,6 +76,10 @@ SET( devel_api_controls_header_files
   ${devel_api_src_dir}/controls/control-wrapper-impl.h
 )
 
+SET( devel_api_alignment_header_files
+  ${devel_api_src_dir}/controls/alignment/alignment.h
+)
+
 SET( devel_api_bloom_view_header_files
   ${devel_api_src_dir}/controls/bloom-view/bloom-view.h
 )
@@ -121,6 +133,14 @@ SET( devel_api_progress_bar_header_files
   ${devel_api_src_dir}/controls/progress-bar/progress-bar-devel.h
 )
 
+SET( devel_api_scroll_bar_header_files
+  ${devel_api_src_dir}/controls/scroll-bar/scroll-bar.h
+)
+
+SET( devel_api_table_view_header_files
+  ${devel_api_src_dir}/controls/table-view/table-view.h
+)
+
 SET( devel_api_visual_factory_header_files
   ${devel_api_src_dir}/visual-factory/transition-data.h
   ${devel_api_src_dir}/visual-factory/visual-factory.h
@@ -234,6 +254,8 @@ SET( SOURCES ${SOURCES}
 
 SET( DEVEL_API_HEADERS ${DEVEL_API_HEADERS}
   ${devel_api_header_files}
+  ${devel_api_accessibility-manager_header_files}
+  ${devel_api_alignment_header_files}
   ${devel_api_controls_header_files}
   ${devel_api_bloom_view_header_files}
   ${devel_api_bubble_emitter_header_files}
@@ -246,6 +268,8 @@ SET( DEVEL_API_HEADERS ${DEVEL_API_HEADERS}
   ${devel_api_page_turn_view_header_files}
   ${devel_api_popup_header_files}
   ${devel_api_progress_bar_header_files}
+  ${devel_api_scroll_bar_header_files}
+  ${devel_api_table_view_header_files}
   ${devel_api_visual_factory_header_files}
   ${devel_api_visuals_header_files}
   ${devel_api_scene3d_view_header_files}

diff --git a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
index 5c518fd..4a3d9fd 100644 (file)
--- a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
+++ b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
@@ -27,7 +27,7 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/accessibility-manager/accessibility-manager.h>
+#include <dali-toolkit/devel-api/accessibility-manager/accessibility-manager.h>
 #include <dali/public-api/adaptor-framework/tts-player.h>
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/alignment/alignment-impl.h b/dali-toolkit/internal/controls/alignment/alignment-impl.h
index 83f5301..7145781 100644 (file)
--- a/dali-toolkit/internal/controls/alignment/alignment-impl.h
+++ b/dali-toolkit/internal/controls/alignment/alignment-impl.h
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/alignment/alignment.h>
+#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.h b/dali-toolkit/internal/controls/buttons/radio-button-impl.h
index 944162b..3923d99 100644 (file)
--- a/dali-toolkit/internal/controls/buttons/radio-button-impl.h
+++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.h
@@ -23,7 +23,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/buttons/radio-button.h>
-#include <dali-toolkit/public-api/controls/table-view/table-view.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 #include "button-impl.h"
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp
index 8cc35df..2941c0e 100644 (file)
--- a/dali-toolkit/internal/controls/popup/popup-impl.cpp
+++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp
@@ -39,7 +39,7 @@
 #include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
-#include <dali-toolkit/public-api/accessibility-manager/accessibility-manager.h>
+#include <dali-toolkit/devel-api/accessibility-manager/accessibility-manager.h>
 #include <dali-toolkit/public-api/visuals/color-visual-properties.h>
 #include <dali-toolkit/public-api/visuals/visual-properties.h>
 #include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>

diff --git a/dali-toolkit/internal/controls/popup/popup-impl.h b/dali-toolkit/internal/controls/popup/popup-impl.h
index 6b2c19a..7903998 100755 (executable)
--- a/dali-toolkit/internal/controls/popup/popup-impl.h
+++ b/dali-toolkit/internal/controls/popup/popup-impl.h
@@ -26,7 +26,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/table-view/table-view.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 #include <dali-toolkit/devel-api/controls/popup/popup.h>
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
index a46808c..e808d83 100755 (executable)
--- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
+++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h
@@ -28,7 +28,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
+#include <dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
index 9e60b84..cb29404 100755 (executable)
--- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
@@ -33,7 +33,7 @@
 #include <dali/devel-api/object/property-helper-devel.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
+#include <dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/default-item-layout-property.h>

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
index c9ed830..71304d6 100755 (executable)
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
@@ -31,7 +31,7 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
+#include <dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-constraints.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-mode.h>

diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
index 2c2829a..8801ae5 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
+++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.h
@@ -26,7 +26,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
+#include <dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h>
 #include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-base-impl.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view-effect.h>

diff --git a/dali-toolkit/internal/controls/table-view/table-view-impl.h b/dali-toolkit/internal/controls/table-view/table-view-impl.h
index 901461f..b9b708f 100755 (executable)
--- a/dali-toolkit/internal/controls/table-view/table-view-impl.h
+++ b/dali-toolkit/internal/controls/table-view/table-view-impl.h
@@ -23,7 +23,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/table-view/table-view.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 #include "array-2d.h"
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
index 5595e18..ba36ad9 100755 (executable)
--- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.h
@@ -25,7 +25,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
+#include <dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h>
 #include <dali-toolkit/public-api/controls/text-controls/text-editor.h>
 #include <dali-toolkit/internal/text/decorator/text-decorator.h>
 #include <dali-toolkit/internal/text/text-control-interface.h>

diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h
index 9db95c6..9625435 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h
@@ -27,7 +27,7 @@
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/buttons/push-button.h>
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
-#include <dali-toolkit/public-api/controls/table-view/table-view.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h>
 

diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.h b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.h
index adaf3b6..5b30dcf 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.h
+++ b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.h
@@ -21,8 +21,8 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
-#include <dali-toolkit/public-api/controls/scroll-bar/scroll-bar.h>
-#include <dali-toolkit/public-api/controls/table-view/table-view.h>
+#include <dali-toolkit/devel-api/controls/scroll-bar/scroll-bar.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 #include <dali-toolkit/devel-api/controls/text-controls/text-selection-toolbar.h>
 
 // EXTERNAL INCLUDES

diff --git a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
index aea6c50..183fde2 100644 (file)
--- a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
+++ b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
@@ -24,7 +24,7 @@
 #include <dali/public-api/object/type-registry-helper.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/alignment/alignment.h>
+#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
index 2d6b981..6f8a82b 100644 (file)
--- a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
+++ b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h
@@ -23,7 +23,7 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/table-view/table-view.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 #include <dali-toolkit/devel-api/controls/tool-bar/tool-bar.h>
 
 namespace Dali

diff --git a/dali-toolkit/internal/controls/tooltip/tooltip.cpp b/dali-toolkit/internal/controls/tooltip/tooltip.cpp
index 34b5482..3df8a04 100644 (file)
--- a/dali-toolkit/internal/controls/tooltip/tooltip.cpp
+++ b/dali-toolkit/internal/controls/tooltip/tooltip.cpp
@@ -27,7 +27,7 @@
 #include <dali/devel-api/scripting/enum-helper.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/table-view/table-view.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 #include <dali-toolkit/public-api/controls/text-controls/text-label.h>
 #include <dali-toolkit/public-api/visuals/visual-properties.h>
 #include <dali-toolkit/devel-api/controls/tooltip/tooltip-properties.h>

diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
index e4eb16b..152b663 100644 (file)
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -40,7 +40,7 @@
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
-#include <dali-toolkit/public-api/accessibility-manager/accessibility-manager.h>
+#include <dali-toolkit/devel-api/accessibility-manager/accessibility-manager.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/public-api/styling/style-manager.h>
 #include <dali-toolkit/devel-api/styling/style-manager-devel.h>

diff --git a/dali-toolkit/public-api/file.list b/dali-toolkit/public-api/file.list
index 3aa3c5b..55ea16d 100644 (file)
--- a/dali-toolkit/public-api/file.list
+++ b/dali-toolkit/public-api/file.list
@@ -5,7 +5,6 @@ SET( public_api_src_dir ${ROOT_SRC_DIR}/dali-toolkit/public-api )
 SET( public_api_src_files
   ${public_api_src_dir}/controls/control-impl.cpp
   ${public_api_src_dir}/controls/control.cpp
-  ${public_api_src_dir}/controls/alignment/alignment.cpp
   ${public_api_src_dir}/controls/buttons/button.cpp
   ${public_api_src_dir}/controls/buttons/check-box-button.cpp
   ${public_api_src_dir}/controls/buttons/push-button.cpp
@@ -14,7 +13,6 @@ SET( public_api_src_files
   ${public_api_src_dir}/controls/image-view/image-view.cpp
   ${public_api_src_dir}/controls/model3d-view/model3d-view.cpp
   ${public_api_src_dir}/controls/progress-bar/progress-bar.cpp
-  ${public_api_src_dir}/controls/scroll-bar/scroll-bar.cpp
   ${public_api_src_dir}/controls/scrollable/item-view/default-item-layout.cpp
   ${public_api_src_dir}/controls/scrollable/item-view/item-layout.cpp
   ${public_api_src_dir}/controls/scrollable/item-view/item-view.cpp
@@ -24,7 +22,6 @@ SET( public_api_src_files
   ${public_api_src_dir}/controls/scrollable/scroll-view/scroll-view.cpp
   ${public_api_src_dir}/controls/scrollable/scrollable.cpp
   ${public_api_src_dir}/controls/slider/slider.cpp
-  ${public_api_src_dir}/controls/table-view/table-view.cpp
   ${public_api_src_dir}/controls/text-controls/text-editor.cpp
   ${public_api_src_dir}/controls/text-controls/text-label.cpp
   ${public_api_src_dir}/controls/text-controls/text-field.cpp
@@ -33,7 +30,6 @@ SET( public_api_src_files
   ${public_api_src_dir}/image-loader/async-image-loader.cpp
   ${public_api_src_dir}/image-loader/sync-image-loader.cpp
   ${public_api_src_dir}/styling/style-manager.cpp
-  ${public_api_src_dir}/accessibility-manager/accessibility-manager.cpp
   ${public_api_src_dir}/focus-manager/keyboard-focus-manager.cpp
   ${public_api_src_dir}/dali-toolkit-version.cpp
   ${public_api_src_dir}/enums.cpp
@@ -53,10 +49,6 @@ SET( public_api_controls_header_files
   ${public_api_src_dir}/controls/control.h
 )
 
-SET( public_api_alignment_header_files
-  ${public_api_src_dir}/controls/alignment/alignment.h
-)
-
 SET( public_api_buttons_header_files
   ${public_api_src_dir}/controls/buttons/button.h
   ${public_api_src_dir}/controls/buttons/check-box-button.h
@@ -99,10 +91,6 @@ SET( public_api_scrollable_header_files
   ${public_api_src_dir}/controls/scrollable/scrollable.h
 )
 
-SET( public_api_scroll_bar_header_files
-  ${public_api_src_dir}/controls/scroll-bar/scroll-bar.h
-)
-
 SET( public_api_scroll_view_header_files
   ${public_api_src_dir}/controls/scrollable/scroll-view/scroll-mode.h
   ${public_api_src_dir}/controls/scrollable/scroll-view/scroll-view-constraints.h
@@ -119,10 +107,6 @@ SET( public_api_styling_header_files
   ${public_api_src_dir}/styling/style-manager.h
 )
 
-SET( public_api_table_view_header_files
-  ${public_api_src_dir}/controls/table-view/table-view.h
-)
-
 SET( public_api_text_controls_header_files
   ${public_api_src_dir}/controls/text-controls/hidden-input-properties.h
   ${public_api_src_dir}/controls/text-controls/placeholder-properties.h
@@ -131,10 +115,6 @@ SET( public_api_text_controls_header_files
   ${public_api_src_dir}/controls/text-controls/text-field.h
 )
 
-SET( public_api_accessibility_manager_header_files
-  ${public_api_src_dir}/accessibility-manager/accessibility-manager.h
-)
-
 SET( public_api_focus_manager_header_files
   ${public_api_src_dir}/focus-manager/keyboard-focus-manager.h
 )
@@ -166,7 +146,6 @@ SET( SOURCES ${SOURCES}
 SET( PUBLIC_API_HEADERS ${PUBLIC_API_HEADERS}
   ${public_api_header_files}
   ${public_api_controls_header_files}
-  ${public_api_alignment_header_files}
   ${public_api_buttons_header_files}
   ${public_api_model3d_view_header_files}
   ${public_api_flex_container_header_files}
@@ -175,13 +154,10 @@ SET( PUBLIC_API_HEADERS ${PUBLIC_API_HEADERS}
   ${public_api_image_loader_header_files}
   ${public_api_progress_bar_header_files}
   ${public_api_scrollable_header_files}
-  ${public_api_scroll_bar_header_files}
   ${public_api_scroll_view_header_files}
   ${public_api_slider_header_files}
   ${public_api_styling_header_files}
-  ${public_api_table_view_header_files}
   ${public_api_text_controls_header_files}
-  ${public_api_accessibility_manager_header_files}
   ${public_api_focus_manager_header_files}
   ${public_api_text_header_files}
   ${public_api_video_view_header_files}