TizenRefApp-9380 [Call UI] Change class destructors types and area of visibility 63/151563/3
authorIgor Olshevskyi <i.olshevskyi@samsung.com>
Wed, 20 Sep 2017 09:20:09 +0000 (12:20 +0300)
committerIgor Olshevskyi <i.olshevskyi@samsung.com>
Thu, 21 Sep 2017 10:29:16 +0000 (13:29 +0300)
Change-Id: I23da7a7737fdeb4f33bf5b94c2c27d955da6332a

72 files changed:
call-ui/model/ICallInfo.h
call-ui/model/impl/ActiveCall.cpp
call-ui/model/impl/ActiveCall.h
call-ui/model/impl/BatteryStateSource.h
call-ui/model/impl/BluetoothManager.h
call-ui/model/impl/CallClient.h
call-ui/model/impl/CallInfo.cpp
call-ui/model/impl/CallInfo.h
call-ui/model/impl/CallManager.cpp
call-ui/model/impl/CallManager.h
call-ui/model/impl/CallUI.cpp
call-ui/model/impl/CallUI.h
call-ui/model/impl/ConferenceCallInfo.cpp
call-ui/model/impl/ConferenceCallInfo.h
call-ui/model/impl/ConnectionStateSource.h
call-ui/model/impl/ContactInfo.cpp
call-ui/model/impl/ContactInfo.h
call-ui/model/impl/ContactInfoProvider.h
call-ui/model/impl/EndCall.cpp
call-ui/model/impl/EndCall.h
call-ui/model/impl/HdVoiceStateSource.cpp
call-ui/model/impl/HdVoiceStateSource.h
call-ui/model/impl/HeldCall.cpp
call-ui/model/impl/HeldCall.h
call-ui/model/impl/IncomingCall.cpp
call-ui/model/impl/IncomingCall.h
call-ui/model/impl/IndicatorStateProvider.cpp
call-ui/model/impl/IndicatorStateProvider.h
call-ui/model/impl/MsgClient.h
call-ui/model/impl/RejectMsg.cpp
call-ui/model/impl/RejectMsg.h
call-ui/model/impl/RejectMsgProvider.cpp
call-ui/model/impl/RejectMsgProvider.h
call-ui/model/impl/RssiStateSource.h
call-ui/model/impl/SimSlotStateSource.cpp
call-ui/model/impl/SimSlotStateSource.h
call-ui/model/impl/SoundManager.h
call-ui/model/impl/VoiceControlStateProvider.h
call-ui/model/impl/VoiceControlStateSource.h
call-ui/presenters/base/Page.h
call-ui/presenters/base/Page.hpp
call-ui/presenters/dialogs/AcceptDialog.cpp
call-ui/presenters/dialogs/AcceptDialog.h
call-ui/presenters/misc/AcceptRejectPresenter.cpp
call-ui/presenters/misc/AcceptRejectPresenter.h
call-ui/presenters/misc/AccessoryPresenter.cpp
call-ui/presenters/misc/AccessoryPresenter.h
call-ui/presenters/misc/AtspiHighlightHelper.cpp
call-ui/presenters/misc/AtspiHighlightHelper.h
call-ui/presenters/misc/CallInfoPresenter.cpp
call-ui/presenters/misc/CallInfoPresenter.h
call-ui/presenters/misc/CallStatusPresenter.cpp
call-ui/presenters/misc/CallStatusPresenter.h
call-ui/presenters/misc/DeviceStatePresenter.cpp
call-ui/presenters/misc/DeviceStatePresenter.h
call-ui/presenters/misc/IndicatorPresenter.cpp
call-ui/presenters/misc/IndicatorPresenter.h
call-ui/presenters/misc/MoreOptionsPresenter.cpp
call-ui/presenters/misc/MoreOptionsPresenter.h
call-ui/presenters/misc/MotionSensorPresenter.h
call-ui/presenters/misc/RejectMsgPresenter.cpp
call-ui/presenters/misc/RejectMsgPresenter.h
call-ui/presenters/pages/KeypadPage.cpp
call-ui/presenters/pages/KeypadPage.h
call-ui/presenters/pages/MainPage.cpp
call-ui/presenters/pages/MainPage.h
call-ui/view/AcceptRejectWidget.cpp
call-ui/view/AcceptRejectWidget.h
call-ui/view/Slider.cpp
call-ui/view/Slider.h
call-ui/view/VolumeControl.cpp
call-ui/view/VolumeControl.h

index 559d939da7908dc6b76fbc85a96e1a6066a10389..33f1de4000de6fb8049aa196984d9847fdee0836 100644 (file)
@@ -42,7 +42,7 @@ namespace callui {
                virtual const ConfMemberList &getConferenceMemberList() const = 0;
        };
 
-       // Non-member functions
+       // Non-member functions //
 
        bool isUnknownCaller(const ICallInfo &info);
 }
index 898fab0587b673b8ec8e52a6bdffab7d6dea7c91..e3e74a58ab0bdf9907b50897434fd5746393e5cc 100644 (file)
@@ -30,10 +30,6 @@ namespace callui {
        {
        }
 
-       ActiveCall::~ActiveCall()
-       {
-       }
-
        ActiveCallSRef ActiveCall::newInstance(CallManagerWRef cm, cm_call_data_h callData)
        {
                if (!cm) {
index e005f7da2da415b9cfe9270957922a1a9abc2794..834b16b19a413897f031a7073ad413a4954654fd 100644 (file)
@@ -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>;
                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<ActiveCall>;
        };
 
 }
index 47b30c906d820f821669fe96cf2e4b620a2d6359..53c5e2116416aab5a169c4401793cb3ad044e91d 100644 (file)
@@ -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();
+               ~BatteryStateSource();
 
                ucl::Result prepare();
 
@@ -71,6 +71,8 @@ namespace callui {
        private:
                Bits m_bits;
                NotiHandler m_handler;
+
+               friend class ucl::ReffedObj<BatteryStateSource>;
        };
 
 }
index 8b89ba8878ff462f9f841b3b737bd150a0472341..3380521deb4a3aacca920d29e87e03eed41a80ea 100644 (file)
@@ -39,9 +39,8 @@ namespace callui {
                void setHeadsetConnectionChangeHandler(const NotiHandler &handler);
 
        private:
-               friend class ucl::ReffedObj<BluetoothManager>;
                BluetoothManager();
-               virtual ~BluetoothManager();
+               ~BluetoothManager();
 
                ucl::Result prepare();
 
@@ -66,6 +65,8 @@ namespace callui {
                bool m_btAudioInitialized;
 
                bool m_isHeadsetConnected;
+
+               friend class ucl::ReffedObj<BluetoothManager>;
        };
 }
 
index 9f430ed3f7242d826e07381dc696cf57b8b1c09e..3b926e25b79afe70e74df3e6afd76519f6287cfc 100644 (file)
@@ -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();
+               ~CallClient();
+
                ucl::Result prepare();
 
        private:
                cm_client_h m_client;
+
+               friend class ucl::ReffedObj<CallClient>;
        };
 }
 
index 53804b5a1d9cbd83f270e2ed0227baae8eae2a1b..67d695d8ce5d890371562bbc2ae08476a79fe231 100644 (file)
@@ -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)
        {
index 5fe7ee0d5d628e293e94f5a4b91e2ed20c481101..0042bd27d0d31c41168aa7e75ddea4fcc865c2e0 100644 (file)
@@ -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();
+               ~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<CallInfo>;
        };
 
 }
index 02f6fe0b0cf45a2ae187a0874a78e2f33176c9a0..f931f3e623761262932f5cf6493231204238d69e 100644 (file)
@@ -41,10 +41,6 @@ namespace callui {
        {
        }
 
-       CallManager::~CallManager()
-       {
-       }
-
        CallManagerSRef CallManager::newInstance(const CallClientSRef &callClient,
                        ICallManagerListenerWRef listener)
        {
index b73acb87f66f37e2994bb1e81dba61d49af7a493..f4acbf2817fd314a2876bc0f800a0b0e4db47be9 100644 (file)
@@ -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>;
                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<CallManager>;
        };
 
 }
index 4c91a65ae10d9a3db4c8d5392a388bdfb83ea277..b6cc9121ab6a489aa457396f42c0cab05f8f3546 100644 (file)
@@ -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<SimSlotStateSource>(
+               m_simSlotStSrc = SimSlotStateSource::newInstance(
                                m_callManager->getSimSlot(), getForwardedCallStatus());
                FAIL_RETURN(m_indicatorStPrv->setStateSource(
                                IndicatorProperty::SIM_SLOT, m_simSlotStSrc),
                                "setStateSource() failed!");
 
-               m_hdCallStSrc = makeShared<HdVoiceStateSource>(
-                               getHDVoiceStatus());
+               m_hdCallStSrc = HdVoiceStateSource::newInstance(getHDVoiceStatus());
                FAIL_RETURN(m_indicatorStPrv->setStateSource(
                                IndicatorProperty::HD_VOICE, m_hdCallStSrc),
                                "setStateSource() failed!");
index dc620781da515ea2db2ffdf2ffb463c9ea83e2d8..554f40375390c67778d35ade4acefa2b43492ed7 100644 (file)
@@ -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>;
                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<CallUI>;
        };
 
 }
index d20592cfc40c7d16f5db4db8415606c03d4a037c..8d3076ca301b1ba72be2f1c33ad20256e2f28b02 100644 (file)
@@ -27,10 +27,6 @@ namespace callui {
        {
        }
 
-       ConferenceCallInfo::~ConferenceCallInfo()
-       {
-       }
-
        ConferenceCallInfoSRef ConferenceCallInfo::newInstance(
                        cm_conf_call_data_t *confCallData,
                        ContactInfoProviderSRef callInfoProvider)
index 940b2bc07b7a547fbae664c626e9c5de9ff231f1..42dbc9bdecc367b9f5010afdda49ae8f8883dde0 100644 (file)
@@ -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();
+               ~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<ConferenceCallInfo>;
        };
 
 }
index 1a99cdb06ae2f15b64bf8f1a84543bd1c2f8d16f..18af9d2d03b91f3a215c36d5ec24762240b28d20 100644 (file)
@@ -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();
+               ~ConnectionStateSource();
 
                ucl::Result prepare();
 
@@ -79,6 +78,8 @@ namespace callui {
        private:
                Bits m_bits;
                NotiHandler m_handler;
+
+               friend class ucl::ReffedObj<ConnectionStateSource>;
        };
 
 }
index ef36d03aa25dad4e6cf94f50b2d3e6656e82f465..8a2aea71d4d5d30aea2dfc99b7e96bd2088b4c5b 100644 (file)
@@ -35,10 +35,6 @@ namespace callui {
        {
        }
 
-       ContactInfo::~ContactInfo()
-       {
-       }
-
        ContactInfoSRef ContactInfo::newInstance(int personId,
                        const std::string &name,
                        const std::string &imagePath,
index aa93d641f6daf2c0f177f08a0ecc0e5d3211c9d8..3515e35ab08cd5fddb0d1ecc62d4bfc85a997aa9 100644 (file)
@@ -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>;
                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<ContactInfo>;
        };
 
 }
index 0a2e6deab753803a99f9e48f775bc581a359c7c6..e248642648c75a613fcbbe8b30d5900a60ac59d8 100644 (file)
@@ -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();
+               ~ContactInfoProvider();
 
                ucl::Result prepare();
 
        private:
                bool m_isConnected;
+
+               friend class ucl::ReffedObj<ContactInfoProvider>;
        };
 }
 
index 40710213743a201b5d85507a4d60b959ee93b7c8..f9e34e31eead28b6561f99d3626b6613cb10c62a 100644 (file)
@@ -31,10 +31,6 @@ namespace callui {
        {
        }
 
-       EndCall::~EndCall()
-       {
-       }
-
        EndCallSRef EndCall::newInstance(CallManagerWRef cm, ICallInfoSCRef callInfo)
        {
                if (!cm) {
index 34c3e9c0481fc80b6705a90b6325b35d51bfe277..681256623d43d272da033cc44220f8fcf261b4ef 100644 (file)
@@ -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>;
                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<EndCall>;
        };
 
 }
index 90df2820c22fea1332d6e089ffdc1bd859384e39..633210a5aa8a402ea27e29a98c0e0d8eef5ee963 100644 (file)
@@ -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<HdVoiceStateSource>(isEnable);
+       }
+
        IndicatorState HdVoiceStateSource::getState() const
        {
                return {m_bits.value};
index 103ba1f82e4cfaff0c24b6c563eb6c2d77afe44f..deea0015086afc304757b7d4221df821d880c0cf 100644 (file)
@@ -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<HdVoiceStateSource>;
        };
 
 }
index 011c66719206a83e89a9ac2789c107353178c3de..033b10d0e889fe4d7f8bbf3327f7ca1edd4fbc27 100644 (file)
@@ -29,10 +29,6 @@ namespace callui {
        {
        }
 
-       HeldCall::~HeldCall()
-       {
-       }
-
        HeldCallSRef HeldCall::newInstance(CallManagerWRef cm, cm_call_data_h callData)
        {
                if (!cm) {
index 4d4fbc850cf78e3cd63a3d5bfa419e6412644185..64d54f81cfaae0b44e70d0aa44be083d5e8d35f3 100644 (file)
@@ -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>;
                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<HeldCall>;
        };
 
 }
index 783446fc5014b3c3fd5285f72bc67abe81e8f4f7..48809885849768122788ba4a12448b6b3b8c02c4 100644 (file)
@@ -30,10 +30,6 @@ namespace callui {
        {
        }
 
-       IncomingCall::~IncomingCall()
-       {
-       }
-
        IncomingCallSRef IncomingCall::newInstance(CallManagerWRef cm, cm_call_data_h callData)
        {
                if (!cm) {
index 2a163a410b536d02246039421e97d4d83e4591b0..72f4e140d63a90bbe3081213b640ae2bff222ef8 100644 (file)
@@ -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>;
                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<IncomingCall>;
        };
 
 }
index 7c89d9b98f19ac9def925f853f5a4e004ad766fc..a23f8e744ab69c0be1f470307334a12f1244f5ed 100644 (file)
@@ -62,10 +62,6 @@ namespace callui {
        {
        }
 
-       IndicatorStateProvider::~IndicatorStateProvider()
-       {
-       }
-
        IndicatorStateProviderSRef IndicatorStateProvider::newInstance()
        {
                return makeShared<IndicatorStateProvider>();
index e80d447fc3384e880714f4d369cc0ec2a3aefdc9..724fdf8a3812c4ec339990bd3bdc259bda30e181 100644 (file)
@@ -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();
+               ~IndicatorStateProvider() = default;
 
                void dispatchStateChanged(IndicatorProperty property) const;
 
@@ -58,6 +56,8 @@ namespace callui {
        private:
                IIndicatorStateListenerWRef m_listener;
                std::array<SourceHandlerSRef, STATE_COUNT> m_sources;
+
+               friend class ucl::ReffedObj<IndicatorStateProvider>;
        };
 
 }
index 99928205de0a8758a102038d0c3257d2bc50ce27..96a0b039d50396007e9638d4ccccc55e1e64b12c 100644 (file)
@@ -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();
+               ~MsgClient();
 
                ucl::Result prepare();
 
        private:
                msg_handle_t m_handle;
+
+               friend class ucl::ReffedObj<MsgClient>;
        };
 
 }
index e6d3fd3ca14c90c59231c3ccfb239108de5bbaaa..cee4d95089a0d1aafade38f4ab6ad086c2f3b1f5 100644 (file)
@@ -31,10 +31,6 @@ namespace callui {
        {
        }
 
-       RejectMsg::~RejectMsg()
-       {
-       }
-
        RejectMsgSRef RejectMsg::newInstance(MsgClientWRef client, const TString &string)
        {
                return makeShared<RejectMsg>(client, string);
index b82f19b17450a5923a448c19920316ea520f3425..b8f317f783e3c10c79ff7d452ce08ad145f96b4f 100644 (file)
@@ -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>;
                RejectMsg(MsgClientWRef client, const ucl::TString &string);
+               ~RejectMsg() = default;
 
                ucl::Result prepare();
 
        private:
                MsgClientWRef m_msgClient;
                ucl::TString m_msg;
+
+               friend class ucl::ReffedObj<RejectMsg>;
        };
 
 }
index c0a4d93a9904d3462176732ac60c50704dd13b64..412dffbcb999d15c22087e4c8e5057ef06bd9e96 100644 (file)
@@ -30,10 +30,6 @@ namespace callui {
        {
        }
 
-       RejectMsgProvider::~RejectMsgProvider()
-       {
-       }
-
        RejectMsgProviderSRef RejectMsgProvider::newInstance()
        {
                auto result = makeShared<RejectMsgProvider>();
index e60d58404858c44ed8178f7a04562e9179324140..86d663f7f3fcb3c2b5f174dd35354d75ec2e3c99 100644 (file)
@@ -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();
+               ~RejectMsgProvider() = default;
 
                ucl::Result prepare();
                IRejectMsgSRef getRejectMsgByIndex(int index) const;
 
        private:
                MsgClientSRef m_msgClient;
+
+               friend class ucl::ReffedObj<RejectMsgProvider>;
        };
 
 }
index f20a1ef35b496d5187dbe6b3828f54dd1474860c..c4d38124e10fc4fbe0ceba6b778bc9710ce4ce20 100644 (file)
@@ -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();
+               ~RssiStateSource();
 
                ucl::Result prepare();
                ucl::Result addSysStateCallbacks();
@@ -70,6 +69,8 @@ namespace callui {
        private:
                Bits m_bits;
                NotiHandler m_handler;
+
+               friend class ucl::ReffedObj<RssiStateSource>;
        };
 
 }
index e65f4b7d6724a944e70a4ebaec810dd898c53e3f..5b89186962e32698e04f4ac1f03e6a4d119b21e7 100644 (file)
@@ -43,8 +43,9 @@ namespace callui {
                m_bits.isForwarded = isForwarded;
        }
 
-       SimSlotStateSource::~SimSlotStateSource()
+       SimSlotStateSourceSRef SimSlotStateSource::newInstance(SimSlot slot, bool isForwarded)
        {
+               return makeShared<SimSlotStateSource>(slot, isForwarded);
        }
 
        void SimSlotStateSource::updateSimSlot(SimSlot slot, bool isForwarded)
index c1b6b32145ded775b1bdc5c69296cc78b0faf43e..db7f380e0137d0c750c1b375bb5ecc5a790bea12 100644 (file)
@@ -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<SimSlotStateSource>;
        };
 
 }
index afae43a12b06c183ede5d73ca7d31fe9f96ca5f5..f70c4278bf1081f65e4c2aed027cfa5e440bfd6d 100644 (file)
@@ -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>;
                SoundManager(ucl::IRefCountObj &rc, const CallClientSRef &client);
+               ~SoundManager();
 
                ucl::Result prepare();
                ucl::Result registerCallbacks();
@@ -100,6 +99,8 @@ namespace callui {
                ucl::Event<NotiHandler> m_volumeLevelEvent;
                ucl::Event<NotiHandler> m_btVoiceDeviceConnEvent;
                int m_deviceVolumeCbId;
+
+               friend class ucl::ReffedObj<SoundManager>;
        };
 
 }
index ad37dddb48caf50be2a710d27f0b324a8b87d776..0c034b593376fffd7c3ef776aeaacd51d0af785e 100644 (file)
@@ -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();
+               ~VoiceControlStateProvider();
 
                ucl::Result prepare();
 
@@ -50,6 +49,8 @@ namespace callui {
        private:
                bool m_enableState;
                ucl::Event<NotiHandler> m_event;
+
+               friend class ucl::ReffedObj<VoiceControlStateProvider>;
        };
 
 }
index 47487e683fee4e8ee94743dc09ed70cd38c7fc82..440a904b4864d698821187c78016a5ca66054af8 100644 (file)
@@ -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>;
                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<VoiceControlStateSource>;
        };
 
 }
index 59295ec568e46859824b3629d48ffdbf5b2f309e..a87ab9221520284adbd45c7874bb1855e7055843 100644 (file)
@@ -48,7 +48,7 @@ namespace callui {
                template <class ...ARGS>
                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 <class ON_PREPARE>
                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);
 }
index 2ef28d23e00a60476a6fb86adfbc0ed60f4f0827..a5b23bb2951ddbbd47f5b9b1afd475ee74264259 100644 (file)
@@ -57,7 +57,7 @@ namespace callui {
                return (m_navi->getBottomItem() == m_item);
        }
 
-       // Non-member functions
+       // Non-member functions //
 
        inline bool isLast(const Page &page)
        {
index af607e20cb446d4d775ff0e05099bc7663f2c086..704a9b5e8b4109764f91ddf436db9bf148a3b43e 100644 (file)
@@ -51,10 +51,6 @@ namespace callui {
        {
        }
 
-       AcceptDialog::Builder::~Builder()
-       {
-       }
-
        AcceptDialog::Builder &
        AcceptDialog::Builder::setHandler(EventHandler handler)
        {
index c1627d3cc4e89abe050d6c3e8f06fde09c661ba6..4fa9a6ae86dd5949713aca709ab04c7a58d42aaf 100644 (file)
@@ -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>;
-               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<AcceptDialog>;
        };
 }
 
index 4192e75e0bf54f4ff92c092d53f57f9c461e345a..0dde4a068c9f8cf8b901ef860199e2042d94952e 100644 (file)
@@ -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();
index 800b4d03afbcc4ca8bd3afa3cfc811e4cc5728a7..7708281c1948a648b6dbd9ee61240d7114d57468 100644 (file)
@@ -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>;
                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<AcceptRejectPresenter>;
        };
 }
 
index 6e859592d63a77fc4115ba7878f0042a9abce8aa..76173c1e3f9d2c9bc6ab91f734e6fdeed82b2587 100644 (file)
@@ -765,7 +765,6 @@ namespace callui {
                                m_muteBtn->emit(impl::SIGNAL_TURN_OFF);
        }
 
-       // Screen Reader
        ElmWidget *AccessoryPresenter::getVolumBtn()
        {
                return m_volumeBtn.get();
index 90b9adc2cee7c2c0436051e82e3ebe393c8eb506..a85efe6e4740ea055a03131275c25f95219d1674 100644 (file)
@@ -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>;
                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<AccessoryPresenter>;
        };
 }
 
index 98ec77ba9305f51f0e78a6bcde691eae6808eeb5..545d098ca5a0faf28fa0f194aa796f4d06a4b602 100644 (file)
@@ -45,10 +45,6 @@ namespace callui {
        {
        }
 
-       AtspiHighlightHelper::~AtspiHighlightHelper()
-       {
-       }
-
        Result AtspiHighlightHelper::prepare(GuiPresenter &parent,
                        ElmWidget &rootWidget)
        {
index 0ff1ff3a4d7b9c592cdac176fb3a20c0ecccee03..e47e583aba92c327bd1b0c1746e4087a494e831c 100644 (file)
@@ -45,9 +45,8 @@ namespace callui {
                                const Elm_Atspi_Gesture_Info &info);
 
        private:
-               friend class ucl::ReffedObj<AtspiHighlightHelper>;
                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<AtspiHighlightHelper>;
        };
 }
 
index 002254f39245b803975ff486ba22d8d523f875e5..803310d62cc02ce0a18407f78e22bd9cd12a3eec 100644 (file)
@@ -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();
index bc9a32a4f496c194ead262db2f9fc0f29394f017..753dbd431aab452484dba989e8a01c9f4b6f2753 100644 (file)
@@ -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>;
                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<CallInfoPresenter>;
        };
 
 }
index 8b80a6b51ee9d5d06325fa236505f582160d0e3f..642e620f1269269e41dbb83d4772a660f917b690 100644 (file)
@@ -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) {
index c1ea4eba83599381e757125b8bc49ddc25fa9f0a..b02b39dfe6621218eab01a99a3caa229780451f5 100644 (file)
@@ -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>;
                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<CallStatusPresenter>;
        };
 
 }
index 763bb4e12f6dbf13cb786a4666d7e6262a7d10e1..b1a37b6dccc153bec0668bef9324443958ba0b0d 100644 (file)
@@ -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),
index 5cdfa040f3ba0a4b8a13d7895e9a138eb17f52b5..e605c8bb59de4031d9448dabd3dbb428817e3c5d 100644 (file)
@@ -62,7 +62,6 @@ namespace callui {
                ucl::Result setCpuLockState(bool lockState);
 
        private:
-               friend class ucl::ReffedObj<DeviceStatePresenter>;
                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<DeviceStatePresenter>;
        };
 }
 
index f8f2ee6009b7210a74ff1dab0c724bc3b8070b8b..e68e2dc1df2faa113d7b3d70cd243bad815da9b0 100644 (file)
@@ -166,10 +166,6 @@ namespace callui {
        {
        }
 
-       IndicatorPresenter::Builder::~Builder()
-       {
-       }
-
        IndicatorPresenter::Builder &
        IndicatorPresenter::Builder::setIndicatorStateProvider(
                        const IIndicatorStateProviderSRef &provider)
index 6569db2f0801887ff932d6dfc8bab042bd0d50d2..c7be903d85fca0772db6886c0939fbf5f42158a0 100644 (file)
@@ -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>;
                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<IndicatorPresenter>;
        };
 
        ucl::EdjeSignal getConnectionSignal(ConnectionType type);
index 51b41998b1361c87655c0aceea3ef983302aa86e..0dbd53f80e6e72e6a5a140b6b173d4cc8579f057 100644 (file)
@@ -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");
index 8a599f2d45ef50454beadc59a2272103063a346b..db82a39293bbec5c7ccdc2c4184933b69ad1ff0a 100644 (file)
@@ -55,16 +55,14 @@ namespace callui {
                ucl::Widget &getWidget();
                void update();
 
-               // Screen Reader
                ucl::ElmWidget *getCueAo();
 
        private:
-               friend class ucl::ReffedObj<MoreOptionsPresenter>;
                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<MoreOptionsPresenter>;
        };
 }
 
index e80f2d90e0fc9f6dda03e01eae27aca4b38125bc..648ec64e6826ca5a6619d8b8ce631d26ff4d3e10 100644 (file)
@@ -34,9 +34,8 @@ namespace callui {
                        MotionSensorPresenterSRef build(const NotiHandler handler) const;
                };
        private:
-               friend class ucl::ReffedObj<MotionSensorPresenter>;
                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<MotionSensorPresenter>;
        };
 
 }
index 64c5b3c315e2a587cbb00367f13cff134dd0f46a..dfad3d4647a207e94438f8f43905c92723b08b75 100644 (file)
@@ -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) ?
index ba754c8213adbd73647b03150b21f3023d6aed85..1a965169638fcd279b137d9536b53a7e7b4677ce 100644 (file)
@@ -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>;
                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<RejectMsgPresenter>;
        };
 
 }
index 60312253f931c7ccacc426359e5fdcc06120a181..902284557cab0b93a1364a4950f3ac8e24aa21fe 100644 (file)
@@ -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());
index 17f32989ce66dc2ee3d37939c0197218b55d41c3..8db99969a49a0ad2cb983cbc015e684b1f5e3fa9 100644 (file)
@@ -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>;
                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<KeypadPage>;
        };
 }
 
index a5a8d7745f7e2e2a7024aa55276b5b1e7cd15869..23f6974dcccc6859a8a1f4333d7f87282a1a873f 100644 (file)
@@ -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,
index 4a826a9f4851a1da395819754a29cb075929f492..8bfd261bf45d64ececf3d4b00064f203f6f16dd0 100644 (file)
@@ -52,12 +52,11 @@ namespace callui {
                };
 
        private:
-               friend class ucl::ReffedObj<MainPage>;
                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<MainPage>;
        };
 }
 
index 7468f036c0d8825c643b0250abe2f8514ce41b97..fe2a48dd51903d139a8ee13799c98f8ac32ed8c0 100644 (file)
@@ -1451,7 +1451,6 @@ namespace callui {
                setRejectUnpressedTransitions();
        }
 
-       // Screen Reader
        ElmWidget *AcceptRejectWidget::getAcceptAo()
        {
                return m_accAo.get();
index 0bbe1734938842f6748dcdbda46fd929ecba9deb..a82589b4a62c24472a8f11e5dab9871f31c2999b 100644 (file)
@@ -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>;
                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<AcceptRejectWidget>;
        };
 
 }
index f127de4b1b1ff4987bc56e2bb1d3ac2f4f00de1f..09fad5a6f0498c7bf3fc701a7efadb2d3d24689c 100644 (file)
@@ -79,10 +79,6 @@ namespace callui {
                prepare(maxValue, curValue);
        }
 
-       Slider::~Slider()
-       {
-       }
-
        void Slider::prepare(int maxValue, int curValue)
        {
                m_layout->setIsOwner(false);
index 63cfddffc96d121ef3d815646f5cd647978d4e15..dcc330f2fc199b35b4a28ccc9f67c3853699087a 100644 (file)
@@ -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>;
                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<Slider>;
        };
 
 }
index 2b3e18810ca805fe0137d01b2e7c5031182de1bf..f0a20b71cd13d46cecaeff7342903d7891542d49 100644 (file)
@@ -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;
index adbf5000400a03d31f58a2bab703c6ffd6fabb73..a1cbe9d208c2b4c567b1bf15d2c008af8ba6f4b3 100644 (file)
@@ -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>;
                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<VolumeControl>;
        };
 
 }