From ed5acca7e37ed03c0a2c94b698cc586574815c9d Mon Sep 17 00:00:00 2001 From: Xiangyin Ma Date: Fri, 22 May 2015 17:12:55 +0100 Subject: [PATCH] (Orientation) Move to devel-api Change-Id: I0e83b756bb5ad7c4c09e68a4508d74d6c4290070 --- adaptors/common/window-impl.h | 5 ----- .../{public-api => devel-api}/adaptor-framework/orientation.cpp | 0 adaptors/{public-api => devel-api}/adaptor-framework/orientation.h | 2 +- adaptors/devel-api/file.list | 2 ++ adaptors/public-api/adaptor-framework/window.cpp | 6 ------ adaptors/public-api/adaptor-framework/window.h | 5 ----- adaptors/public-api/dali.h | 1 - adaptors/public-api/file.list | 2 -- adaptors/wayland/window-impl-wl.cpp | 5 ----- adaptors/x11/window-impl-x.cpp | 5 ----- 10 files changed, 3 insertions(+), 30 deletions(-) rename adaptors/{public-api => devel-api}/adaptor-framework/orientation.cpp (100%) rename adaptors/{public-api => devel-api}/adaptor-framework/orientation.h (97%) diff --git a/adaptors/common/window-impl.h b/adaptors/common/window-impl.h index 242b213..3d63919 100644 --- a/adaptors/common/window-impl.h +++ b/adaptors/common/window-impl.h @@ -117,11 +117,6 @@ public: void Activate(); /** - * @copydoc Dali::Window::GetOrientation() - */ - OrientationPtr GetOrientation(); - - /** * @copydoc Dali::Window::AddAvailableOrientation() */ void AddAvailableOrientation(Dali::Window::WindowOrientation orientation); diff --git a/adaptors/public-api/adaptor-framework/orientation.cpp b/adaptors/devel-api/adaptor-framework/orientation.cpp similarity index 100% rename from adaptors/public-api/adaptor-framework/orientation.cpp rename to adaptors/devel-api/adaptor-framework/orientation.cpp diff --git a/adaptors/public-api/adaptor-framework/orientation.h b/adaptors/devel-api/adaptor-framework/orientation.h similarity index 97% rename from adaptors/public-api/adaptor-framework/orientation.h rename to adaptors/devel-api/adaptor-framework/orientation.h index b7dac0e..603063a 100644 --- a/adaptors/public-api/adaptor-framework/orientation.h +++ b/adaptors/devel-api/adaptor-framework/orientation.h @@ -107,7 +107,7 @@ public: public: // Not intended for application developers /** - * @brief This constructor is used by Dali::Application::GetOrientation(). + * @brief Helper function. * * @param[in] orientation A pointer to the orientation object */ diff --git a/adaptors/devel-api/file.list b/adaptors/devel-api/file.list index e5035d5..3164ccf 100644 --- a/adaptors/devel-api/file.list +++ b/adaptors/devel-api/file.list @@ -9,6 +9,7 @@ devel_api_src_files = \ $(adaptor_devel_api_dir)/adaptor-framework/event-feeder.cpp \ $(adaptor_devel_api_dir)/adaptor-framework/haptic-player.cpp \ $(adaptor_devel_api_dir)/adaptor-framework/imf-manager.cpp \ + $(adaptor_devel_api_dir)/adaptor-framework/orientation.cpp \ $(adaptor_devel_api_dir)/adaptor-framework/performance-logger.cpp \ $(adaptor_devel_api_dir)/adaptor-framework/physical-keyboard.cpp \ $(adaptor_devel_api_dir)/adaptor-framework/singleton-service.cpp \ @@ -35,6 +36,7 @@ devel_api_adaptor_framework_header_files = \ $(adaptor_devel_api_dir)/adaptor-framework/haptic-player.h \ $(adaptor_devel_api_dir)/adaptor-framework/imf-manager.h \ $(adaptor_devel_api_dir)/adaptor-framework/lifecycle-controller.h \ + $(adaptor_devel_api_dir)/adaptor-framework/orientation.h \ $(adaptor_devel_api_dir)/adaptor-framework/performance-logger.h \ $(adaptor_devel_api_dir)/adaptor-framework/render-surface.h \ $(adaptor_devel_api_dir)/adaptor-framework/singleton-service.h \ diff --git a/adaptors/public-api/adaptor-framework/window.cpp b/adaptors/public-api/adaptor-framework/window.cpp index c490f76..f6e11e3 100644 --- a/adaptors/public-api/adaptor-framework/window.cpp +++ b/adaptors/public-api/adaptor-framework/window.cpp @@ -90,12 +90,6 @@ void Window::Activate() GetImplementation(*this).Activate(); } -Orientation Window::GetOrientation() -{ - Internal::Adaptor::OrientationPtr orientation = GetImplementation(*this).GetOrientation(); - return Orientation(orientation.Get()); -} - void Window::AddAvailableOrientation( WindowOrientation orientation ) { GetImplementation(*this).AddAvailableOrientation( orientation ); diff --git a/adaptors/public-api/adaptor-framework/window.h b/adaptors/public-api/adaptor-framework/window.h index bd18fcc..b181bdf 100644 --- a/adaptors/public-api/adaptor-framework/window.h +++ b/adaptors/public-api/adaptor-framework/window.h @@ -172,11 +172,6 @@ public: void Activate(); /** - * @brief Get the orientation class ( to allow signal connection ). - */ - Orientation GetOrientation(); - - /** * @brief Add an orientation to the list of available orientations. */ void AddAvailableOrientation( WindowOrientation orientation ); diff --git a/adaptors/public-api/dali.h b/adaptors/public-api/dali.h index 35d51b6..8085207 100644 --- a/adaptors/public-api/dali.h +++ b/adaptors/public-api/dali.h @@ -22,7 +22,6 @@ // Application / UI Framework adaption #include -#include #include #include #include diff --git a/adaptors/public-api/file.list b/adaptors/public-api/file.list index e254dd1..30121df 100644 --- a/adaptors/public-api/file.list +++ b/adaptors/public-api/file.list @@ -1,7 +1,6 @@ public_api_src_files = \ $(adaptor_public_api_dir)/adaptor-framework/application.cpp \ $(adaptor_public_api_dir)/adaptor-framework/key.cpp \ - $(adaptor_public_api_dir)/adaptor-framework/orientation.cpp \ $(adaptor_public_api_dir)/adaptor-framework/window.cpp \ $(adaptor_public_api_dir)/adaptor-framework/timer.cpp \ $(adaptor_public_api_dir)/adaptor-framework/pixmap-image.cpp \ @@ -17,7 +16,6 @@ public_api_adaptor_framework_header_files = \ $(adaptor_public_api_dir)/adaptor-framework/application-configuration.h \ $(adaptor_public_api_dir)/adaptor-framework/input-method.h \ $(adaptor_public_api_dir)/adaptor-framework/key.h \ - $(adaptor_public_api_dir)/adaptor-framework/orientation.h \ $(adaptor_public_api_dir)/adaptor-framework/style-change.h \ $(adaptor_public_api_dir)/adaptor-framework/timer.h \ $(adaptor_public_api_dir)/adaptor-framework/pixmap-image.h \ diff --git a/adaptors/wayland/window-impl-wl.cpp b/adaptors/wayland/window-impl-wl.cpp index f0539c7..9f2ef45 100644 --- a/adaptors/wayland/window-impl-wl.cpp +++ b/adaptors/wayland/window-impl-wl.cpp @@ -408,11 +408,6 @@ void Window::OnDestroy() mAdaptor = NULL; } -OrientationPtr Window::GetOrientation() -{ - return mOrientation; -} - void Window::AddAvailableOrientation(Dali::Window::WindowOrientation orientation) { bool found = false; diff --git a/adaptors/x11/window-impl-x.cpp b/adaptors/x11/window-impl-x.cpp index 68ef4b7..dca0fb1 100644 --- a/adaptors/x11/window-impl-x.cpp +++ b/adaptors/x11/window-impl-x.cpp @@ -605,11 +605,6 @@ void Window::OnDestroy() mAdaptor = NULL; } -OrientationPtr Window::GetOrientation() -{ - return mOrientation; -} - void Window::AddAvailableOrientation(Dali::Window::WindowOrientation orientation) { bool found = false; -- 2.7.4