(ScrollComponent) Removing unneeded public-api versions of ScrollComponents

[Issue#]   N/A
[Problem]  N/A
[Cause]    N/A
[Solution] N/A

Change-Id: I33f5d4cc11ac85e6989cad71bce08936e96e3838

diff --git a/capi/dali-toolkit/public-api/dali-toolkit-capi-internal.h b/capi/dali-toolkit/public-api/dali-toolkit-capi-internal.h
index 001ab9c..4ad88dd 100644 (file)
--- a/capi/dali-toolkit/public-api/dali-toolkit-capi-internal.h
+++ b/capi/dali-toolkit/public-api/dali-toolkit-capi-internal.h
@@ -28,8 +28,6 @@
 #include <dali-toolkit/public-api/controls/default-controls/push-button-factory.h>
 #include <dali-toolkit/public-api/controls/image-view/masked-image-view.h>
 #include <dali-toolkit/public-api/controls/popup/popup.h>
-#include <dali-toolkit/public-api/controls/scroll-component/scroll-bar.h>
-#include <dali-toolkit/public-api/controls/scroll-component/scroll-component.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>
 #include <dali-toolkit/public-api/controls/scrollable/item-view/item-layout.h>

diff --git a/capi/dali-toolkit/public-api/file.list b/capi/dali-toolkit/public-api/file.list
index d90d79c..d655ee2 100644 (file)
--- a/capi/dali-toolkit/public-api/file.list
+++ b/capi/dali-toolkit/public-api/file.list
@@ -29,9 +29,7 @@ capi_devel_image_view_header_files = \
 capi_devel_popup_header_files = \
   $(capi_devel_src_dir)/controls/popup/popup.h
 
-capi_devel_scroll_component_header_files = \
-  $(capi_devel_src_dir)/controls/scroll-component/scroll-bar.h \
-  $(capi_devel_src_dir)/controls/scroll-component/scroll-component.h
+capi_devel_scroll_component_header_files =
 
 capi_devel_scrollable_header_files = \
   $(capi_devel_src_dir)/controls/scrollable/scrollable.h

diff --git a/dali-toolkit/internal/controls/scroll-component/scroll-bar-impl.h b/dali-toolkit/internal/controls/scroll-component/scroll-bar-impl.h
index f1acd75..30248ca 100755 (executable)
--- a/dali-toolkit/internal/controls/scroll-component/scroll-bar-impl.h
+++ b/dali-toolkit/internal/controls/scroll-component/scroll-bar-impl.h
@@ -20,7 +20,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/controls/scroll-component/scroll-component-impl.h>
 #include <dali-toolkit/internal/controls/scrollable/scrollable-impl.h>
-#include <dali-toolkit/public-api/controls/scroll-component/scroll-bar.h>
+#include <dali-toolkit/internal/controls/scroll-component/scroll-bar.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 namespace Dali

diff --git a/dali-toolkit/public-api/controls/scroll-component/scroll-bar.cpp b/dali-toolkit/internal/controls/scroll-component/scroll-bar.cpp
similarity index 95%
rename from dali-toolkit/public-api/controls/scroll-component/scroll-bar.cpp
rename to dali-toolkit/internal/controls/scroll-component/scroll-bar.cpp
index 226c2ba..7abeb82 100755 (executable)
--- a/dali-toolkit/public-api/controls/scroll-component/scroll-bar.cpp
+++ b/dali-toolkit/internal/controls/scroll-component/scroll-bar.cpp
@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-#include <dali-toolkit/public-api/controls/scroll-component/scroll-bar.h>
+#include <dali-toolkit/internal/controls/scroll-component/scroll-bar.h>
 #include <dali-toolkit/internal/controls/scroll-component/scroll-bar-impl.h>
 
 namespace Dali

diff --git a/capi/dali-toolkit/public-api/controls/scroll-component/scroll-bar.h b/dali-toolkit/internal/controls/scroll-component/scroll-bar.h
similarity index 95%
rename from capi/dali-toolkit/public-api/controls/scroll-component/scroll-bar.h
rename to dali-toolkit/internal/controls/scroll-component/scroll-bar.h
index 4714448..21c4a03 100755 (executable)
--- a/capi/dali-toolkit/public-api/controls/scroll-component/scroll-bar.h
+++ b/dali-toolkit/internal/controls/scroll-component/scroll-bar.h
@@ -17,13 +17,8 @@
 // limitations under the License.
 //
 
-/**
- * @addtogroup CAPI_DALI_FRAMEWORK
- * @{
- */
-
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/scroll-component/scroll-component.h>
+#include <dali-toolkit/internal/controls/scroll-component/scroll-component.h>
 #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 
 namespace Dali DALI_IMPORT_API
@@ -119,7 +114,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_SCROLL_BAR_H__

diff --git a/dali-toolkit/internal/controls/scroll-component/scroll-component-impl.cpp b/dali-toolkit/internal/controls/scroll-component/scroll-component-impl.cpp
index b1299db..ae0a22c 100644 (file)
--- a/dali-toolkit/internal/controls/scroll-component/scroll-component-impl.cpp
+++ b/dali-toolkit/internal/controls/scroll-component/scroll-component-impl.cpp
@@ -16,7 +16,7 @@
 
 // CLASS HEADER
 #include <dali-toolkit/internal/controls/scroll-component/scroll-component-impl.h>
-#include <dali-toolkit/public-api/controls/scroll-component/scroll-bar.h>
+#include <dali-toolkit/internal/controls/scroll-component/scroll-bar.h>
 
 namespace Dali
 {

diff --git a/dali-toolkit/internal/controls/scroll-component/scroll-component-impl.h b/dali-toolkit/internal/controls/scroll-component/scroll-component-impl.h
index a123ad1..cb33df4 100644 (file)
--- a/dali-toolkit/internal/controls/scroll-component/scroll-component-impl.h
+++ b/dali-toolkit/internal/controls/scroll-component/scroll-component-impl.h
@@ -18,8 +18,9 @@
 //
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/scroll-component/scroll-component.h>
+
 #include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali-toolkit/public-api/controls/scroll-component/scroll-component.h>
 #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 
 namespace Dali

diff --git a/dali-toolkit/public-api/controls/scroll-component/scroll-component.cpp b/dali-toolkit/internal/controls/scroll-component/scroll-component.cpp
similarity index 95%
rename from dali-toolkit/public-api/controls/scroll-component/scroll-component.cpp
rename to dali-toolkit/internal/controls/scroll-component/scroll-component.cpp
index c595bba..22e891e 100644 (file)
--- a/dali-toolkit/public-api/controls/scroll-component/scroll-component.cpp
+++ b/dali-toolkit/internal/controls/scroll-component/scroll-component.cpp
@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-#include <dali-toolkit/public-api/controls/scroll-component/scroll-component.h>
+#include <dali-toolkit/internal/controls/scroll-component/scroll-component.h>
 #include <dali-toolkit/internal/controls/scroll-component/scroll-component-impl.h>
 
 namespace Dali

diff --git a/capi/dali-toolkit/public-api/controls/scroll-component/scroll-component.h b/dali-toolkit/internal/controls/scroll-component/scroll-component.h
similarity index 97%
rename from capi/dali-toolkit/public-api/controls/scroll-component/scroll-component.h
rename to dali-toolkit/internal/controls/scroll-component/scroll-component.h
index b1674b7..ce63e64 100644 (file)
--- a/capi/dali-toolkit/public-api/controls/scroll-component/scroll-component.h
+++ b/dali-toolkit/internal/controls/scroll-component/scroll-component.h
@@ -17,11 +17,6 @@
 // limitations under the License.
 //
 
-/**
- * @addtogroup CAPI_DALI_FRAMEWORK
- * @{
- */
-
 // INTERNAL INCLUDES
 #include <dali/dali.h>
 #include <dali-toolkit/public-api/controls/control.h>
@@ -95,7 +90,4 @@ public: // Not intended for application developers
 
 } // namespace Dali
 
-/**
- * @}
- */
 #endif // __DALI_TOOLKIT_SCROLL_COMPONENT_H__

diff --git a/dali-toolkit/internal/file.list b/dali-toolkit/internal/file.list
index 4c6317d..8ab1395 100644 (file)
--- a/dali-toolkit/internal/file.list
+++ b/dali-toolkit/internal/file.list
@@ -34,6 +34,8 @@ toolkit_src_files = \
    $(toolkit_src_dir)/controls/popup/popup-style-impl.cpp \
    $(toolkit_src_dir)/controls/scroll-component/scroll-bar-impl.cpp \
    $(toolkit_src_dir)/controls/scroll-component/scroll-component-impl.cpp \
+   $(toolkit_src_dir)/controls/scroll-component/scroll-bar.cpp \
+   $(toolkit_src_dir)/controls/scroll-component/scroll-component.cpp \
    $(toolkit_src_dir)/controls/scrollable/item-view/item-view-impl.cpp \
    $(toolkit_src_dir)/controls/scrollable/scrollable-impl.cpp \
    $(toolkit_src_dir)/controls/scrollable/scroll-view/scroll-base-impl.cpp \

diff --git a/dali-toolkit/public-api/file.list b/dali-toolkit/public-api/file.list
index dc82d05..2debf20 100755 (executable)
--- a/dali-toolkit/public-api/file.list
+++ b/dali-toolkit/public-api/file.list
@@ -24,8 +24,6 @@ public_api_src_files = \
   $(public_api_src_dir)/controls/page-turn-view/page-turn-portrait-view.cpp \
   $(public_api_src_dir)/controls/page-turn-view/page-turn-landscape-view.cpp \
   $(public_api_src_dir)/controls/popup/popup.cpp \
-  $(public_api_src_dir)/controls/scroll-component/scroll-bar.cpp \
-  $(public_api_src_dir)/controls/scroll-component/scroll-component.cpp \
   $(public_api_src_dir)/controls/scrollable/item-view/item-factory.cpp \
   $(public_api_src_dir)/controls/scrollable/item-view/item-layout.cpp \
   $(public_api_src_dir)/controls/scrollable/item-view/item-view.cpp \