From 6cb7d906af43f7c7df7273054e50afb4070cbed3 Mon Sep 17 00:00:00 2001 From: Igor Olshevskyi Date: Mon, 24 Jul 2017 09:46:15 +0300 Subject: [PATCH] TizenRefApp-8916 [Call UI] Rename main model class Call on CallUI Change-Id: I7b977ecfe3bd7d796da0e116e89dfc87ba3f820d --- inc/model/{CallBuilder.h => CallUIBuilder.h} | 12 +++---- inc/model/{ICall.h => ICallUI.h} | 9 +++-- inc/model/types.h | 2 +- inc/presenters/Instance.h | 2 +- inc/presenters/MainPage.h | 8 ++--- src/model/{Call.cpp => CallUI.cpp} | 34 +++++++++---------- src/model/{Call.h => CallUI.h} | 25 +++++++------- .../{CallBuilder.cpp => CallUIBuilder.cpp} | 10 +++--- src/presenters/Instance.cpp | 8 ++--- src/presenters/MainPage.cpp | 8 ++--- 10 files changed, 58 insertions(+), 60 deletions(-) rename inc/model/{CallBuilder.h => CallUIBuilder.h} (76%) rename inc/model/{ICall.h => ICallUI.h} (86%) rename src/model/{Call.cpp => CallUI.cpp} (90%) rename src/model/{Call.h => CallUI.h} (86%) rename src/model/{CallBuilder.cpp => CallUIBuilder.cpp} (82%) diff --git a/inc/model/CallBuilder.h b/inc/model/CallUIBuilder.h similarity index 76% rename from inc/model/CallBuilder.h rename to inc/model/CallUIBuilder.h index 1ade234..ddcb11e 100644 --- a/inc/model/CallBuilder.h +++ b/inc/model/CallUIBuilder.h @@ -14,19 +14,19 @@ * limitations under the License. */ -#ifndef __CALLUI_MODEL_CALL_BUILDER_H__ -#define __CALLUI_MODEL_CALL_BUILDER_H__ +#ifndef __CALLUI_MODEL_CALL_UI_BUILDER_H__ +#define __CALLUI_MODEL_CALL_UI_BUILDER_H__ #include "types.h" namespace callui { - class CallBuilder { + class CallUIBuilder { public: - CallBuilder(); - ICallSRef build() const; + CallUIBuilder(); + ICallUISRef build() const; }; } -#endif // __CALLUI_MODEL_CALL_BUILDER_H__ +#endif // __CALLUI_MODEL_CALL_UI_BUILDER_H__ diff --git a/inc/model/ICall.h b/inc/model/ICallUI.h similarity index 86% rename from inc/model/ICall.h rename to inc/model/ICallUI.h index 9cc6505..06deda1 100644 --- a/inc/model/ICall.h +++ b/inc/model/ICallUI.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __CALLUI_MODEL_I_CALL_H__ -#define __CALLUI_MODEL_I_CALL_H__ +#ifndef __CALLUI_MODEL_I_CALL_UI_H__ +#define __CALLUI_MODEL_I_CALL_UI_H__ #include @@ -23,7 +23,7 @@ namespace callui { - class ICall : public ucl::Polymorphic { + class ICallUI : public ucl::Polymorphic { public: virtual void setListener(const ICallListenerWRef &listener) = 0; virtual ucl::Result processAppControl(app_control_h appControl) = 0; @@ -31,7 +31,6 @@ namespace callui { virtual ICallManagerSRef getCallManager() = 0; virtual IIndicatorStateProviderSRef getIndicatorStateProvider() = 0; }; - } -#endif // __CALLUI_MODEL_I_CALL_H__ +#endif // __CALLUI_MODEL_I_CALL_UI_H__ diff --git a/inc/model/types.h b/inc/model/types.h index ea83dc2..3283943 100644 --- a/inc/model/types.h +++ b/inc/model/types.h @@ -140,7 +140,7 @@ namespace callui { HD_VOICE }; - UCL_DECLARE_REF_ALIASES(ICall); + UCL_DECLARE_REF_ALIASES(ICallUI); UCL_DECLARE_REF_ALIASES(ICallListener); UCL_DECLARE_REF_ALIASES(ICallManager); diff --git a/inc/presenters/Instance.h b/inc/presenters/Instance.h index ea8afab..0c15077 100644 --- a/inc/presenters/Instance.h +++ b/inc/presenters/Instance.h @@ -59,7 +59,7 @@ namespace callui { ucl::SysEventProvider &m_sysEventProvider; ucl::IInstanceContext *m_context; - ICallSRef m_call; + ICallUISRef m_call; ucl::WindowSRef m_win; ucl::NaviframeSRef m_navi; diff --git a/inc/presenters/MainPage.h b/inc/presenters/MainPage.h index 4d9443a..6366dea 100644 --- a/inc/presenters/MainPage.h +++ b/inc/presenters/MainPage.h @@ -36,11 +36,11 @@ namespace callui { Builder(); ~Builder(); Builder &setNaviframe(const ucl::NaviframeSRef &navi); - Builder &setCall(const ICallSRef &call); + Builder &setCallUI(const ICallUISRef &call); MainPageSRef build(const ExitRequestHandler handler) const; private: ucl::NaviframeSRef m_navi; - ICallSRef m_call; + ICallUISRef m_call; }; private: @@ -48,7 +48,7 @@ namespace callui { MainPage(ucl::IRefCountObj &rc, const ucl::NaviframeSRef &navi, const ExitRequestHandler handler, - const ICallSRef &call); + const ICallUISRef &call); virtual ~MainPage(); ucl::Result doPrepare(ucl::NaviItem &item); @@ -104,7 +104,7 @@ namespace callui { ucl::LayoutSRef m_rmLy; ucl::StyledWidgetSRef m_bottomBtn; - ICallSRef m_call; + ICallUISRef m_call; ICallManagerSRef m_cm; IndicatorPresenterSRef m_indicator; CallInfoPresenterSRef m_callInfoPrs; diff --git a/src/model/Call.cpp b/src/model/CallUI.cpp similarity index 90% rename from src/model/Call.cpp rename to src/model/CallUI.cpp index e54cd56..11eb494 100644 --- a/src/model/Call.cpp +++ b/src/model/CallUI.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "Call.h" +#include "CallUI.h" #include @@ -45,21 +45,21 @@ namespace callui { using namespace ucl; - Call::Call(IRefCountObj &rc): + CallUI::CallUI(IRefCountObj &rc): RefCountAware(&rc) { } - Call::~Call() + CallUI::~CallUI() { } - void Call::setListener(const ICallListenerWRef &listener) + void CallUI::setListener(const ICallListenerWRef &listener) { m_listener = listener; } - Result Call::processAppControl(app_control_h appControl) + Result CallUI::processAppControl(app_control_h appControl) { if (!appControl) { FAIL_RETURN(RES_INVALID_ARGUMENTS, "appControl is NULL"); @@ -129,7 +129,7 @@ namespace callui { return ret; } - Result Call::prepare() + Result CallUI::prepare() { auto callClient = CallClient::newInstance(); if (!callClient) { @@ -161,7 +161,7 @@ namespace callui { return RES_OK; } - Result Call::initInidcatorStateProvider() + Result CallUI::initInidcatorStateProvider() { m_indicatorStPrv = IndicatorStateProvider::newInstance(); if (!m_indicatorStPrv) { @@ -220,22 +220,22 @@ namespace callui { return RES_OK; } - ICallManagerSRef Call::getCallManager() + ICallManagerSRef CallUI::getCallManager() { return m_callManager; } - ISoundManagerSRef Call::getSoundManager() + ISoundManagerSRef CallUI::getSoundManager() { return m_soundManager; } - IIndicatorStateProviderSRef Call::getIndicatorStateProvider() + IIndicatorStateProviderSRef CallUI::getIndicatorStateProvider() { return m_indicatorStPrv; } - ICallInfoSCRef Call::getCurrentCallInfo() const + ICallInfoSCRef CallUI::getCurrentCallInfo() const { CallMask calls = m_callManager->getAvailableCalls(); if (!calls) { @@ -253,7 +253,7 @@ namespace callui { return {}; } - bool Call::getHDVoiceStatus() const + bool CallUI::getHDVoiceStatus() const { ICallInfoSCRef info = getCurrentCallInfo(); if (info) { @@ -262,7 +262,7 @@ namespace callui { return false; } - bool Call::getForwardedCallStatus() const + bool CallUI::getForwardedCallStatus() const { ICallInfoSCRef info = getCurrentCallInfo(); if (info) { @@ -271,18 +271,18 @@ namespace callui { return false; } - void Call::updateHdVoiceStateSource() + void CallUI::updateHdVoiceStateSource() { m_hdCallStSrc->updateState(getHDVoiceStatus()); } - void Call::updateSimSlotStateSource() + void CallUI::updateSimSlotStateSource() { m_simSlotStSrc->updateSimSlot(m_callManager->getSimSlot(), getForwardedCallStatus()); } - void Call::onCallEvent(CallEventType type) + void CallUI::onCallEvent(CallEventType type) { updateSimSlotStateSource(); updateHdVoiceStateSource(); @@ -292,7 +292,7 @@ namespace callui { } } - void Call::onError(CallManagerErr err) + void CallUI::onError(CallManagerErr err) { auto callErr = CallErr::DIAL_FAIL; switch (err) { diff --git a/src/model/Call.h b/src/model/CallUI.h similarity index 86% rename from src/model/Call.h rename to src/model/CallUI.h index cc18576..1be1aa3 100644 --- a/src/model/Call.h +++ b/src/model/CallUI.h @@ -14,13 +14,12 @@ * limitations under the License. */ -#ifndef __CALLUI_MODEL_CALL_H__ -#define __CALLUI_MODEL_CALL_H__ +#ifndef __CALLUI_MODEL_CALL_UI_H__ +#define __CALLUI_MODEL_CALL_UI_H__ -#include "model/ICall.h" -#include "ICallManagerListener.h" +#include "model/ICallUI.h" -#include +#include "ICallManagerListener.h" #include "types.h" @@ -29,14 +28,14 @@ namespace callui { UCL_DECLARE_REF_ALIASES(CallManager); UCL_DECLARE_REF_ALIASES(SoundManager); - class Call final : + class CallUI final : public ucl::RefCountAware, - public ICall, + public ICallUI, public ICallManagerListener { public: - virtual ~Call(); + virtual ~CallUI(); - // ICall + // ICallUI virtual void setListener(const ICallListenerWRef &listener) override final; virtual ucl::Result processAppControl(app_control_h appControl) override final; @@ -50,9 +49,9 @@ namespace callui { virtual void onError(CallManagerErr err) override final; private: - friend class CallBuilder; - friend class ucl::ReffedObj; - Call(ucl::IRefCountObj &rc); + friend class CallUIBuilder; + friend class ucl::ReffedObj; + CallUI(ucl::IRefCountObj &rc); ucl::Result prepare(); @@ -76,4 +75,4 @@ namespace callui { } -#endif // __CALLUI_MODEL_CALL_H__ +#endif // __CALLUI_MODEL_CALL_UI_H__ diff --git a/src/model/CallBuilder.cpp b/src/model/CallUIBuilder.cpp similarity index 82% rename from src/model/CallBuilder.cpp rename to src/model/CallUIBuilder.cpp index 5826135..5a9d5ba 100644 --- a/src/model/CallBuilder.cpp +++ b/src/model/CallUIBuilder.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "model/CallBuilder.h" +#include "model/CallUIBuilder.h" -#include "Call.h" +#include "CallUI.h" #include "common.h" @@ -24,13 +24,13 @@ namespace callui { using namespace ucl; - CallBuilder::CallBuilder() + CallUIBuilder::CallUIBuilder() { } - ICallSRef CallBuilder::build() const + ICallUISRef CallUIBuilder::build() const { - auto result = makeShared(); + auto result = makeShared(); FAIL_RETURN_VALUE(result->prepare(), {}, "result->prepare() failed!"); return result; } diff --git a/src/presenters/Instance.cpp b/src/presenters/Instance.cpp index 8da8645..e77f8c4 100644 --- a/src/presenters/Instance.cpp +++ b/src/presenters/Instance.cpp @@ -22,8 +22,8 @@ #include -#include "model/CallBuilder.h" -#include "model/ICall.h" +#include "model/CallUIBuilder.h" +#include "model/ICallUI.h" #include "model/ICallManager.h" #include "presenters/MainPage.h" @@ -81,7 +81,7 @@ namespace callui { FAIL_RETURN(setupTheme(), "setupTheme() failed!"); - m_call = CallBuilder().build(); + m_call = CallUIBuilder().build(); if (!m_call) { LOG_RETURN(RES_FAIL, "m_call is NULL"); } @@ -118,7 +118,7 @@ namespace callui { if (!m_page) { auto page = MainPage::Builder(). setNaviframe(m_navi). - setCall(m_call). + setCallUI(m_call). build(WEAK_DELEGATE(Instance::onPageExitRequest, asWeak(this))); if (!page) { diff --git a/src/presenters/MainPage.cpp b/src/presenters/MainPage.cpp index 0d10949..1a491b4 100644 --- a/src/presenters/MainPage.cpp +++ b/src/presenters/MainPage.cpp @@ -19,7 +19,7 @@ #include "ucl/gui/Window.h" #include "ucl/gui/Widget.h" -#include "model/ICall.h" +#include "model/ICallUI.h" #include "model/ICallManager.h" #include "model/IIncomingCall.h" #include "model/IActiveCall.h" @@ -88,8 +88,8 @@ namespace callui { return *this; } - MainPage::Builder &MainPage::Builder::setCall( - const ICallSRef &call) + MainPage::Builder &MainPage::Builder::setCallUI( + const ICallUISRef &call) { m_call = call; return *this; @@ -128,7 +128,7 @@ namespace callui { MainPage::MainPage(IRefCountObj &rc, const NaviframeSRef &navi, const ExitRequestHandler handler, - const ICallSRef &call) : + const ICallUISRef &call) : Page(rc, navi, handler), m_call(call), m_mode(CallMode::UNDEFINED), -- 2.34.1