From c5ac345f99d4bf327f2f4425019e006c3bb184c2 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Wed, 9 Sep 2020 14:55:04 +0900 Subject: [PATCH] [Tizen] Add deprecated logs to Adaptor and Application - DALi projects are deprecated now, so added deprecated logs to major classes. Change-Id: Id1874a9909adff9b3b4e5227732e2a62b17404e2 Signed-off-by: Seoyeon Kim --- dali/internal/adaptor/common/adaptor.cpp | 10 ++++++++++ dali/public-api/adaptor-framework/application.cpp | 7 +++++++ dali/public-api/adaptor-framework/application.h | 12 ++++++++++++ doc/dali-adaptor-doc.h | 2 +- 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dali/internal/adaptor/common/adaptor.cpp b/dali/internal/adaptor/common/adaptor.cpp index 9551d82..74c7773 100755 --- a/dali/internal/adaptor/common/adaptor.cpp +++ b/dali/internal/adaptor/common/adaptor.cpp @@ -34,11 +34,13 @@ namespace Dali Adaptor& Adaptor::New( Window window ) { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: DALi is deprecated and will be removed from next version. Please use NUI(C# interface of DALi).\n For more information on NUI, see the NUI quick start page : https://docs.tizen.org/application/dotnet/get-started/nui/quickstart/ \n" ); return New( window, Configuration::APPLICATION_DOES_NOT_HANDLE_CONTEXT_LOSS ); } Adaptor& Adaptor::New( Window window, Configuration::ContextLoss configuration ) { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: DALi is deprecated and will be removed from next version. Please use NUI(C# interface of DALi).\n For more information on NUI, see the NUI quick start page : https://docs.tizen.org/application/dotnet/get-started/nui/quickstart/ \n" ); Internal::Adaptor::SceneHolder* sceneHolder = &Dali::GetImplementation( window ); Adaptor* adaptor = Internal::Adaptor::Adaptor::New( Dali::Integration::SceneHolder( sceneHolder ), configuration, NULL ); return *adaptor; @@ -46,11 +48,13 @@ Adaptor& Adaptor::New( Window window, Configuration::ContextLoss configuration ) Adaptor& Adaptor::New( Window window, const Dali::RenderSurfaceInterface& surface ) { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: DALi is deprecated and will be removed from next version. Please use NUI(C# interface of DALi).\n For more information on NUI, see the NUI quick start page : https://docs.tizen.org/application/dotnet/get-started/nui/quickstart/ \n" ); return New( window, surface, Configuration::APPLICATION_DOES_NOT_HANDLE_CONTEXT_LOSS ); } Adaptor& Adaptor::New( Window window, const Dali::RenderSurfaceInterface& surface, Configuration::ContextLoss configuration ) { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: DALi is deprecated and will be removed from next version. Please use NUI(C# interface of DALi).\n For more information on NUI, see the NUI quick start page : https://docs.tizen.org/application/dotnet/get-started/nui/quickstart/ \n" ); Internal::Adaptor::SceneHolder* sceneHolder = &Dali::GetImplementation( window ); Dali::RenderSurfaceInterface* pSurface = const_cast(&surface); Adaptor* adaptor = Internal::Adaptor::Adaptor::New( Dali::Integration::SceneHolder( sceneHolder ), pSurface, configuration, NULL ); @@ -59,22 +63,26 @@ Adaptor& Adaptor::New( Window window, const Dali::RenderSurfaceInterface& surfac Adaptor& Adaptor::New( Dali::Integration::SceneHolder window ) { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: DALi is deprecated and will be removed from next version. Please use NUI(C# interface of DALi).\n For more information on NUI, see the NUI quick start page : https://docs.tizen.org/application/dotnet/get-started/nui/quickstart/ \n" ); return New( window, Configuration::APPLICATION_DOES_NOT_HANDLE_CONTEXT_LOSS ); } Adaptor& Adaptor::New( Dali::Integration::SceneHolder window, Configuration::ContextLoss configuration ) { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: DALi is deprecated and will be removed from next version. Please use NUI(C# interface of DALi).\n For more information on NUI, see the NUI quick start page : https://docs.tizen.org/application/dotnet/get-started/nui/quickstart/ \n" ); Adaptor* adaptor = Internal::Adaptor::Adaptor::New( window, configuration, NULL ); return *adaptor; } Adaptor& Adaptor::New( Dali::Integration::SceneHolder window, const Dali::RenderSurfaceInterface& surface ) { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: DALi is deprecated and will be removed from next version. Please use NUI(C# interface of DALi).\n For more information on NUI, see the NUI quick start page : https://docs.tizen.org/application/dotnet/get-started/nui/quickstart/ \n" ); return New( window, surface, Configuration::APPLICATION_DOES_NOT_HANDLE_CONTEXT_LOSS ); } Adaptor& Adaptor::New( Dali::Integration::SceneHolder window, const Dali::RenderSurfaceInterface& surface, Configuration::ContextLoss configuration ) { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: DALi is deprecated and will be removed from next version. Please use NUI(C# interface of DALi).\n For more information on NUI, see the NUI quick start page : https://docs.tizen.org/application/dotnet/get-started/nui/quickstart/ \n" ); Dali::RenderSurfaceInterface* pSurface = const_cast(&surface); Adaptor* adaptor = Internal::Adaptor::Adaptor::New( window, pSurface, configuration, NULL ); return *adaptor; @@ -87,6 +95,7 @@ Adaptor::~Adaptor() void Adaptor::Start() { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: DALi is deprecated and will be removed from next version. Please use NUI(C# interface of DALi).\n For more information on NUI, see the NUI quick start page : https://docs.tizen.org/application/dotnet/get-started/nui/quickstart/ \n" ); mImpl->Start(); } @@ -192,6 +201,7 @@ void Adaptor::SetPreRenderCallback( CallbackBase* callback ) Adaptor& Adaptor::Get() { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: DALi is deprecated and will be removed from next version. Please use NUI(C# interface of DALi).\n For more information on NUI, see the NUI quick start page : https://docs.tizen.org/application/dotnet/get-started/nui/quickstart/ \n" ); return Internal::Adaptor::Adaptor::Get(); } diff --git a/dali/public-api/adaptor-framework/application.cpp b/dali/public-api/adaptor-framework/application.cpp index 8aa2318..5f5882c 100644 --- a/dali/public-api/adaptor-framework/application.cpp +++ b/dali/public-api/adaptor-framework/application.cpp @@ -29,11 +29,13 @@ namespace Dali Application Application::New() { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: DALi is deprecated and will be removed from next version. Please use NUI(C# interface of DALi).\n For more information on NUI, see the NUI quick start page : https://docs.tizen.org/application/dotnet/get-started/nui/quickstart/ \n" ); return New( NULL, NULL ); } Application Application::New( int* argc, char **argv[] ) { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: DALi is deprecated and will be removed from next version. Please use NUI(C# interface of DALi).\n For more information on NUI, see the NUI quick start page : https://docs.tizen.org/application/dotnet/get-started/nui/quickstart/ \n" ); Internal::Adaptor::ApplicationPtr internal = Internal::Adaptor::Application::GetPreInitializedApplication(); if( internal ) { @@ -56,6 +58,7 @@ Application Application::New( int* argc, char **argv[] ) Application Application::New( int* argc, char **argv[], const std::string& stylesheet ) { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: DALi is deprecated and will be removed from next version. Please use NUI(C# interface of DALi).\n For more information on NUI, see the NUI quick start page : https://docs.tizen.org/application/dotnet/get-started/nui/quickstart/ \n" ); Internal::Adaptor::ApplicationPtr internal = Internal::Adaptor::Application::GetPreInitializedApplication(); if( internal ) { @@ -79,6 +82,7 @@ Application Application::New( int* argc, char **argv[], const std::string& style Application Application::New( int* argc, char **argv[], const std::string& stylesheet, WINDOW_MODE windowMode ) { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: DALi is deprecated and will be removed from next version. Please use NUI(C# interface of DALi).\n For more information on NUI, see the NUI quick start page : https://docs.tizen.org/application/dotnet/get-started/nui/quickstart/ \n" ); Internal::Adaptor::ApplicationPtr internal = Internal::Adaptor::Application::GetPreInitializedApplication(); if( internal ) { @@ -104,6 +108,7 @@ Application Application::New( int* argc, char **argv[], const std::string& style Application Application::New( int* argc, char **argv[], const std::string& stylesheet, Application::WINDOW_MODE windowMode, PositionSize positionSize ) { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: DALi is deprecated and will be removed from next version. Please use NUI(C# interface of DALi).\n For more information on NUI, see the NUI quick start page : https://docs.tizen.org/application/dotnet/get-started/nui/quickstart/ \n" ); Internal::Adaptor::ApplicationPtr internal = Internal::Adaptor::Application::GetPreInitializedApplication(); if( internal ) { @@ -152,11 +157,13 @@ Application& Application::operator=(const Application& application) void Application::MainLoop() { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: DALi is deprecated and will be removed from next version. Please use NUI(C# interface of DALi).\n For more information on NUI, see the NUI quick start page : https://docs.tizen.org/application/dotnet/get-started/nui/quickstart/ \n" ); Internal::Adaptor::GetImplementation(*this).MainLoop(Configuration::APPLICATION_HANDLES_CONTEXT_LOSS); } void Application::MainLoop(Configuration::ContextLoss configuration) { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: DALi is deprecated and will be removed from next version. Please use NUI(C# interface of DALi).\n For more information on NUI, see the NUI quick start page : https://docs.tizen.org/application/dotnet/get-started/nui/quickstart/ \n" ); Internal::Adaptor::GetImplementation(*this).MainLoop(configuration); } diff --git a/dali/public-api/adaptor-framework/application.h b/dali/public-api/adaptor-framework/application.h index 38dec63..ce7747e 100644 --- a/dali/public-api/adaptor-framework/application.h +++ b/dali/public-api/adaptor-framework/application.h @@ -43,6 +43,8 @@ class Application; } } /** + * @DEPRECATED_1_5.19 + * * @brief An Application class object should be created by every application * that wishes to use Dali. * @@ -124,6 +126,8 @@ public: public: /** + * @DEPRECATED_1_5.19 + * * @brief This is the constructor for applications without an argument list. * @SINCE_1_0.0 * @PRIVLEVEL_PUBLIC @@ -133,6 +137,8 @@ public: static Application New(); /** + * @DEPRECATED_1_5.19 + * * @brief This is the constructor for applications. * * @SINCE_1_0.0 @@ -145,6 +151,8 @@ public: static Application New( int* argc, char **argv[] ); /** + * @DEPRECATED_1_5.19 + * * @brief This is the constructor for applications with a name. * * @SINCE_1_0.0 @@ -159,6 +167,8 @@ public: static Application New( int* argc, char **argv[], const std::string& stylesheet ); /** + * @DEPRECATED_1_5.19 + * * @brief This is the constructor for applications with a name. * * @SINCE_1_0.0 @@ -174,6 +184,8 @@ public: static Application New( int* argc, char **argv[], const std::string& stylesheet, WINDOW_MODE windowMode ); /** + * @DEPRECATED_1_5.19 + * * @brief This is the constructor for applications. * * @SINCE_1_2.60 diff --git a/doc/dali-adaptor-doc.h b/doc/dali-adaptor-doc.h index bdded7b..513b424 100644 --- a/doc/dali-adaptor-doc.h +++ b/doc/dali-adaptor-doc.h @@ -19,7 +19,7 @@ */ /** - * @defgroup dali_adaptor DALi Adaptor + * @defgroup dali_adaptor DALi Adaptor (Deprecated) * * @brief DALi Adaptor is a platform adaptation layer. * -- 2.7.4