From: Igor Olshevskyi Date: Wed, 20 Sep 2017 09:20:09 +0000 (+0300) Subject: TizenRefApp-9380 [Call UI] Change class destructors types and area of visibility X-Git-Tag: submit/tizen_4.0/20171018.080056~9^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29e1ee8a11d2a0b2190ff1b57206e7a93604e19e;p=profile%2Fwearable%2Fapps%2Fnative%2Fcall-ui.git TizenRefApp-9380 [Call UI] Change class destructors types and area of visibility Change-Id: I23da7a7737fdeb4f33bf5b94c2c27d955da6332a --- diff --git a/call-ui/model/ICallInfo.h b/call-ui/model/ICallInfo.h index 559d939..33f1de4 100644 --- a/call-ui/model/ICallInfo.h +++ b/call-ui/model/ICallInfo.h @@ -42,7 +42,7 @@ namespace callui { virtual const ConfMemberList &getConferenceMemberList() const = 0; }; - // Non-member functions + // Non-member functions // bool isUnknownCaller(const ICallInfo &info); } diff --git a/call-ui/model/impl/ActiveCall.cpp b/call-ui/model/impl/ActiveCall.cpp index 898fab0..e3e74a5 100644 --- a/call-ui/model/impl/ActiveCall.cpp +++ b/call-ui/model/impl/ActiveCall.cpp @@ -30,10 +30,6 @@ namespace callui { { } - ActiveCall::~ActiveCall() - { - } - ActiveCallSRef ActiveCall::newInstance(CallManagerWRef cm, cm_call_data_h callData) { if (!cm) { diff --git a/call-ui/model/impl/ActiveCall.h b/call-ui/model/impl/ActiveCall.h index e005f7d..834b16b 100644 --- a/call-ui/model/impl/ActiveCall.h +++ b/call-ui/model/impl/ActiveCall.h @@ -34,20 +34,21 @@ namespace callui { class ActiveCall final : public IActiveCall { public: - static ActiveCallSRef newInstance(CallManagerWRef cm, cm_call_data_h callData); - virtual ~ActiveCall(); + static ActiveCallSRef newInstance(CallManagerWRef cm, + cm_call_data_h callData); - // IActiveCall + // IActiveCall // virtual ICallInfoSCRef getInfo() const override final; virtual bool isDialingMode() const override final; virtual ucl::Result hold() override final; virtual ucl::Result end() override final; - virtual ucl::Result split(const IConferenceCallInfoSCRef &confCallInfo) override final; + virtual ucl::Result split( + const IConferenceCallInfoSCRef &confCallInfo) override final; private: - friend class ucl::ReffedObj; ActiveCall(CallManagerWRef cm, cm_call_data_h callData); + ~ActiveCall() = default; ucl::Result prepare(cm_call_data_h callData); @@ -55,6 +56,8 @@ namespace callui { CallManagerWRef m_cm; CallInfoSRef m_callInfo; bool m_isDialing; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/BatteryStateSource.h b/call-ui/model/impl/BatteryStateSource.h index 47b30c9..53c5e21 100644 --- a/call-ui/model/impl/BatteryStateSource.h +++ b/call-ui/model/impl/BatteryStateSource.h @@ -30,16 +30,16 @@ namespace callui { class BatteryStateSource final : public IIndicatorStateSource { public: static BatteryStateSourceSRef newInstance(); - virtual ~BatteryStateSource(); - // IIndicatorStateSource + // IIndicatorStateSource // virtual IndicatorState getState() const override final; - virtual void setStateChangeHandler(const NotiHandler &handler) override final; + virtual void setStateChangeHandler( + const NotiHandler &handler) override final; private: - friend class ucl::ReffedObj; BatteryStateSource(); + ~BatteryStateSource(); ucl::Result prepare(); @@ -71,6 +71,8 @@ namespace callui { private: Bits m_bits; NotiHandler m_handler; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/BluetoothManager.h b/call-ui/model/impl/BluetoothManager.h index 8b89ba8..3380521 100644 --- a/call-ui/model/impl/BluetoothManager.h +++ b/call-ui/model/impl/BluetoothManager.h @@ -39,9 +39,8 @@ namespace callui { void setHeadsetConnectionChangeHandler(const NotiHandler &handler); private: - friend class ucl::ReffedObj; BluetoothManager(); - virtual ~BluetoothManager(); + ~BluetoothManager(); ucl::Result prepare(); @@ -66,6 +65,8 @@ namespace callui { bool m_btAudioInitialized; bool m_isHeadsetConnected; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/CallClient.h b/call-ui/model/impl/CallClient.h index 9f430ed..3b926e2 100644 --- a/call-ui/model/impl/CallClient.h +++ b/call-ui/model/impl/CallClient.h @@ -28,17 +28,19 @@ namespace callui { class CallClient { public: static CallClientSRef newInstance(); - virtual ~CallClient(); cm_client_h getCmClient() const; operator cm_client_h() const; private: - friend class ucl::ReffedObj; CallClient(); + ~CallClient(); + ucl::Result prepare(); private: cm_client_h m_client; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/CallInfo.cpp b/call-ui/model/impl/CallInfo.cpp index 53804b5..67d695d 100644 --- a/call-ui/model/impl/CallInfo.cpp +++ b/call-ui/model/impl/CallInfo.cpp @@ -67,10 +67,6 @@ namespace callui { { } - CallInfo::~CallInfo() - { - } - CallInfoSRef CallInfo::newInstance(CallClient &client, cm_call_data_h callData, ContactInfoProviderSRef callInfoProvider) @@ -238,7 +234,7 @@ namespace callui { return m_confMemberList; } - // Non-member functions + // Non-member functions // bool isUnknownCaller(const ICallInfo &info) { diff --git a/call-ui/model/impl/CallInfo.h b/call-ui/model/impl/CallInfo.h index 5fe7ee0..0042bd2 100644 --- a/call-ui/model/impl/CallInfo.h +++ b/call-ui/model/impl/CallInfo.h @@ -36,9 +36,8 @@ namespace callui { static CallInfoSRef newInstance(CallClient &client, cm_call_data_h callData, ContactInfoProviderSRef callInfoProvider); - virtual ~CallInfo(); - // ICallInfo + // ICallInfo // virtual unsigned int getCallId() const override final; virtual const std::string &getPhoneNumber() const override final; @@ -52,8 +51,8 @@ namespace callui { virtual const ConfMemberList &getConferenceMemberList() const override final; private: - friend class ucl::ReffedObj; CallInfo(); + ~CallInfo() = default; ucl::Result prepare(CallClient &client, cm_call_data_h callData, @@ -72,6 +71,8 @@ namespace callui { bool m_isVoiceMailNumber; int m_confMemberCount; ConfMemberList m_confMemberList; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/CallManager.cpp b/call-ui/model/impl/CallManager.cpp index 02f6fe0..f931f3e 100644 --- a/call-ui/model/impl/CallManager.cpp +++ b/call-ui/model/impl/CallManager.cpp @@ -41,10 +41,6 @@ namespace callui { { } - CallManager::~CallManager() - { - } - CallManagerSRef CallManager::newInstance(const CallClientSRef &callClient, ICallManagerListenerWRef listener) { diff --git a/call-ui/model/impl/CallManager.h b/call-ui/model/impl/CallManager.h index b73acb8..f4acbf2 100644 --- a/call-ui/model/impl/CallManager.h +++ b/call-ui/model/impl/CallManager.h @@ -41,7 +41,6 @@ namespace callui { public: static CallManagerSRef newInstance(const CallClientSRef &callClient, ICallManagerListenerWRef listener); - virtual ~CallManager(); CallClient &getCallClient(); SimSlot getSimSlot() const; @@ -55,7 +54,7 @@ namespace callui { ucl::Result processOutgoingCall(const std::string &telNum); ucl::Result processIncomingCall(SimSlot slot); - // ICallManager + // ICallManager // virtual IIncomingCallSRef getIncomingCall() override final; virtual IActiveCallSRef getActiveCall() override final; @@ -64,9 +63,9 @@ namespace callui { virtual CallMask getAvailableCalls() const override final; private: - friend class ucl::ReffedObj; CallManager(ucl::IRefCountObj &rc, const CallClientSRef &callClient, ICallManagerListenerWRef listener); + ~CallManager() = default; ucl::Result prepare(); ucl::Result initCalls(); @@ -101,6 +100,8 @@ namespace callui { int m_confTypeCallReq; bool m_blockCMEvents; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/CallUI.cpp b/call-ui/model/impl/CallUI.cpp index 4c91a65..b6cc912 100644 --- a/call-ui/model/impl/CallUI.cpp +++ b/call-ui/model/impl/CallUI.cpp @@ -36,10 +36,6 @@ namespace callui { { } - CallUI::~CallUI() - { - } - void CallUI::setListener(const ICallListenerWRef &listener) { m_listener = listener; @@ -191,14 +187,13 @@ namespace callui { IndicatorProperty::VOICE_CONTROL, voiceControlStSrc), "setStateSource() failed!"); - m_simSlotStSrc = makeShared( + m_simSlotStSrc = SimSlotStateSource::newInstance( m_callManager->getSimSlot(), getForwardedCallStatus()); FAIL_RETURN(m_indicatorStPrv->setStateSource( IndicatorProperty::SIM_SLOT, m_simSlotStSrc), "setStateSource() failed!"); - m_hdCallStSrc = makeShared( - getHDVoiceStatus()); + m_hdCallStSrc = HdVoiceStateSource::newInstance(getHDVoiceStatus()); FAIL_RETURN(m_indicatorStPrv->setStateSource( IndicatorProperty::HD_VOICE, m_hdCallStSrc), "setStateSource() failed!"); diff --git a/call-ui/model/impl/CallUI.h b/call-ui/model/impl/CallUI.h index dc62078..554f403 100644 --- a/call-ui/model/impl/CallUI.h +++ b/call-ui/model/impl/CallUI.h @@ -42,9 +42,8 @@ namespace callui { public ICallUI, public ICallManagerListener { public: - virtual ~CallUI(); - // ICallUI + // ICallUI // virtual void setListener(const ICallListenerWRef &listener) override final; virtual ucl::Result processAppControl(app_control_h appControl) override final; @@ -52,15 +51,14 @@ namespace callui { virtual ICallManagerSRef getCallManager() override final; virtual IIndicatorStateProviderSRef getIndicatorStateProvider() override final; - // ICallManagerListener + // ICallManagerListener // virtual void onCallEvent(CallEventType type) override final; virtual void onError(CallManagerErr err) override final; private: - friend class CallUIBuilder; - friend class ucl::ReffedObj; CallUI(ucl::IRefCountObj &rc); + ~CallUI() = default; ucl::Result prepare(); @@ -80,6 +78,9 @@ namespace callui { HdVoiceStateSourceSRef m_hdCallStSrc; IndicatorStateProviderSRef m_indicatorStPrv; VoiceControlStateProviderSRef m_voiceControlPrv; + + friend class CallUIBuilder; + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/ConferenceCallInfo.cpp b/call-ui/model/impl/ConferenceCallInfo.cpp index d20592c..8d3076c 100644 --- a/call-ui/model/impl/ConferenceCallInfo.cpp +++ b/call-ui/model/impl/ConferenceCallInfo.cpp @@ -27,10 +27,6 @@ namespace callui { { } - ConferenceCallInfo::~ConferenceCallInfo() - { - } - ConferenceCallInfoSRef ConferenceCallInfo::newInstance( cm_conf_call_data_t *confCallData, ContactInfoProviderSRef callInfoProvider) diff --git a/call-ui/model/impl/ConferenceCallInfo.h b/call-ui/model/impl/ConferenceCallInfo.h index 940b2bc..42dbc9b 100644 --- a/call-ui/model/impl/ConferenceCallInfo.h +++ b/call-ui/model/impl/ConferenceCallInfo.h @@ -34,17 +34,16 @@ namespace callui { static ConferenceCallInfoSRef newInstance( cm_conf_call_data_t *confCallData, ContactInfoProviderSRef callInfoProvider); - virtual ~ConferenceCallInfo(); - // IConferenceCallInfo + // IConferenceCallInfo // virtual unsigned int getCallId() const override final; virtual const std::string &getPhoneNumber() const override final; virtual IContactInfoSCRef getContactInfo() const override final; private: - friend class ucl::ReffedObj; ConferenceCallInfo(); + ~ConferenceCallInfo() = default; ucl::Result prepare(cm_conf_call_data_t *confCallData, ContactInfoProviderSRef callInfoProvider); @@ -52,6 +51,8 @@ namespace callui { unsigned int m_callId; std::string m_phoneNum; ContactInfoSRef m_contactInfo; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/ConnectionStateSource.h b/call-ui/model/impl/ConnectionStateSource.h index 1a99cdb..18af9d2 100644 --- a/call-ui/model/impl/ConnectionStateSource.h +++ b/call-ui/model/impl/ConnectionStateSource.h @@ -30,16 +30,15 @@ namespace callui { class ConnectionStateSource final : public IIndicatorStateSource { public: static ConnectionStateSourceSRef newInstance(); - virtual ~ConnectionStateSource(); - // IIndicatorStateSource + // IIndicatorStateSource // virtual IndicatorState getState() const override final; virtual void setStateChangeHandler(const NotiHandler &handler) override final; private: - friend class ucl::ReffedObj; ConnectionStateSource(); + ~ConnectionStateSource(); ucl::Result prepare(); @@ -79,6 +78,8 @@ namespace callui { private: Bits m_bits; NotiHandler m_handler; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/ContactInfo.cpp b/call-ui/model/impl/ContactInfo.cpp index ef36d03..8a2aea7 100644 --- a/call-ui/model/impl/ContactInfo.cpp +++ b/call-ui/model/impl/ContactInfo.cpp @@ -35,10 +35,6 @@ namespace callui { { } - ContactInfo::~ContactInfo() - { - } - ContactInfoSRef ContactInfo::newInstance(int personId, const std::string &name, const std::string &imagePath, diff --git a/call-ui/model/impl/ContactInfo.h b/call-ui/model/impl/ContactInfo.h index aa93d64..3515e35 100644 --- a/call-ui/model/impl/ContactInfo.h +++ b/call-ui/model/impl/ContactInfo.h @@ -33,26 +33,27 @@ namespace callui { const std::string &name, const std::string &imagePath, ContactNameSourceType type); - virtual ~ContactInfo(); - // IContactInfo + // IContactInfo // virtual const std::string &getName() const override final; virtual const std::string &getImagePath() const override final; virtual ContactNameSourceType getNameSourceType() const override final; private: - friend class ucl::ReffedObj; ContactInfo(int personId, const std::string &name, const std::string &imagePath, ContactNameSourceType type); + ~ContactInfo() = default; private: int m_personId; std::string m_name; std::string m_imagePath; ContactNameSourceType m_nameSource; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/ContactInfoProvider.h b/call-ui/model/impl/ContactInfoProvider.h index 0a2e6de..e248642 100644 --- a/call-ui/model/impl/ContactInfoProvider.h +++ b/call-ui/model/impl/ContactInfoProvider.h @@ -28,18 +28,19 @@ namespace callui { class ContactInfoProvider { public: static ContactInfoProviderSRef newInstance(); - virtual ~ContactInfoProvider(); ContactInfoSRef createContactInfo(int contactId); private: - friend class ucl::ReffedObj; ContactInfoProvider(); + ~ContactInfoProvider(); ucl::Result prepare(); private: bool m_isConnected; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/EndCall.cpp b/call-ui/model/impl/EndCall.cpp index 4071021..f9e34e3 100644 --- a/call-ui/model/impl/EndCall.cpp +++ b/call-ui/model/impl/EndCall.cpp @@ -31,10 +31,6 @@ namespace callui { { } - EndCall::~EndCall() - { - } - EndCallSRef EndCall::newInstance(CallManagerWRef cm, ICallInfoSCRef callInfo) { if (!cm) { diff --git a/call-ui/model/impl/EndCall.h b/call-ui/model/impl/EndCall.h index 34c3e9c..6812566 100644 --- a/call-ui/model/impl/EndCall.h +++ b/call-ui/model/impl/EndCall.h @@ -33,17 +33,15 @@ namespace callui { public: static EndCallSRef newInstance(CallManagerWRef cm, ICallInfoSCRef callInfo); - virtual ~EndCall(); - - // IEndCall + // IEndCall // virtual ICallInfoSCRef getInfo() const override final; virtual ucl::Result callBack() override final; virtual ucl::Result writeMessage() override final; private: - friend class ucl::ReffedObj; EndCall(CallManagerWRef cm, ICallInfoSCRef callInfo); + ~EndCall() = default; ucl::Result prepare(); @@ -51,6 +49,8 @@ namespace callui { CallManagerWRef m_cm; ICallInfoSCRef m_callInfo; bool m_callbackInProgress; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/HdVoiceStateSource.cpp b/call-ui/model/impl/HdVoiceStateSource.cpp index 90df282..633210a 100644 --- a/call-ui/model/impl/HdVoiceStateSource.cpp +++ b/call-ui/model/impl/HdVoiceStateSource.cpp @@ -42,10 +42,6 @@ namespace callui { m_bits.isEnable = isEnable; } - HdVoiceStateSource::~HdVoiceStateSource() - { - } - void HdVoiceStateSource::updateState(bool isEnable) { if (m_bits.isEnable != isEnable) { @@ -57,6 +53,11 @@ namespace callui { } } + HdVoiceStateSourceSRef HdVoiceStateSource::newInstance(bool isEnable) + { + return makeShared(isEnable); + } + IndicatorState HdVoiceStateSource::getState() const { return {m_bits.value}; diff --git a/call-ui/model/impl/HdVoiceStateSource.h b/call-ui/model/impl/HdVoiceStateSource.h index 103ba1f..deea001 100644 --- a/call-ui/model/impl/HdVoiceStateSource.h +++ b/call-ui/model/impl/HdVoiceStateSource.h @@ -25,15 +25,18 @@ namespace callui { class HdVoiceStateSource final : public IIndicatorStateSource { public: - HdVoiceStateSource(bool isEnable); - virtual ~HdVoiceStateSource(); + static HdVoiceStateSourceSRef newInstance(bool isEnable); void updateState(bool isEnable); - // IIndicatorStateSource + // IIndicatorStateSource // virtual IndicatorState getState() const override final; virtual void setStateChangeHandler(const NotiHandler &handler) override final; + private: + HdVoiceStateSource(bool isEnable); + ~HdVoiceStateSource() = default; + public: union Bits { struct { @@ -49,6 +52,8 @@ namespace callui { private: Bits m_bits; NotiHandler m_handler; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/HeldCall.cpp b/call-ui/model/impl/HeldCall.cpp index 011c667..033b10d 100644 --- a/call-ui/model/impl/HeldCall.cpp +++ b/call-ui/model/impl/HeldCall.cpp @@ -29,10 +29,6 @@ namespace callui { { } - HeldCall::~HeldCall() - { - } - HeldCallSRef HeldCall::newInstance(CallManagerWRef cm, cm_call_data_h callData) { if (!cm) { diff --git a/call-ui/model/impl/HeldCall.h b/call-ui/model/impl/HeldCall.h index 4d4fbc8..64d54f8 100644 --- a/call-ui/model/impl/HeldCall.h +++ b/call-ui/model/impl/HeldCall.h @@ -32,27 +32,30 @@ namespace callui { class HeldCall final : public IHeldCall { public: - static HeldCallSRef newInstance(CallManagerWRef cm, cm_call_data_h callData); - virtual ~HeldCall(); + static HeldCallSRef newInstance(CallManagerWRef cm, + cm_call_data_h callData); - // IHeldCall + // IHeldCall // virtual ICallInfoSCRef getInfo() const override final; virtual ucl::Result unhold() override final; virtual ucl::Result joinWithActive() override final; virtual ucl::Result swapWithActive() override final; virtual ucl::Result end() override final; - virtual ucl::Result split(const IConferenceCallInfoSCRef &confCallInfo) override final; + virtual ucl::Result split( + const IConferenceCallInfoSCRef &confCallInfo) override final; private: - friend class ucl::ReffedObj; HeldCall(CallManagerWRef cm, cm_call_data_h callData); + ~HeldCall() = default; ucl::Result prepare(cm_call_data_h callData); private: CallManagerWRef m_cm; CallInfoSRef m_callInfo; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/IncomingCall.cpp b/call-ui/model/impl/IncomingCall.cpp index 783446f..4880988 100644 --- a/call-ui/model/impl/IncomingCall.cpp +++ b/call-ui/model/impl/IncomingCall.cpp @@ -30,10 +30,6 @@ namespace callui { { } - IncomingCall::~IncomingCall() - { - } - IncomingCallSRef IncomingCall::newInstance(CallManagerWRef cm, cm_call_data_h callData) { if (!cm) { diff --git a/call-ui/model/impl/IncomingCall.h b/call-ui/model/impl/IncomingCall.h index 2a163a4..72f4e14 100644 --- a/call-ui/model/impl/IncomingCall.h +++ b/call-ui/model/impl/IncomingCall.h @@ -34,9 +34,7 @@ namespace callui { public: static IncomingCallSRef newInstance(CallManagerWRef cm, cm_call_data_h callData); - virtual ~IncomingCall(); - - // IIncomingCall + // IIncomingCall // virtual ICallInfoSCRef getInfo() const override final; virtual IRejectMsgProviderSRef getRejectMsgProvider() const override final; @@ -46,14 +44,16 @@ namespace callui { virtual ucl::Result stopAlert() override final; private: - friend class ucl::ReffedObj; IncomingCall(CallManagerWRef cm, cm_call_data_h callData); + ~IncomingCall() = default; ucl::Result prepare(cm_call_data_h callData); private: CallManagerWRef m_cm; CallInfoSRef m_callInfo; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/IndicatorStateProvider.cpp b/call-ui/model/impl/IndicatorStateProvider.cpp index 7c89d9b..a23f8e7 100644 --- a/call-ui/model/impl/IndicatorStateProvider.cpp +++ b/call-ui/model/impl/IndicatorStateProvider.cpp @@ -62,10 +62,6 @@ namespace callui { { } - IndicatorStateProvider::~IndicatorStateProvider() - { - } - IndicatorStateProviderSRef IndicatorStateProvider::newInstance() { return makeShared(); diff --git a/call-ui/model/impl/IndicatorStateProvider.h b/call-ui/model/impl/IndicatorStateProvider.h index e80d447..724fdf8 100644 --- a/call-ui/model/impl/IndicatorStateProvider.h +++ b/call-ui/model/impl/IndicatorStateProvider.h @@ -31,19 +31,17 @@ namespace callui { public: static IndicatorStateProviderSRef newInstance(); - virtual ~IndicatorStateProvider(); - - virtual ucl::Result setStateSource(IndicatorProperty property, + ucl::Result setStateSource(IndicatorProperty property, IIndicatorStateSourceSRef source); - // IIndicatorStateProvider + // IIndicatorStateProvider // virtual IndicatorState getState(IndicatorProperty property) const override final; virtual void setListener(IIndicatorStateListenerWRef listener) override final; private: - friend class ucl::ReffedObj; IndicatorStateProvider(); + ~IndicatorStateProvider() = default; void dispatchStateChanged(IndicatorProperty property) const; @@ -58,6 +56,8 @@ namespace callui { private: IIndicatorStateListenerWRef m_listener; std::array m_sources; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/MsgClient.h b/call-ui/model/impl/MsgClient.h index 9992820..96a0b03 100644 --- a/call-ui/model/impl/MsgClient.h +++ b/call-ui/model/impl/MsgClient.h @@ -28,18 +28,19 @@ namespace callui { class MsgClient { public: static MsgClientSRef newInstance(); - virtual ~MsgClient(); msg_handle_t getMsgHandle() const; operator msg_handle_t() const; private: - friend class ucl::ReffedObj; MsgClient(); + ~MsgClient(); ucl::Result prepare(); private: msg_handle_t m_handle; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/RejectMsg.cpp b/call-ui/model/impl/RejectMsg.cpp index e6d3fd3..cee4d95 100644 --- a/call-ui/model/impl/RejectMsg.cpp +++ b/call-ui/model/impl/RejectMsg.cpp @@ -31,10 +31,6 @@ namespace callui { { } - RejectMsg::~RejectMsg() - { - } - RejectMsgSRef RejectMsg::newInstance(MsgClientWRef client, const TString &string) { return makeShared(client, string); diff --git a/call-ui/model/impl/RejectMsg.h b/call-ui/model/impl/RejectMsg.h index b82f19b..b8f317f 100644 --- a/call-ui/model/impl/RejectMsg.h +++ b/call-ui/model/impl/RejectMsg.h @@ -32,22 +32,22 @@ namespace callui { class RejectMsg : public IRejectMsg { public: static RejectMsgSRef newInstance(MsgClientWRef client, const ucl::TString &string); - virtual ~RejectMsg(); - ucl::Result send(const std::string &number, SimSlot slot); - // IRejectMsg + // IRejectMsg // std::string getText() const override final; private: - friend class ucl::ReffedObj; RejectMsg(MsgClientWRef client, const ucl::TString &string); + ~RejectMsg() = default; ucl::Result prepare(); private: MsgClientWRef m_msgClient; ucl::TString m_msg; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/RejectMsgProvider.cpp b/call-ui/model/impl/RejectMsgProvider.cpp index c0a4d93..412dffb 100644 --- a/call-ui/model/impl/RejectMsgProvider.cpp +++ b/call-ui/model/impl/RejectMsgProvider.cpp @@ -30,10 +30,6 @@ namespace callui { { } - RejectMsgProvider::~RejectMsgProvider() - { - } - RejectMsgProviderSRef RejectMsgProvider::newInstance() { auto result = makeShared(); diff --git a/call-ui/model/impl/RejectMsgProvider.h b/call-ui/model/impl/RejectMsgProvider.h index e60d584..86d663f 100644 --- a/call-ui/model/impl/RejectMsgProvider.h +++ b/call-ui/model/impl/RejectMsgProvider.h @@ -30,22 +30,23 @@ namespace callui { class RejectMsgProvider : public IRejectMsgProvider { public: static RejectMsgProviderSRef newInstance(); - virtual ~RejectMsgProvider(); - // IRejectMsgProvider + // IRejectMsgProvider // virtual RejectMsgList getMsgList() const override final; virtual int getMsgCount() const override final; private: - friend class ucl::ReffedObj; RejectMsgProvider(); + ~RejectMsgProvider() = default; ucl::Result prepare(); IRejectMsgSRef getRejectMsgByIndex(int index) const; private: MsgClientSRef m_msgClient; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/RssiStateSource.h b/call-ui/model/impl/RssiStateSource.h index f20a1ef..c4d3812 100644 --- a/call-ui/model/impl/RssiStateSource.h +++ b/call-ui/model/impl/RssiStateSource.h @@ -30,16 +30,15 @@ namespace callui { class RssiStateSource final : public IIndicatorStateSource { public: static RssiStateSourceSRef newInstance(); - virtual ~RssiStateSource(); - // IIndicatorStateSource + // IIndicatorStateSource // virtual IndicatorState getState() const override final; virtual void setStateChangeHandler(const NotiHandler &handler) override final; private: - friend class ucl::ReffedObj; RssiStateSource(); + ~RssiStateSource(); ucl::Result prepare(); ucl::Result addSysStateCallbacks(); @@ -70,6 +69,8 @@ namespace callui { private: Bits m_bits; NotiHandler m_handler; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/SimSlotStateSource.cpp b/call-ui/model/impl/SimSlotStateSource.cpp index e65f4b7..5b89186 100644 --- a/call-ui/model/impl/SimSlotStateSource.cpp +++ b/call-ui/model/impl/SimSlotStateSource.cpp @@ -43,8 +43,9 @@ namespace callui { m_bits.isForwarded = isForwarded; } - SimSlotStateSource::~SimSlotStateSource() + SimSlotStateSourceSRef SimSlotStateSource::newInstance(SimSlot slot, bool isForwarded) { + return makeShared(slot, isForwarded); } void SimSlotStateSource::updateSimSlot(SimSlot slot, bool isForwarded) diff --git a/call-ui/model/impl/SimSlotStateSource.h b/call-ui/model/impl/SimSlotStateSource.h index c1b6b32..db7f380 100644 --- a/call-ui/model/impl/SimSlotStateSource.h +++ b/call-ui/model/impl/SimSlotStateSource.h @@ -25,31 +25,38 @@ namespace callui { class SimSlotStateSource final : public IIndicatorStateSource { public: - SimSlotStateSource(SimSlot slot, bool isForwarded); - virtual ~SimSlotStateSource(); + static SimSlotStateSourceSRef newInstance(SimSlot slot, + bool isForwarded); void updateSimSlot(SimSlot slot, bool isForwarded); - // IIndicatorStateSource + // IIndicatorStateSource // virtual IndicatorState getState() const override final; - virtual void setStateChangeHandler(const NotiHandler &handler) override final; - - public: - union Bits { - struct { - uint8_t property : 4; - uint8_t simSlot : 4; - uint8_t isForwarded: 1; - }; - uint64_t value; - - Bits(); - Bits(const IndicatorState &state); + virtual void setStateChangeHandler( + const NotiHandler &handler) override final; + + private: + SimSlotStateSource(SimSlot slot, bool isForwarded); + ~SimSlotStateSource() = default; + + public: + union Bits { + struct { + uint8_t property : 4; + uint8_t simSlot : 4; + uint8_t isForwarded: 1; }; + uint64_t value; + + Bits(); + Bits(const IndicatorState &state); + }; + + private: + Bits m_bits; + NotiHandler m_handler; - private: - Bits m_bits; - NotiHandler m_handler; + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/SoundManager.h b/call-ui/model/impl/SoundManager.h index afae43a..f70c427 100644 --- a/call-ui/model/impl/SoundManager.h +++ b/call-ui/model/impl/SoundManager.h @@ -36,9 +36,8 @@ namespace callui { public ISoundManager { public: static SoundManagerSRef newInstance(const CallClientSRef &client); - virtual ~SoundManager(); - // ISoundManager + // ISoundManager // virtual ucl::Result setSpeakerState(bool isEnable) override final; virtual ucl::Result setBluetoothState(bool isEnable) override final; @@ -79,8 +78,8 @@ namespace callui { const NotiHandler &handler) override final; private: - friend class ucl::ReffedObj; SoundManager(ucl::IRefCountObj &rc, const CallClientSRef &client); + ~SoundManager(); ucl::Result prepare(); ucl::Result registerCallbacks(); @@ -100,6 +99,8 @@ namespace callui { ucl::Event m_volumeLevelEvent; ucl::Event m_btVoiceDeviceConnEvent; int m_deviceVolumeCbId; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/VoiceControlStateProvider.h b/call-ui/model/impl/VoiceControlStateProvider.h index ad37ddd..0c034b5 100644 --- a/call-ui/model/impl/VoiceControlStateProvider.h +++ b/call-ui/model/impl/VoiceControlStateProvider.h @@ -28,15 +28,14 @@ namespace callui { class VoiceControlStateProvider final { public: static VoiceControlStateProviderSRef newInstance(); - virtual ~VoiceControlStateProvider(); bool getState() const; void addStateChangeHandler(const NotiHandler &handler); void removeStateChangeHandler(const NotiHandler &handler); private: - friend class ucl::ReffedObj; VoiceControlStateProvider(); + ~VoiceControlStateProvider(); ucl::Result prepare(); @@ -50,6 +49,8 @@ namespace callui { private: bool m_enableState; ucl::Event m_event; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/model/impl/VoiceControlStateSource.h b/call-ui/model/impl/VoiceControlStateSource.h index 47487e6..440a904 100644 --- a/call-ui/model/impl/VoiceControlStateSource.h +++ b/call-ui/model/impl/VoiceControlStateSource.h @@ -33,18 +33,17 @@ namespace callui { public: static VoiceControlStateSourceSRef newInstance( const VoiceControlStateProviderSRef &provider); - virtual ~VoiceControlStateSource(); - // IIndicatorStateSource + // IIndicatorStateSource // virtual IndicatorState getState() const override final; virtual void setStateChangeHandler( const NotiHandler &handler) override final; private: - friend class ucl::ReffedObj; VoiceControlStateSource(ucl::IRefCountObj &rc, const VoiceControlStateProviderSRef &provider); + ~VoiceControlStateSource(); ucl::Result prepare(); @@ -68,6 +67,8 @@ namespace callui { Bits m_bits; NotiHandler m_handler; VoiceControlStateProviderSRef m_vcProvider; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/presenters/base/Page.h b/call-ui/presenters/base/Page.h index 59295ec..a87ab92 100644 --- a/call-ui/presenters/base/Page.h +++ b/call-ui/presenters/base/Page.h @@ -48,7 +48,7 @@ namespace callui { template ucl::NaviItem insertBefore(ARGS &&...args); - // ucl::IDisposable + // ucl::IDisposable // virtual void dispose() override; virtual bool isDisposed() const final override; @@ -56,7 +56,7 @@ namespace callui { protected: Page(ucl::IRefCountObj &rc, const ucl::NaviframeSRef &navi, const ExitRequestHandler &onExitRequest); - virtual ~Page(); + ~Page(); template ucl::Result prepare(ON_PREPARE &&onPrepare); @@ -88,7 +88,7 @@ namespace callui { PageSRef m_selfRef; }; - // Non-member functions + // Non-member functions // bool isLast(const Page &page); } diff --git a/call-ui/presenters/base/Page.hpp b/call-ui/presenters/base/Page.hpp index 2ef28d2..a5b23bb 100644 --- a/call-ui/presenters/base/Page.hpp +++ b/call-ui/presenters/base/Page.hpp @@ -57,7 +57,7 @@ namespace callui { return (m_navi->getBottomItem() == m_item); } - // Non-member functions + // Non-member functions // inline bool isLast(const Page &page) { diff --git a/call-ui/presenters/dialogs/AcceptDialog.cpp b/call-ui/presenters/dialogs/AcceptDialog.cpp index af607e2..704a9b5 100644 --- a/call-ui/presenters/dialogs/AcceptDialog.cpp +++ b/call-ui/presenters/dialogs/AcceptDialog.cpp @@ -51,10 +51,6 @@ namespace callui { { } - AcceptDialog::Builder::~Builder() - { - } - AcceptDialog::Builder & AcceptDialog::Builder::setHandler(EventHandler handler) { diff --git a/call-ui/presenters/dialogs/AcceptDialog.h b/call-ui/presenters/dialogs/AcceptDialog.h index c1627d3..4fa9a6a 100644 --- a/call-ui/presenters/dialogs/AcceptDialog.h +++ b/call-ui/presenters/dialogs/AcceptDialog.h @@ -42,7 +42,6 @@ namespace callui { class Builder { public: Builder(); - ~Builder(); Builder &setHandler(EventHandler handler); AcceptDialogWRef build(ucl::ElmWidget &parent) const; private: @@ -50,19 +49,16 @@ namespace callui { }; public: - virtual ~AcceptDialog(); - void dismiss(); - // ucl::IDisposable + // ucl::IDisposable // virtual void dispose() final override; virtual bool isDisposed() const final override; private: - friend class ucl::ReffedObj; - AcceptDialog(ucl::IRefCountObj &rc, - const EventHandler &handler); + AcceptDialog(ucl::IRefCountObj &rc, const EventHandler &handler); + ~AcceptDialog(); ucl::Result prepare(ucl::ElmWidget &parent); @@ -91,6 +87,8 @@ namespace callui { EventHandler m_handler; AcceptDialogSRef m_selfRef; bool m_isDismissed; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/presenters/misc/AcceptRejectPresenter.cpp b/call-ui/presenters/misc/AcceptRejectPresenter.cpp index 4192e75..0dde4a0 100644 --- a/call-ui/presenters/misc/AcceptRejectPresenter.cpp +++ b/call-ui/presenters/misc/AcceptRejectPresenter.cpp @@ -22,17 +22,13 @@ namespace callui { using namespace ucl; - // AcceptRejectPresenter::Builder + // AcceptRejectPresenter::Builder // AcceptRejectPresenter::Builder::Builder(): m_callMask(CALL_FLAG_NONE) { } - AcceptRejectPresenter::Builder::~Builder() - { - } - AcceptRejectPresenter::Builder & AcceptRejectPresenter::Builder::setIncomingCall( const IIncomingCallSRef &call) @@ -79,7 +75,7 @@ namespace callui { return result; } - // AcceptRejectPresenter + // AcceptRejectPresenter // AcceptRejectPresenter::AcceptRejectPresenter(IRefCountObj &rc, const IIncomingCallSRef &call, @@ -270,7 +266,6 @@ namespace callui { AcceptButtonType::SIMPLE); } - // Screen Reader ElmWidget *AcceptRejectPresenter::getAcceptAo() { return m_widget->getAcceptAo(); diff --git a/call-ui/presenters/misc/AcceptRejectPresenter.h b/call-ui/presenters/misc/AcceptRejectPresenter.h index 800b4d0..7708281 100644 --- a/call-ui/presenters/misc/AcceptRejectPresenter.h +++ b/call-ui/presenters/misc/AcceptRejectPresenter.h @@ -39,7 +39,6 @@ namespace callui { class Builder { public: Builder(); - ~Builder(); Builder &setIncomingCall(const IIncomingCallSRef &call); Builder &setSoundManager(const ISoundManagerSRef &sm); Builder &setAvailableCallsFlag(CallMask calls); @@ -54,21 +53,18 @@ namespace callui { }; public: - virtual ~AcceptRejectPresenter(); - ucl::Widget &getWidget(); - void update(CallMask calls); ucl::ElmWidget *getAcceptAo(); ucl::ElmWidget *getRejectAo(); private: - friend class ucl::ReffedObj; AcceptRejectPresenter(ucl::IRefCountObj &rc, const IIncomingCallSRef &call, CallMask calls, const ISoundManagerSRef &sm); + ~AcceptRejectPresenter(); ucl::Result prepare(ucl::GuiPresenter &parent, ucl::ElmWidget &parentWidget); @@ -88,7 +84,8 @@ namespace callui { void onRejectEvent(); void onBTHeadsetConnectionChanged(); - // GuiPresenter + // GuiPresenter // + virtual void onActivate() final override; virtual void onDeactivate() final override; @@ -100,6 +97,8 @@ namespace callui { IIncomingCallSRef m_call; CallMask m_callMask; ISoundManagerSRef m_sm; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/presenters/misc/AccessoryPresenter.cpp b/call-ui/presenters/misc/AccessoryPresenter.cpp index 6e85959..76173c1 100644 --- a/call-ui/presenters/misc/AccessoryPresenter.cpp +++ b/call-ui/presenters/misc/AccessoryPresenter.cpp @@ -765,7 +765,6 @@ namespace callui { m_muteBtn->emit(impl::SIGNAL_TURN_OFF); } - // Screen Reader ElmWidget *AccessoryPresenter::getVolumBtn() { return m_volumeBtn.get(); diff --git a/call-ui/presenters/misc/AccessoryPresenter.h b/call-ui/presenters/misc/AccessoryPresenter.h index 90b9adc..a85efe6 100644 --- a/call-ui/presenters/misc/AccessoryPresenter.h +++ b/call-ui/presenters/misc/AccessoryPresenter.h @@ -54,13 +54,10 @@ namespace callui { }; public: - virtual ~AccessoryPresenter(); - ucl::Widget &getWidget(); void hideVolumeControls(); ucl::Result update(const ICallManagerSRef &cm); - // Screen Reader ucl::ElmWidget *getVolumBtn(); ucl::ElmWidget *getBluetoothBtn(); ucl::ElmWidget *getMuteBtn(); @@ -78,9 +75,9 @@ namespace callui { END }; private: - friend class ucl::ReffedObj; AccessoryPresenter(ucl::IRefCountObj &rc, const ISoundManagerSRef &sm, const NotiHandler &handler); + ~AccessoryPresenter(); ucl::Result prepare(ucl::GuiPresenter &parent, ucl::ElmWidget &parentWidget, const ICallManagerSRef &cm); @@ -133,7 +130,6 @@ namespace callui { ucl::Result setActiveCallCompomnents(); ucl::Result setEndCallCompomnents(const ICallManagerSRef &cm); - // Screen Reader void registerVolumeControlAo(); void onVolumeControlScreenReaderReadStart(ucl::Widget &widget, void *eventInfo); @@ -155,6 +151,8 @@ namespace callui { NotiHandler m_exitHandler; bool m_isVcShowOnRotaryEvent; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/presenters/misc/AtspiHighlightHelper.cpp b/call-ui/presenters/misc/AtspiHighlightHelper.cpp index 98ec77b..545d098 100644 --- a/call-ui/presenters/misc/AtspiHighlightHelper.cpp +++ b/call-ui/presenters/misc/AtspiHighlightHelper.cpp @@ -45,10 +45,6 @@ namespace callui { { } - AtspiHighlightHelper::~AtspiHighlightHelper() - { - } - Result AtspiHighlightHelper::prepare(GuiPresenter &parent, ElmWidget &rootWidget) { diff --git a/call-ui/presenters/misc/AtspiHighlightHelper.h b/call-ui/presenters/misc/AtspiHighlightHelper.h index 0ff1ff3..e47e583 100644 --- a/call-ui/presenters/misc/AtspiHighlightHelper.h +++ b/call-ui/presenters/misc/AtspiHighlightHelper.h @@ -45,9 +45,8 @@ namespace callui { const Elm_Atspi_Gesture_Info &info); private: - friend class ucl::ReffedObj; AtspiHighlightHelper(ucl::IRefCountObj &rc); - virtual ~AtspiHighlightHelper(); + ~AtspiHighlightHelper() = default; ucl::Result prepare(GuiPresenter &parent, ucl::ElmWidget &rootWidget); @@ -60,6 +59,8 @@ namespace callui { private: RelationEventHandler m_relationEventHandler; GestureEventHandler m_gestureEventHandler; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/presenters/misc/CallInfoPresenter.cpp b/call-ui/presenters/misc/CallInfoPresenter.cpp index 002254f..803310d 100644 --- a/call-ui/presenters/misc/CallInfoPresenter.cpp +++ b/call-ui/presenters/misc/CallInfoPresenter.cpp @@ -94,10 +94,6 @@ namespace callui { { } - CallInfoPresenter::Builder::~Builder() - { - } - CallInfoPresenter::Builder & CallInfoPresenter::Builder::setCallManager(const ICallManagerSRef &cm) { @@ -662,7 +658,6 @@ namespace callui { return RES_OK; } - // Screen Reader ElmWidget *CallInfoPresenter::getMainTxtAo() { return m_mainTxtAO.get(); diff --git a/call-ui/presenters/misc/CallInfoPresenter.h b/call-ui/presenters/misc/CallInfoPresenter.h index bc9a32a..753dbd4 100644 --- a/call-ui/presenters/misc/CallInfoPresenter.h +++ b/call-ui/presenters/misc/CallInfoPresenter.h @@ -36,7 +36,6 @@ namespace callui { class Builder { public: Builder(); - virtual ~Builder(); Builder &setCallManager(const ICallManagerSRef &cm); Builder &setMode(CallMode mode); Builder &setParentWidget(const ucl::ElmWidgetSRef &parentWidget); @@ -48,22 +47,19 @@ namespace callui { }; public: - virtual ~CallInfoPresenter(); - ucl::Widget &getWidget(); CallMode getMode() const; ucl::Result update(CallMode mode, const ICallManagerSRef &cm); - // Screen Reader ucl::ElmWidget *getStatusTxtAo(); ucl::ElmWidget *getMainTxtAo(); ucl::ElmWidget *getSubTxtAo(); private: - friend class ucl::ReffedObj; CallInfoPresenter(ucl::IRefCountObj &rc, const ICallManagerSRef &cm, CallMode mode); + ~CallInfoPresenter(); ucl::Result prepare(ucl::GuiPresenter &parent, ucl::ElmWidget &parentWidget); @@ -93,7 +89,6 @@ namespace callui { void unsetLanguageChangeCallback(); void onLanguageChanged(ucl::Widget &widget, void *eventInfo); - // Screen Reader ucl::Result setMainTxtAccessObject(const std::string &text); ucl::Result setSubTxtAccessObject(const std::string &text); @@ -111,10 +106,11 @@ namespace callui { bool m_isSubTxtEnable; bool m_needModifyCallStatus; - // Screen Reader ucl::ElmWidgetSRef m_statusAO; ucl::ElmWidgetSRef m_mainTxtAO; ucl::ElmWidgetSRef m_subTxtAO; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/presenters/misc/CallStatusPresenter.cpp b/call-ui/presenters/misc/CallStatusPresenter.cpp index 8b80a6b..642e620 100644 --- a/call-ui/presenters/misc/CallStatusPresenter.cpp +++ b/call-ui/presenters/misc/CallStatusPresenter.cpp @@ -48,10 +48,6 @@ namespace callui { { } - CallStatusPresenter::Builder::~Builder() - { - } - CallStatusPresenter::Builder & CallStatusPresenter::Builder::setMode(CallMode mode) { @@ -284,7 +280,6 @@ namespace callui { return RES_OK; } - // Screen Reader Result CallStatusPresenter::createStatusTxtAo() { if (!m_statusTxtAo) { diff --git a/call-ui/presenters/misc/CallStatusPresenter.h b/call-ui/presenters/misc/CallStatusPresenter.h index c1ea4eb..b02b39d 100644 --- a/call-ui/presenters/misc/CallStatusPresenter.h +++ b/call-ui/presenters/misc/CallStatusPresenter.h @@ -36,7 +36,6 @@ namespace callui { class Builder { public: Builder(); - virtual ~Builder(); Builder &setMode(CallMode mode); Builder &setCallInfo(const ICallInfoWCRef &info); Builder &setCallHoldState(bool isOnHold); @@ -49,18 +48,15 @@ namespace callui { bool m_isOnHold; }; public: - virtual ~CallStatusPresenter(); - - // Screen Reader ucl::ElmWidget *getStatusTextAo(); private: - friend class ucl::ReffedObj; CallStatusPresenter(ucl::IRefCountObj &rc, const ucl::LayoutSRef &layout, CallMode mode, const ICallInfoWCRef &info, bool isOnHold); + ~CallStatusPresenter(); ucl::Result prepare(ucl::GuiPresenter &parent); @@ -76,7 +72,6 @@ namespace callui { void unsetLanguageChangeCallback(); void onLanguageChanged(ucl::Widget &widget, void *eventInfo); - // Screen Reader ucl::Result createStatusTxtAo(); private: @@ -88,8 +83,9 @@ namespace callui { struct tm m_duration; int m_blinkCount; - // Screen Reader ucl::ElmWidgetSRef m_statusTxtAo; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/presenters/misc/DeviceStatePresenter.cpp b/call-ui/presenters/misc/DeviceStatePresenter.cpp index 763bb4e..b1a37b6 100644 --- a/call-ui/presenters/misc/DeviceStatePresenter.cpp +++ b/call-ui/presenters/misc/DeviceStatePresenter.cpp @@ -26,7 +26,7 @@ namespace callui { using namespace ucl; - // DeviceStatePresenter::Builder + // DeviceStatePresenter::Builder // DeviceStatePresenter::Builder::Builder(): m_state(DisplayState::UNDEFINED), @@ -66,7 +66,7 @@ namespace callui { return result; } - // DeviceStatePresenter + // DeviceStatePresenter // DeviceStatePresenter::DeviceStatePresenter(const ucl::WindowSRef &window): m_window(window), diff --git a/call-ui/presenters/misc/DeviceStatePresenter.h b/call-ui/presenters/misc/DeviceStatePresenter.h index 5cdfa04..e605c8b 100644 --- a/call-ui/presenters/misc/DeviceStatePresenter.h +++ b/call-ui/presenters/misc/DeviceStatePresenter.h @@ -62,7 +62,6 @@ namespace callui { ucl::Result setCpuLockState(bool lockState); private: - friend class ucl::ReffedObj; DeviceStatePresenter(const ucl::WindowSRef &window); ~DeviceStatePresenter() = default; @@ -74,6 +73,8 @@ namespace callui { ucl::WindowSRef m_window; DisplayMode m_mode; bool m_lockState; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/presenters/misc/IndicatorPresenter.cpp b/call-ui/presenters/misc/IndicatorPresenter.cpp index f8f2ee6..e68e2dc 100644 --- a/call-ui/presenters/misc/IndicatorPresenter.cpp +++ b/call-ui/presenters/misc/IndicatorPresenter.cpp @@ -166,10 +166,6 @@ namespace callui { { } - IndicatorPresenter::Builder::~Builder() - { - } - IndicatorPresenter::Builder & IndicatorPresenter::Builder::setIndicatorStateProvider( const IIndicatorStateProviderSRef &provider) diff --git a/call-ui/presenters/misc/IndicatorPresenter.h b/call-ui/presenters/misc/IndicatorPresenter.h index 6569db2..c7be903 100644 --- a/call-ui/presenters/misc/IndicatorPresenter.h +++ b/call-ui/presenters/misc/IndicatorPresenter.h @@ -36,7 +36,6 @@ namespace callui { class Builder { public: Builder(); - ~Builder(); Builder &setIndicatorStateProvider( const IIndicatorStateProviderSRef &provider); Builder &setParentWidget(const ucl::ElmWidgetSRef @@ -48,16 +47,14 @@ namespace callui { }; public: - virtual ~IndicatorPresenter(); - ucl::Widget &getWidget(); void udapteIncomingCallMode(bool isIncomingCallMode); private: - friend class ucl::ReffedObj; IndicatorPresenter(ucl::IRefCountObj &rc, const IIndicatorStateProviderSRef &provider); + ~IndicatorPresenter(); ucl::Result prepare(ucl::GuiPresenter &parent, ucl::ElmWidget &parentWidget); @@ -77,7 +74,7 @@ namespace callui { void updateCentralIcon(); - // IIndicatorStateListener + // IIndicatorStateListener // virtual void onStateChanged(IndicatorProperty property) override final; @@ -91,6 +88,8 @@ namespace callui { ucl::LayoutSRef m_voiceControlLayout; IIndicatorStateProviderSRef m_provider; bool m_isIncomingCallMode; + + friend class ucl::ReffedObj; }; ucl::EdjeSignal getConnectionSignal(ConnectionType type); diff --git a/call-ui/presenters/misc/MoreOptionsPresenter.cpp b/call-ui/presenters/misc/MoreOptionsPresenter.cpp index 51b4199..0dbd53f 100644 --- a/call-ui/presenters/misc/MoreOptionsPresenter.cpp +++ b/call-ui/presenters/misc/MoreOptionsPresenter.cpp @@ -62,7 +62,7 @@ namespace callui { using namespace ucl; - // MoreOptionsPresenter::Builder + // MoreOptionsPresenter::Builder // MoreOptionsPresenter::Builder::Builder() { @@ -111,7 +111,7 @@ namespace callui { return result; } - // MoreOptionsPresenter + // MoreOptionsPresenter // MoreOptionsPresenter::MoreOptionsPresenter(IRefCountObj &rc, const ICallManagerSRef &cm, @@ -529,7 +529,6 @@ namespace callui { show(widget); } - // Screen Reader Result MoreOptionsPresenter::createAtspiHighlightHelper() { DLOG("ENTER"); diff --git a/call-ui/presenters/misc/MoreOptionsPresenter.h b/call-ui/presenters/misc/MoreOptionsPresenter.h index 8a599f2..db82a39 100644 --- a/call-ui/presenters/misc/MoreOptionsPresenter.h +++ b/call-ui/presenters/misc/MoreOptionsPresenter.h @@ -55,16 +55,14 @@ namespace callui { ucl::Widget &getWidget(); void update(); - // Screen Reader ucl::ElmWidget *getCueAo(); private: - friend class ucl::ReffedObj; MoreOptionsPresenter(ucl::IRefCountObj &rc, const ICallManagerSRef &cm, const ISoundManagerSRef &sm, const ucl::NaviframeSRef &navi); - virtual ~MoreOptionsPresenter(); + ~MoreOptionsPresenter(); ucl::Result prepare(ucl::GuiPresenter &parent, ucl::ElmWidget &parentWidget); @@ -116,7 +114,6 @@ namespace callui { void onPageExitRequest(Page &page); - // Screen Reader ucl::Result createAccessObjects(); ucl::Result createCueAo(); ucl::Result createStatusTxtAo(); @@ -145,11 +142,12 @@ namespace callui { Ecore_Timer *m_timer; struct tm m_duration; - // Screen Reader AtspiHighlightHelperSRef m_atspiHelper; ucl::ElmWidgetSRef m_fakeAo; ucl::ElmWidgetSRef m_cueAo; ucl::ElmWidgetSRef m_statusTxtAo; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/presenters/misc/MotionSensorPresenter.h b/call-ui/presenters/misc/MotionSensorPresenter.h index e80f2d9..648ec64 100644 --- a/call-ui/presenters/misc/MotionSensorPresenter.h +++ b/call-ui/presenters/misc/MotionSensorPresenter.h @@ -34,9 +34,8 @@ namespace callui { MotionSensorPresenterSRef build(const NotiHandler handler) const; }; private: - friend class ucl::ReffedObj; MotionSensorPresenter(const NotiHandler &handler); - virtual ~MotionSensorPresenter(); + ~MotionSensorPresenter(); ucl::Result prepare(); @@ -48,6 +47,8 @@ namespace callui { private: NotiHandler m_handler; gesture_h m_gesture; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/presenters/misc/RejectMsgPresenter.cpp b/call-ui/presenters/misc/RejectMsgPresenter.cpp index 64c5b3c..dfad3d4 100644 --- a/call-ui/presenters/misc/RejectMsgPresenter.cpp +++ b/call-ui/presenters/misc/RejectMsgPresenter.cpp @@ -81,10 +81,6 @@ namespace callui { { } - RejectMsgPresenter::Builder::~Builder() - { - } - RejectMsgPresenter::Builder & RejectMsgPresenter::Builder::setProvider( const IRejectMsgProviderSRef &provider) @@ -544,7 +540,6 @@ namespace callui { } } - // Screen Reader Elm_Interface_Atspi_Accessible *RejectMsgPresenter::getFirstAo() { return (m_genlist) ? diff --git a/call-ui/presenters/misc/RejectMsgPresenter.h b/call-ui/presenters/misc/RejectMsgPresenter.h index ba754c8..1a96516 100644 --- a/call-ui/presenters/misc/RejectMsgPresenter.h +++ b/call-ui/presenters/misc/RejectMsgPresenter.h @@ -46,7 +46,6 @@ namespace callui { class Builder { public: Builder(); - virtual ~Builder(); Builder &setProvider(const IRejectMsgProviderSRef &provider); Builder &setStateHandler(const StateHandler &handler); Builder &setSelectHandler(const SelectHandler &handler); @@ -61,8 +60,6 @@ namespace callui { }; public: - virtual ~RejectMsgPresenter(); - ucl::Widget &getWidget(); State getState(); @@ -77,11 +74,11 @@ namespace callui { class RejectMsgItem; private: - friend class ucl::ReffedObj; RejectMsgPresenter(ucl::IRefCountObj &rc, const IRejectMsgProviderSRef &provider, const StateHandler &stateHandler, const SelectHandler &selectHandler); + ~RejectMsgPresenter(); ucl::Result prepare(ucl::GuiPresenter &parent, ucl::ElmWidget &parentWidget); @@ -111,7 +108,6 @@ namespace callui { void unsetLanguageChangeCallback(); void onLanguageChanged(ucl::Widget &widget, void *eventInfo); - // Screen Reader ucl::Result createAtspiHighlightHelper(); void registerGenlistAtspiGestureCallbacks(); Elm_Interface_Atspi_Accessible *getFirstAo(); @@ -123,7 +119,7 @@ namespace callui { Elm_Interface_Atspi_Accessible *ao, Elm_Atspi_Relation_Type flowRelation); - // Presenter + // GuiPresenter // virtual void onActivate() final override; virtual void onDeactivate() final override; @@ -141,8 +137,9 @@ namespace callui { SelectHandler m_selectHandler; State m_state; - // Screen Reader AtspiHighlightHelperSRef m_atspiHelper; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/presenters/pages/KeypadPage.cpp b/call-ui/presenters/pages/KeypadPage.cpp index 6031225..9022845 100644 --- a/call-ui/presenters/pages/KeypadPage.cpp +++ b/call-ui/presenters/pages/KeypadPage.cpp @@ -91,10 +91,6 @@ namespace callui { { } - KeypadPage::Builder::~Builder() - { - } - KeypadPage::Builder &KeypadPage::Builder::setNaviframe( const NaviframeSRef &navi) { @@ -136,7 +132,7 @@ namespace callui { return result; } - // KeypadPage + // KeypadPage // KeypadPage::KeypadPage(IRefCountObj &rc, const ISoundManagerSRef &sm, @@ -597,7 +593,6 @@ namespace callui { KeypadPage::onVolumeLevelChanged, asWeak(*this))); } - // Screen Reader Result KeypadPage::createAtspiHighlightHelper() { m_atspiHelper = AtspiHighlightHelper::newInstance(*this, getWindow()); diff --git a/call-ui/presenters/pages/KeypadPage.h b/call-ui/presenters/pages/KeypadPage.h index 17f3298..8db9996 100644 --- a/call-ui/presenters/pages/KeypadPage.h +++ b/call-ui/presenters/pages/KeypadPage.h @@ -36,7 +36,6 @@ namespace callui { class Builder { public: Builder(); - ~Builder(); Builder &setNaviframe(const ucl::NaviframeSRef &navi); Builder &setSoundManager(const ISoundManagerSRef &sm); KeypadPageSRef build(const ExitRequestHandler onExitRequest) const; @@ -46,12 +45,11 @@ namespace callui { }; private: - friend class ucl::ReffedObj; KeypadPage(ucl::IRefCountObj &rc, const ISoundManagerSRef &sm, const ucl::NaviframeSRef &navi, const ExitRequestHandler onExitRequest); - virtual ~KeypadPage(); + ~KeypadPage(); ucl::Result doPrepare(ucl::NaviItem &item); @@ -88,7 +86,6 @@ namespace callui { void registerCallbacks(); void unregisterCallbacks(); - // Screen Reader ucl::Result createAtspiHighlightHelper(); Elm_Interface_Atspi_Accessible *onAtspiHighlight( Elm_Interface_Atspi_Accessible *ao, @@ -100,8 +97,7 @@ namespace callui { ucl::Widget &widget, void *eventInfo); - - // Page + // Page // virtual void onBackKey() override final; @@ -116,8 +112,9 @@ namespace callui { Ecore_Timer *m_vcTimer; AudioStateType m_audioState; - // Screen Reader AtspiHighlightHelperSRef m_atspiHelper; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/presenters/pages/MainPage.cpp b/call-ui/presenters/pages/MainPage.cpp index a5a8d77..23f6974 100644 --- a/call-ui/presenters/pages/MainPage.cpp +++ b/call-ui/presenters/pages/MainPage.cpp @@ -56,7 +56,7 @@ namespace callui { using namespace ucl; - // MainPage::Builder + // MainPage::Builder // MainPage::Builder::Builder() { @@ -108,7 +108,7 @@ namespace callui { return result; } - // MainPage + // MainPage // MainPage::MainPage(IRefCountObj &rc, const NaviframeSRef &navi, @@ -122,10 +122,6 @@ namespace callui { { } - MainPage::~MainPage() - { - } - Result MainPage::doPrepare(NaviItem &item) { m_cm = m_call->getCallManager(); @@ -706,7 +702,6 @@ namespace callui { } } - // Screen Reader Result MainPage::createRejectMsgCueAo() { m_rmCueAo = utils::createAccessObjectFromLyPart(*m_widget, diff --git a/call-ui/presenters/pages/MainPage.h b/call-ui/presenters/pages/MainPage.h index 4a826a9..8bfd261 100644 --- a/call-ui/presenters/pages/MainPage.h +++ b/call-ui/presenters/pages/MainPage.h @@ -52,12 +52,11 @@ namespace callui { }; private: - friend class ucl::ReffedObj; MainPage(ucl::IRefCountObj &rc, const ucl::NaviframeSRef &navi, const ExitRequestHandler handler, const ICallUISRef &call); - virtual ~MainPage(); + ~MainPage() = default; ucl::Result doPrepare(ucl::NaviItem &item); @@ -102,7 +101,6 @@ namespace callui { void onExitAppRequest(); - // Screen Reader ucl::Result createRejectMsgCueAo(); ucl::Result createAtspiHighlightHelper(); void registerIncomingCallModeAo(); @@ -121,11 +119,11 @@ namespace callui { Elm_Interface_Atspi_Accessible *widget, Elm_Atspi_Gesture_Type gestureType); - // Page + // Page // virtual void onBackKey() final override; - // ICallListener + // ICallListener // virtual void onCallEvent(CallEventType type) final override; virtual void onError(CallErr err) final override; @@ -149,9 +147,10 @@ namespace callui { Ecore_Timer *m_ecTimer; bool m_ecTimerBtnReq; - // Screen Reader ucl::ElmWidgetSRef m_rmCueAo; AtspiHighlightHelperSRef m_atspiHelper; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/view/AcceptRejectWidget.cpp b/call-ui/view/AcceptRejectWidget.cpp index 7468f03..fe2a48d 100644 --- a/call-ui/view/AcceptRejectWidget.cpp +++ b/call-ui/view/AcceptRejectWidget.cpp @@ -1451,7 +1451,6 @@ namespace callui { setRejectUnpressedTransitions(); } - // Screen Reader ElmWidget *AcceptRejectWidget::getAcceptAo() { return m_accAo.get(); diff --git a/call-ui/view/AcceptRejectWidget.h b/call-ui/view/AcceptRejectWidget.h index 0bbe173..a82589b 100644 --- a/call-ui/view/AcceptRejectWidget.h +++ b/call-ui/view/AcceptRejectWidget.h @@ -46,7 +46,7 @@ namespace callui { }; public: - ~AcceptRejectWidget(); + virtual ~AcceptRejectWidget(); void startBezelCueAnimation(); void reset(); @@ -54,12 +54,10 @@ namespace callui { void deactivateRotary(); void setAcceptBtnType(AcceptButtonType type); - // Screen Reader ucl::ElmWidget *getAcceptAo(); ucl::ElmWidget *getRejectAo(); private: - friend class ucl::ReffedObj; AcceptRejectWidget(ucl::IRefCountObj &rc, const ucl::LayoutSRef &layout, const NotiHandler &acceptHandler, @@ -131,7 +129,6 @@ namespace callui { void setAcceptUnpressedState(); void setRejectUnpressedState(); - // Screen Reader ucl::Result registerAccessObjects( ucl::ElmWidget &widget); @@ -184,9 +181,10 @@ namespace callui { AcceptButtonType m_acceptBtnType; - // Screen Reader ucl::ElmWidgetSRef m_accAo; ucl::ElmWidgetSRef m_rejAo; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/view/Slider.cpp b/call-ui/view/Slider.cpp index f127de4..09fad5a 100644 --- a/call-ui/view/Slider.cpp +++ b/call-ui/view/Slider.cpp @@ -79,10 +79,6 @@ namespace callui { prepare(maxValue, curValue); } - Slider::~Slider() - { - } - void Slider::prepare(int maxValue, int curValue) { m_layout->setIsOwner(false); diff --git a/call-ui/view/Slider.h b/call-ui/view/Slider.h index 63cfddf..dcc330f 100644 --- a/call-ui/view/Slider.h +++ b/call-ui/view/Slider.h @@ -40,16 +40,16 @@ namespace callui { }; public: + virtual ~Slider() = default; + virtual void setValue(int value); virtual void setMaxValue(int maxValue); protected: - friend class ucl::ReffedObj; Slider(ucl::IRefCountObj &rc, const ucl::LayoutSRef &layout, int maxValue, int curValue); - virtual ~Slider(); private: void prepare(int maxValue, int curValue); @@ -59,6 +59,8 @@ namespace callui { ucl::Layout m_circleLy; Eext_Circle_Surface *m_circleSurf; ucl::ElmWidget m_slider; + + friend class ucl::ReffedObj; }; } diff --git a/call-ui/view/VolumeControl.cpp b/call-ui/view/VolumeControl.cpp index 2b3e188..f0a20b7 100644 --- a/call-ui/view/VolumeControl.cpp +++ b/call-ui/view/VolumeControl.cpp @@ -109,10 +109,6 @@ namespace callui { prepare(info, curValue); } - VolumeControl::~VolumeControl() - { - } - void VolumeControl::prepare(const TString &info, int curValue) { m_layout->addEventHandler(WidgetEvent::SHOW, WEAK_DELEGATE( @@ -191,7 +187,6 @@ namespace callui { } } - // Screen Reader ElmWidget *VolumeControl::getDecreaseBtn() { return &m_decreaseBtn; diff --git a/call-ui/view/VolumeControl.h b/call-ui/view/VolumeControl.h index adbf500..a1cbe9d 100644 --- a/call-ui/view/VolumeControl.h +++ b/call-ui/view/VolumeControl.h @@ -54,22 +54,22 @@ namespace callui { }; public: + virtual ~VolumeControl() = default; + void setInfoText(const ucl::TString &info); void setDecreaseBtnEnable(bool isEnable); void setIncreaseBtnEnable(bool isEnable); void setEventHandler(const EventHandler &handler); - // Slider - - virtual void setValue(int value) override final; - - // Screen Reader ucl::ElmWidget *getDecreaseBtn(); ucl::ElmWidget *getIncreaseBtn(); ucl::ElmWidget *getValueTxtAo(); + // Slider // + + virtual void setValue(int value) override final; + private: - friend class ucl::ReffedObj; VolumeControl(ucl::IRefCountObj &rc, const ucl::LayoutSRef &layout, const ucl::TString &info, @@ -77,8 +77,6 @@ namespace callui { int curValue, const EventHandler &handler); - virtual ~VolumeControl(); - void prepare(const ucl::TString &info, int curValue); void onDecreaseBtnClickedCb(ucl::Widget &widget, void *eventInfo); @@ -87,7 +85,6 @@ namespace callui { void onWidgetShowCb(Widget &widget, void *eventInfo); void onWidgetHideCb(Widget &widget, void *eventInfo); - // Screen Reader void registerAccessObjectInformation(); private: @@ -95,8 +92,9 @@ namespace callui { ucl::StyledWidget m_increaseBtn; EventHandler m_handler; - // Screen Reader ucl::ElmWidgetSRef m_valueTxtAo; + + friend class ucl::ReffedObj; }; }