From: Daekwang Ryu Date: Fri, 21 Aug 2020 02:36:52 +0000 (+0900) Subject: Remove unused parameters X-Git-Tag: dali_1.9.27~13^2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=a736b8a9017ff4efbea18c357eabf7199f160078 Remove unused parameters Change-Id: I47b576c564c7ba7b61adcfdb953bd842e09587e1 --- diff --git a/dali/devel-api/adaptor-framework/window-devel.cpp b/dali/devel-api/adaptor-framework/window-devel.cpp index c3c8c18..0a65690 100644 --- a/dali/devel-api/adaptor-framework/window-devel.cpp +++ b/dali/devel-api/adaptor-framework/window-devel.cpp @@ -55,7 +55,7 @@ Window New(Any surface, PositionSize windowPosition, const std::string& name, co if (isAdaptorAvailable) { Dali::Adaptor& adaptor = Internal::Adaptor::Adaptor::Get(); - Internal::Adaptor::Adaptor::GetImplementation(adaptor).AddWindow(sceneHolder, name, className, isTransparent); + Internal::Adaptor::Adaptor::GetImplementation(adaptor).AddWindow(sceneHolder); } newWindow = Window(window); } diff --git a/dali/integration-api/adaptor-framework/adaptor.h b/dali/integration-api/adaptor-framework/adaptor.h index 94c5f81..834f25c 100644 --- a/dali/integration-api/adaptor-framework/adaptor.h +++ b/dali/integration-api/adaptor-framework/adaptor.h @@ -254,14 +254,8 @@ public: * @brief Adds a new Window instance to the Adaptor * * @param[in] childWindow The child window instance - * @param[in] childWindowName The child window title/name - * @param[in] childWindowClassName The class name that the child window belongs to - * @param[in] childWindowMode The mode of the child window - */ - bool AddWindow( Dali::Integration::SceneHolder childWindow, - const std::string& childWindowName, - const std::string& childWindowClassName, - bool childWindowMode ); + */ + bool AddWindow( Dali::Integration::SceneHolder childWindow ); /** * @brief Removes a previously added @p callback. diff --git a/dali/internal/adaptor/common/adaptor-impl.cpp b/dali/internal/adaptor/common/adaptor-impl.cpp index 56d11fb..c496606 100644 --- a/dali/internal/adaptor/common/adaptor-impl.cpp +++ b/dali/internal/adaptor/common/adaptor-impl.cpp @@ -648,7 +648,7 @@ void Adaptor::SetPreRenderCallback( CallbackBase* callback ) mThreadController->SetPreRenderCallback( callback ); } -bool Adaptor::AddWindow( Dali::Integration::SceneHolder childWindow, const std::string& childWindowName, const std::string& childWindowClassName, bool childWindowMode ) +bool Adaptor::AddWindow( Dali::Integration::SceneHolder childWindow ) { Internal::Adaptor::SceneHolder& windowImpl = Dali::GetImplementation( childWindow ); windowImpl.SetAdaptor( Get() ); diff --git a/dali/internal/adaptor/common/adaptor-impl.h b/dali/internal/adaptor/common/adaptor-impl.h index 1d65f27..29d8620 100644 --- a/dali/internal/adaptor/common/adaptor-impl.h +++ b/dali/internal/adaptor/common/adaptor-impl.h @@ -249,14 +249,8 @@ public: // AdaptorInternalServices implementation /** * Adds a new Window instance to the Adaptor * @param[in] childWindow The child window instance - * @param[in] childWindowName The child window title/name - * @param[in] childWindowClassName The class name that the child window belongs to - * @param[in] childWindowMode The mode of the child window - */ - virtual bool AddWindow( Dali::Integration::SceneHolder childWindow, - const std::string& childWindowName, - const std::string& childWindowClassName, - bool childWindowMode ); + */ + virtual bool AddWindow( Dali::Integration::SceneHolder childWindow ); /** * Removes an existing Window instance from the Adaptor diff --git a/dali/internal/adaptor/common/adaptor.cpp b/dali/internal/adaptor/common/adaptor.cpp index cbb3d19..add3245 100644 --- a/dali/internal/adaptor/common/adaptor.cpp +++ b/dali/internal/adaptor/common/adaptor.cpp @@ -112,10 +112,10 @@ bool Adaptor::AddIdle( CallbackBase* callback, bool hasReturnValue ) return mImpl->AddIdle( callback, hasReturnValue, false ); } -bool Adaptor::AddWindow( Dali::Integration::SceneHolder childWindow, const std::string& childWindowName, const std::string& childWindowClassName, bool childWindowMode ) +bool Adaptor::AddWindow( Dali::Integration::SceneHolder childWindow ) { DALI_ASSERT_ALWAYS( IsAvailable() && "Adaptor not instantiated" ); - return mImpl->AddWindow( childWindow, childWindowName, childWindowClassName, childWindowMode ); + return mImpl->AddWindow( childWindow ); } void Adaptor::RemoveIdle( CallbackBase* callback ) diff --git a/dali/public-api/adaptor-framework/window.cpp b/dali/public-api/adaptor-framework/window.cpp index 8a15192..000f350 100644 --- a/dali/public-api/adaptor-framework/window.cpp +++ b/dali/public-api/adaptor-framework/window.cpp @@ -56,7 +56,7 @@ Window Window::New(PositionSize posSize, const std::string& name, const std::str if (isAdaptorAvailable) { Dali::Adaptor& adaptor = Internal::Adaptor::Adaptor::Get(); - Internal::Adaptor::Adaptor::GetImplementation(adaptor).AddWindow(sceneHolder, name, className, isTransparent); + Internal::Adaptor::Adaptor::GetImplementation(adaptor).AddWindow(sceneHolder); } newWindow = Window(window); }