From: Adeel Kazmi Date: Thu, 21 May 2015 15:03:22 +0000 (+0100) Subject: (TableView) Move from devel-api to public-api X-Git-Tag: accepted/tizen/common/20150529.134100~19^2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=62c9b7fde35b88ebd422b88d3ca03140e470aa1f;hp=--cc (TableView) Move from devel-api to public-api Change-Id: I0944b508cf4ccbb71e57fd2f28ddd9e598a8e082 --- 62c9b7fde35b88ebd422b88d3ca03140e470aa1f diff --git a/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp index e58375a..05f0e26 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp @@ -24,7 +24,6 @@ #include #include -#include using namespace Dali; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp index 6d7b2bf..45dd92c 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TableView.cpp @@ -19,7 +19,6 @@ #include #include #include -#include using namespace Dali; using namespace Toolkit; diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am index 2b4db03..2165644 100644 --- a/build/tizen/dali-toolkit/Makefile.am +++ b/build/tizen/dali-toolkit/Makefile.am @@ -94,15 +94,14 @@ develapipageturnviewdir = $(develapicontrolsdir)/page-turn-view develapisliderdir = $(develapicontrolsdir)/slider develapishadowviewdir = $(develapicontrolsdir)/shadow-view develapisuperblurviewdir = $(develapicontrolsdir)/super-blur-view -develapitableviewdir = $(develapicontrolsdir)/table-view develapiscriptingdir = $(develapidir)/scripting develapibubbleeffectdir = $(develapidir)/shader-effects/bubble-effect develapishadereffectsdir = $(develapidir)/shader-effects develapitransitioneffectsdir = $(develapidir)/transition-effects develapistylingdir = $(develapidir)/styling develapitoolbardir = $(develapicontrolsdir)/tool-bar -# devel headers +# devel headers develapibloomview_HEADERS = $(devel_api_bloom_view_header_files) develapibubbleemitter_HEADERS = $(devel_api_bubble_emitter_header_files) develapibubbleeffect_HEADERS = $(devel_api_bubble_effect_header_files) @@ -117,12 +116,10 @@ develapishadereffects_HEADERS = $(devel_api_shader_effects_header_files) develapislider_HEADERS = $(devel_api_slider_header_files) develapistyling_HEADERS = $(devel_api_styling_header_files) develapisuperblurview_HEADERS = $(devel_api_super_blur_view_header_files) -develapitableview_HEADERS = $(devel_api_table_view_header_files) develapitoolbar_HEADERS = $(devel_api_tool_bar_header_files) develapitransitioneffects_HEADERS = $(devel_api_transition_effects_header_files) # public api source - publicapidir = $(topleveldir)/public-api publicapicontrolsdir = $(publicapidir)/controls publicapialignmentdir = $(publicapicontrolsdir)/alignment @@ -134,6 +131,7 @@ publicapiscrollbardir = $(publicapicontrolsdir)/scroll-bar publicapiscrollabledir = $(publicapicontrolsdir)/scrollable publicapiscrollviewdir = $(publicapicontrolsdir)/scrollable/scroll-view publicapiitemviewdir = $(publicapicontrolsdir)/scrollable/item-view +publicapitableviewdir = $(publicapicontrolsdir)/table-view publicapitextcontrolsdir = $(publicapicontrolsdir)/text-controls publicapifocusmanagerdir = $(publicapidir)/focus-manager publicapirenderingbackenddir = $(publicapidir)/text @@ -150,6 +148,7 @@ publicapiitemview_HEADERS = $(public_api_item_view_header_files) publicapiscrollbar_HEADERS = $(public_api_scroll_bar_header_files) publicapiscrollable_HEADERS = $(public_api_scrollable_header_files) publicapiscrollview_HEADERS = $(public_api_scroll_view_header_files) +publicapitableview_HEADERS = $(public_api_table_view_header_files) publicapitextcontrols_HEADERS = $(public_api_text_controls_header_files) publicapifocusmanager_HEADERS = $(public_api_focus_manager_header_files) publicapirenderingbackend_HEADERS = $(public_api_rendering_backend_header_files) diff --git a/dali-toolkit/dali-toolkit.h b/dali-toolkit/dali-toolkit.h index 9cf472b..43843a2 100644 --- a/dali-toolkit/dali-toolkit.h +++ b/dali-toolkit/dali-toolkit.h @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include diff --git a/dali-toolkit/devel-api/file.list b/dali-toolkit/devel-api/file.list index 766689c..5e0a8ff 100755 --- a/dali-toolkit/devel-api/file.list +++ b/dali-toolkit/devel-api/file.list @@ -16,7 +16,6 @@ devel_api_src_files = \ $(devel_api_src_dir)/controls/shadow-view/shadow-view.cpp \ $(devel_api_src_dir)/controls/slider/slider.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/tool-bar/tool-bar.cpp \ $(devel_api_src_dir)/styling/style-manager.cpp \ $(devel_api_src_dir)/scripting/script.cpp \ @@ -133,10 +132,6 @@ devel_api_shader_effects_header_files = \ devel_api_super_blur_view_header_files = \ $(devel_api_src_dir)/controls/super-blur-view/super-blur-view.h - -devel_api_table_view_header_files = \ - $(devel_api_src_dir)/controls/table-view/table-view.h - devel_api_tool_bar_header_files = \ $(devel_api_src_dir)/controls/tool-bar/tool-bar.h diff --git a/dali-toolkit/internal/controls/buttons/radio-button-impl.h b/dali-toolkit/internal/controls/buttons/radio-button-impl.h index 00b553c..d525a43 100644 --- a/dali-toolkit/internal/controls/buttons/radio-button-impl.h +++ b/dali-toolkit/internal/controls/buttons/radio-button-impl.h @@ -24,7 +24,7 @@ // INTERNAL INCLUDES #include -#include +#include #include "button-impl.h" namespace Dali diff --git a/dali-toolkit/internal/controls/popup/popup-impl.h b/dali-toolkit/internal/controls/popup/popup-impl.h index 175705d..ccf7ebb 100755 --- a/dali-toolkit/internal/controls/popup/popup-impl.h +++ b/dali-toolkit/internal/controls/popup/popup-impl.h @@ -25,10 +25,10 @@ // INTERNAL INCLUDES #include +#include +#include #include #include -#include -#include namespace Dali { 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 7c773d2..be41e47 100644 --- a/dali-toolkit/internal/controls/table-view/table-view-impl.h +++ b/dali-toolkit/internal/controls/table-view/table-view-impl.h @@ -20,7 +20,7 @@ // INTERNAL INCLUDES #include -#include +#include #include "array-2d.h" namespace Dali 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 2ec6b58..0753579 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h +++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.h @@ -20,7 +20,7 @@ // INTERNAL INCLUDES #include -#include +#include #include // 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 bfa879d..4d7a077 100644 --- a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp +++ b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp @@ -26,7 +26,6 @@ // INTERNAL INCLUDES #include -#include 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 b435139..27f09eb 100644 --- a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h +++ b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.h @@ -23,8 +23,8 @@ // INTERNAL INCLUDES #include +#include #include -#include namespace Dali { diff --git a/dali-toolkit/devel-api/controls/table-view/table-view.cpp b/dali-toolkit/public-api/controls/table-view/table-view.cpp similarity index 98% rename from dali-toolkit/devel-api/controls/table-view/table-view.cpp rename to dali-toolkit/public-api/controls/table-view/table-view.cpp index 959d07a..c92f36e 100644 --- a/dali-toolkit/devel-api/controls/table-view/table-view.cpp +++ b/dali-toolkit/public-api/controls/table-view/table-view.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/devel-api/controls/table-view/table-view.h b/dali-toolkit/public-api/controls/table-view/table-view.h similarity index 100% rename from dali-toolkit/devel-api/controls/table-view/table-view.h rename to dali-toolkit/public-api/controls/table-view/table-view.h diff --git a/dali-toolkit/public-api/file.list b/dali-toolkit/public-api/file.list index e379ad2..c847c53 100755 --- a/dali-toolkit/public-api/file.list +++ b/dali-toolkit/public-api/file.list @@ -21,6 +21,7 @@ public_api_src_files = \ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-path-effect.cpp \ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view.cpp \ $(public_api_src_dir)/controls/scrollable/scrollable.cpp \ + $(public_api_src_dir)/controls/table-view/table-view.cpp \ $(public_api_src_dir)/controls/text-controls/text-label.cpp \ $(public_api_src_dir)/controls/text-controls/text-field.cpp \ $(public_api_src_dir)/controls/text-controls/text-selection-popup.cpp \ @@ -81,6 +82,9 @@ public_api_scroll_view_header_files = \ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-page-path-effect.h \ $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view.h +public_api_table_view_header_files = \ + $(public_api_src_dir)/controls/table-view/table-view.h + public_api_text_controls_header_files = \ $(public_api_src_dir)/controls/text-controls/text-label.h \ $(public_api_src_dir)/controls/text-controls/text-field.h \