From 2b4be89fbaad622c93c957ad425a485ba0cc8bd4 Mon Sep 17 00:00:00 2001 From: Agnelo Vaz Date: Tue, 26 May 2015 13:45:15 +0100 Subject: [PATCH] Move TextSelectionPopup from public to devel Change-Id: I67ed206d8083606ba5435c502e668414095bd9dc Signed-off-by: Agnelo Vaz --- automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopup.cpp | 1 + dali-toolkit/dali-toolkit.h | 1 - .../controls/text-controls/text-selection-popup.cpp | 2 +- .../controls/text-controls/text-selection-popup.h | 0 dali-toolkit/devel-api/file.list | 4 ++++ .../internal/controls/text-controls/text-selection-popup-impl.h | 2 +- dali-toolkit/internal/text/decorator/text-decorator.cpp | 2 +- dali-toolkit/public-api/file.list | 4 +--- 8 files changed, 9 insertions(+), 7 deletions(-) rename dali-toolkit/{public-api => devel-api}/controls/text-controls/text-selection-popup.cpp (95%) rename dali-toolkit/{public-api => devel-api}/controls/text-controls/text-selection-popup.h (100%) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopup.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopup.cpp index d4914f5..b248e01 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopup.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-TextSelectionPopup.cpp @@ -19,6 +19,7 @@ #include #include #include +#include using namespace Dali; using namespace Toolkit; diff --git a/dali-toolkit/dali-toolkit.h b/dali-toolkit/dali-toolkit.h index eeeaa44..9cef6c3 100644 --- a/dali-toolkit/dali-toolkit.h +++ b/dali-toolkit/dali-toolkit.h @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include diff --git a/dali-toolkit/public-api/controls/text-controls/text-selection-popup.cpp b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.cpp similarity index 95% rename from dali-toolkit/public-api/controls/text-controls/text-selection-popup.cpp rename to dali-toolkit/devel-api/controls/text-controls/text-selection-popup.cpp index 4c55375..f41f667 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-selection-popup.cpp +++ b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.cpp @@ -16,7 +16,7 @@ */ // CLASS HEADER -#include +#include // INTERNAL INCLUDES #include diff --git a/dali-toolkit/public-api/controls/text-controls/text-selection-popup.h b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h similarity index 100% rename from dali-toolkit/public-api/controls/text-controls/text-selection-popup.h rename to dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h diff --git a/dali-toolkit/devel-api/file.list b/dali-toolkit/devel-api/file.list index 5e0a8ff..7a940c1 100755 --- a/dali-toolkit/devel-api/file.list +++ b/dali-toolkit/devel-api/file.list @@ -16,6 +16,7 @@ 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/text-controls/text-selection-popup.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 \ @@ -132,6 +133,9 @@ 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_text_selection_popup_header_files = \ + $(devel_api_src_dir)/controls/text-controls/text-selection-popup.h + devel_api_tool_bar_header_files = \ $(devel_api_src_dir)/controls/tool-bar/tool-bar.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 0753579..892c563 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 @@ -21,7 +21,7 @@ // INTERNAL INCLUDES #include #include -#include +#include // EXTERNAL INCLUDES #include diff --git a/dali-toolkit/internal/text/decorator/text-decorator.cpp b/dali-toolkit/internal/text/decorator/text-decorator.cpp index 7329790..f529f70 100644 --- a/dali-toolkit/internal/text/decorator/text-decorator.cpp +++ b/dali-toolkit/internal/text/decorator/text-decorator.cpp @@ -47,7 +47,7 @@ #include #include #include -#include +#include #ifdef DEBUG_ENABLED #define DECORATOR_DEBUG diff --git a/dali-toolkit/public-api/file.list b/dali-toolkit/public-api/file.list index 3607815..3bd88d8 100755 --- a/dali-toolkit/public-api/file.list +++ b/dali-toolkit/public-api/file.list @@ -22,7 +22,6 @@ public_api_src_files = \ $(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 \ $(public_api_src_dir)/controls/gaussian-blur-view/gaussian-blur-view.cpp \ $(public_api_src_dir)/controls/image-view/masked-image-view.cpp \ $(public_api_src_dir)/focus-manager/focus-manager.cpp \ @@ -83,8 +82,7 @@ public_api_table_view_header_files = \ 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 \ - $(public_api_src_dir)/controls/text-controls/text-selection-popup.h + $(public_api_src_dir)/controls/text-controls/text-field.h public_api_focus_manager_header_files = \ $(public_api_src_dir)/focus-manager/focus-manager.h \ -- 2.7.4