diff options
author | Alexander\ Kovalenko <al.kovalenko@samsung.com> | 2017-10-20 12:14:49 +0300 |
---|---|---|
committer | Alexander\ Kovalenko <al.kovalenko@samsung.com> | 2017-10-20 12:16:01 +0300 |
commit | 7836ca96e56487a591024226f3fd91df9e25472a (patch) | |
tree | fc815d9d57fc6032f26b091c932950520fd1acf7 | |
parent | 80d9c08996b150fce83dfaad85ddd63c23bb29b6 (diff) | |
download | call-ui-7836ca96e56487a591024226f3fd91df9e25472a.tar.gz call-ui-7836ca96e56487a591024226f3fd91df9e25472a.tar.bz2 call-ui-7836ca96e56487a591024226f3fd91df9e25472a.zip |
TizenRefApp-9655 [Call UI] Fix code style issues
Change-Id: Iec896e2b01286cce56a29f68e8c7eb78001bff40
-rw-r--r-- | call-ui/model/impl/CallManager.cpp | 2 | ||||
-rw-r--r-- | call-ui/model/impl/ConnectionStateSource.cpp | 2 | ||||
-rw-r--r-- | call-ui/model/impl/ContactInfoProvider.cpp | 1 | ||||
-rw-r--r-- | call-ui/presenters/misc/AccessoryPresenter.cpp | 2 | ||||
-rw-r--r-- | call-ui/presenters/misc/CallInfoPresenter.cpp | 3 | ||||
-rw-r--r-- | call-ui/presenters/misc/CallStatusPresenter.cpp | 2 | ||||
-rw-r--r-- | call-ui/presenters/misc/IndicatorPresenter.cpp | 2 | ||||
-rw-r--r-- | call-ui/presenters/pages/KeypadPage.cpp | 1 | ||||
-rw-r--r-- | call-ui/presenters/pages/MainPage.cpp | 1 | ||||
-rw-r--r-- | call-ui/view/AcceptRejectWidget.cpp | 2 | ||||
-rw-r--r-- | ucl/include/ucl/gui/WidgetItem.h | 2 | ||||
-rw-r--r-- | ucl/source/mvp/GuiPresenter.cpp | 1 | ||||
-rw-r--r-- | ucl/source/mvp/ListItemPresenter.cpp | 1 |
13 files changed, 4 insertions, 18 deletions
diff --git a/call-ui/model/impl/CallManager.cpp b/call-ui/model/impl/CallManager.cpp index dd28d48..3df8dcd 100644 --- a/call-ui/model/impl/CallManager.cpp +++ b/call-ui/model/impl/CallManager.cpp @@ -226,14 +226,12 @@ namespace callui { return updateCall(m_endCall, m_heldCall->getInfo()); } else if (m_activeCall && m_confTypeCallReq == CALL_FLAG_ACTIVE) { - m_confTypeCallReq = CALL_FLAG_NONE; m_blockCMEvents = true; return updateCall(m_endCall, m_activeCall->getInfo()); } else if (m_heldCall && m_confTypeCallReq == CALL_FLAG_HELD) { - m_confTypeCallReq = CALL_FLAG_NONE; m_blockCMEvents = true; diff --git a/call-ui/model/impl/ConnectionStateSource.cpp b/call-ui/model/impl/ConnectionStateSource.cpp index e7c38ee..e6eb768 100644 --- a/call-ui/model/impl/ConnectionStateSource.cpp +++ b/call-ui/model/impl/ConnectionStateSource.cpp @@ -338,7 +338,6 @@ namespace callui { } return RES_OK; - } void ConnectionStateSource::unsignSystStateCallbacks() @@ -366,7 +365,6 @@ namespace callui { CALLBACK_B(ConnectionStateSource::onPacketStateChangedCb)); vconf_ignore_key_changed(VCONFKEY_WIFI_TRANSFER_STATE, CALLBACK_B(ConnectionStateSource::onPacketStateChangedCb)); - } IndicatorState ConnectionStateSource::getState() const diff --git a/call-ui/model/impl/ContactInfoProvider.cpp b/call-ui/model/impl/ContactInfoProvider.cpp index 1db1623..3161dbd 100644 --- a/call-ui/model/impl/ContactInfoProvider.cpp +++ b/call-ui/model/impl/ContactInfoProvider.cpp @@ -50,7 +50,6 @@ namespace callui { ContactInfoProvider::ContactInfoProvider(): m_isConnected(false) { - } ContactInfoProvider::~ContactInfoProvider() diff --git a/call-ui/presenters/misc/AccessoryPresenter.cpp b/call-ui/presenters/misc/AccessoryPresenter.cpp index 293f510..59045d4 100644 --- a/call-ui/presenters/misc/AccessoryPresenter.cpp +++ b/call-ui/presenters/misc/AccessoryPresenter.cpp @@ -650,11 +650,11 @@ namespace callui { void AccessoryPresenter::onAudioStateChanged() { auto state = m_sm->getAudioState(); + if ((m_audioState != AudioStateType::BT && state == AudioStateType::BT) || (m_audioState == AudioStateType::BT && state != AudioStateType::BT)) { - m_audioState = state; updateMaxVolume(); diff --git a/call-ui/presenters/misc/CallInfoPresenter.cpp b/call-ui/presenters/misc/CallInfoPresenter.cpp index c8f3975..45f3de2 100644 --- a/call-ui/presenters/misc/CallInfoPresenter.cpp +++ b/call-ui/presenters/misc/CallInfoPresenter.cpp @@ -406,7 +406,6 @@ namespace callui { m_widget->emit(impl::SIGN_CID_DISABLE, impl::SRC_CALLER_ID); if (m_mode == CallMode::INCOMING) { - if (!m_incomCallInfo) { LOG_RETURN(RES_FAIL, "m_incomCallInfo is NULL"); } @@ -674,8 +673,8 @@ namespace callui { if (!m_mainTxtAO) { LOG_RETURN(RES_FAIL, "createAccessObjectFromLyPart() failed!"); } - } + elm_atspi_accessible_reading_info_type_set(*m_mainTxtAO, ELM_ACCESSIBLE_READING_INFO_TYPE_NAME); elm_atspi_accessible_name_set(*m_mainTxtAO, text.c_str()); diff --git a/call-ui/presenters/misc/CallStatusPresenter.cpp b/call-ui/presenters/misc/CallStatusPresenter.cpp index 25dc6b6..30e9ae0 100644 --- a/call-ui/presenters/misc/CallStatusPresenter.cpp +++ b/call-ui/presenters/misc/CallStatusPresenter.cpp @@ -176,7 +176,6 @@ namespace callui { break; } LOG_RETURN_VOID(res, "Failed"); - } Result CallStatusPresenter::processIncomingMode() @@ -215,7 +214,6 @@ namespace callui { Result CallStatusPresenter::processDuringMode() { - if (m_isOnHold) { m_ly->setText(STR_ON_HOLD, impl::PART_TXT_TEXT_INFO); } else { diff --git a/call-ui/presenters/misc/IndicatorPresenter.cpp b/call-ui/presenters/misc/IndicatorPresenter.cpp index 49a5472..6bacecb 100644 --- a/call-ui/presenters/misc/IndicatorPresenter.cpp +++ b/call-ui/presenters/misc/IndicatorPresenter.cpp @@ -130,10 +130,10 @@ namespace callui { namespace { namespace impl { if (battLvl <= BATTERY_LOW_LIMIT - 1) { return impl::SIGL_BATT_LVL_HIDE; } + return EdjeSignal{std::string("batt_lvl_"). append(std::to_string(battLvl)). c_str()}; - } EdjeSignal getSimSlotUpdateSignal(SimSlot slot, bool isForwarded) diff --git a/call-ui/presenters/pages/KeypadPage.cpp b/call-ui/presenters/pages/KeypadPage.cpp index 16325f8..f36d126 100644 --- a/call-ui/presenters/pages/KeypadPage.cpp +++ b/call-ui/presenters/pages/KeypadPage.cpp @@ -155,7 +155,6 @@ namespace callui { unregisterPowerKeyHandling(); unregisterCallbacks(); - } Result KeypadPage::doPrepare(NaviItem &item) diff --git a/call-ui/presenters/pages/MainPage.cpp b/call-ui/presenters/pages/MainPage.cpp index 2b6aae6..51dd8e4 100644 --- a/call-ui/presenters/pages/MainPage.cpp +++ b/call-ui/presenters/pages/MainPage.cpp @@ -219,7 +219,6 @@ namespace callui { if (!isUnknownCaller(*call->getInfo()) && (provider && provider->getMsgCount() > 0)) { - FAIL_RETURN(createRejectMsgPresenter(provider), "createRejectMsgPresenter() failed!"); diff --git a/call-ui/view/AcceptRejectWidget.cpp b/call-ui/view/AcceptRejectWidget.cpp index c514b29..09b14db 100644 --- a/call-ui/view/AcceptRejectWidget.cpp +++ b/call-ui/view/AcceptRejectWidget.cpp @@ -707,7 +707,6 @@ namespace callui { onAcceptFullExpensionTransitDel), this); elm_transit_go(m_accTracerTr); - } void AcceptRejectWidget::setAcceptGuideUnpressedTransition() @@ -1036,7 +1035,6 @@ namespace callui { if (const auto handler = m_rejHandler.lock()) { handler(); } - } void AcceptRejectWidget::onRejectBgExpandTransitDel(Elm_Transit *transit) diff --git a/ucl/include/ucl/gui/WidgetItem.h b/ucl/include/ucl/gui/WidgetItem.h index f57487b..646cf50 100644 --- a/ucl/include/ucl/gui/WidgetItem.h +++ b/ucl/include/ucl/gui/WidgetItem.h @@ -60,7 +60,7 @@ namespace ucl { Evas_Object *getContent() const; Evas_Object *getContent(EdjePart part) const; - void emit(EdjeSignal signal,EdjeSignalSrc source = + void emit(EdjeSignal signal, EdjeSignalSrc source = EdjeSignalSrc("")) const; private: diff --git a/ucl/source/mvp/GuiPresenter.cpp b/ucl/source/mvp/GuiPresenter.cpp index 10ec68d..20fba5c 100644 --- a/ucl/source/mvp/GuiPresenter.cpp +++ b/ucl/source/mvp/GuiPresenter.cpp @@ -77,7 +77,6 @@ namespace ucl { } if (flags & PF_ADD_DEACTIVATOR_SOURCES) { - if (!parent.m_sink) { LOG_RETURN(RES_FAIL, "parent.m_sink is NULL!"); } diff --git a/ucl/source/mvp/ListItemPresenter.cpp b/ucl/source/mvp/ListItemPresenter.cpp index 01d95e6..865fdec 100644 --- a/ucl/source/mvp/ListItemPresenter.cpp +++ b/ucl/source/mvp/ListItemPresenter.cpp @@ -226,7 +226,6 @@ namespace ucl { void ListItemPresenter::handleItemPick(const bool isPicked) { if (const auto host = m_pickerHost.lock()) { - if (!host->isPickModeActive()) { WLOG("Pick mode is not active!"); return; |