Fix warnings.

Change-Id: I65bfbda62a141e2b1d973fff900e24ba86491819
Signed-off-by: Denis Dolzhenko <d.dolzhenko@samsung.com>

diff --git a/src/Common/Controller/inc/App.h b/src/Common/Controller/inc/App.h
index bceb45ea05a6a4d29a06156ffd48e2870dfb1aca..bfb235c7018a666306bfcc20d40a4c48583a6a9b 100644 (file)
--- a/src/Common/Controller/inc/App.h
+++ b/src/Common/Controller/inc/App.h
@@ -29,7 +29,6 @@ namespace Msg {
        class PopupManager;
        class MsgEngine;
        class ContactManager;
-       class ThumbnailMaker;
        class SystemSettingsManager;
        class AppControlLauncher;
        class MsgInputSelector;
@@ -88,7 +87,6 @@ namespace Msg {
                        MsgEngine *m_pEngine;
                        ContactManager *m_pContactManager;
                        PopupManager *m_pPopupManager;
-                       ThumbnailMaker *m_pThumbnailMaker;
                        SystemSettingsManager *m_pSysSettingsManager;
                        std::list<IAppListener*> m_Listeners;
                        NaviFrameController *m_pNaviFrame;

diff --git a/src/Common/Controller/src/App.cpp b/src/Common/Controller/src/App.cpp
index b109418f9420af342c2d682ca2b23a27755e966b..77600863d71beb2ffb6b50a847689555238710e0 100644 (file)
--- a/src/Common/Controller/src/App.cpp
+++ b/src/Common/Controller/src/App.cpp
@@ -52,7 +52,6 @@ App::App()
        , m_pEngine(nullptr)
        , m_pContactManager(nullptr)
        , m_pPopupManager(nullptr)
-       , m_pThumbnailMaker(nullptr)
        , m_pSysSettingsManager(nullptr)
        , m_pNaviFrame(nullptr)
        , m_pLauncher(nullptr)
@@ -67,7 +66,6 @@ App::App()
 
 App::~App()
 {
-       delete m_pThumbnailMaker;
        delete m_pContactManager;
        delete m_pPopupManager;
        delete m_pSysSettingsManager;

diff --git a/src/Composer/Controller/src/SendingOptionsFrame.cpp b/src/Composer/Controller/src/SendingOptionsFrame.cpp
index 9de534a22c8b8ee199279678d462df05f1ebb065..2585d2ecb02d31069253724db2aa1a2f339ea0b1 100644 (file)
--- a/src/Composer/Controller/src/SendingOptionsFrame.cpp
+++ b/src/Composer/Controller/src/SendingOptionsFrame.cpp
@@ -73,7 +73,7 @@ void SendingOptionsFrame::fillList()
        m_pList->appendItem(*m_pSendingOptionItem);
 
        m_pSendAsTextItem = new AlwaysSendAsTextListViewItem;
-       m_pSendAsTextItem->setCheckedState(!App::getInst().getMsgEngine().getSettings().getSendAsAudio());
+       m_pSendAsTextItem->setSendAsTextCheckedState(!App::getInst().getMsgEngine().getSettings().getSendAsAudio());
        m_pSendAsTextItem->setOnSelectedCb(std::bind(&SendingOptionsFrame::onSendAsTextItemSelected, this, _1));
        m_pSendAsTextItem->setOnChangedCb(std::bind(&SendingOptionsFrame::onCheckItemClicked, this, _1));
        m_pList->appendItem(*m_pSendAsTextItem);
@@ -121,7 +121,7 @@ void SendingOptionsFrame::onSendAsTextItemSelected(ListItem &item)
 {
        MSG_LOG("");
        auto &textItem = static_cast<AlwaysSendAsTextListViewItem&>(item);
-       textItem.changeCheckedState();
+       textItem.changeSendAsTextCheckedState();
        bool newState = textItem.getCheckedState();
        alwaysSendTextHandler(newState);
 }

diff --git a/src/Composer/View/inc/AlwaysSendAsTextListViewItem.h b/src/Composer/View/inc/AlwaysSendAsTextListViewItem.h
index 1f0d634dfc770aabf10346929b111989b7f271c6..42b141119c2f5bf87cf5cd80c534e58f59a414b0 100644 (file)
--- a/src/Composer/View/inc/AlwaysSendAsTextListViewItem.h
+++ b/src/Composer/View/inc/AlwaysSendAsTextListViewItem.h
@@ -31,9 +31,9 @@ namespace Msg {
                        using OnChangedCb = std::function<void(AlwaysSendAsTextListViewItem &item)>;
 
                        void setOnChangedCb(OnChangedCb cb);
-                       void setCheckedState(bool state);
-                       void changeCheckedState();
-                       bool getCheckedState() const;
+                       void setSendAsTextCheckedState(bool state);
+                       void changeSendAsTextCheckedState();
+                       bool getSendAsTextCheckedState() const;
 
                private:
                        std::string getText(ListItem &item, const char *part) override;

diff --git a/src/Composer/View/src/AlwaysSendAsTextListViewItem.cpp b/src/Composer/View/src/AlwaysSendAsTextListViewItem.cpp
index e45e19912ec1d695e9cea87b23e62b0520f81e4a..6530564b742e0a9994ac95487889f05e7b5a65af 100644 (file)
--- a/src/Composer/View/src/AlwaysSendAsTextListViewItem.cpp
+++ b/src/Composer/View/src/AlwaysSendAsTextListViewItem.cpp
@@ -35,7 +35,7 @@ void AlwaysSendAsTextListViewItem::setOnChangedCb(OnChangedCb cb)
        m_OnChangedCb = std::move(cb);
 }
 
-void AlwaysSendAsTextListViewItem::setCheckedState(bool state)
+void AlwaysSendAsTextListViewItem::setSendAsTextCheckedState(bool state)
 {
        if (m_CheckedState != state) {
                m_CheckedState = state;
@@ -43,12 +43,12 @@ void AlwaysSendAsTextListViewItem::setCheckedState(bool state)
        }
 }
 
-void AlwaysSendAsTextListViewItem::changeCheckedState()
+void AlwaysSendAsTextListViewItem::changeSendAsTextCheckedState()
 {
-       setCheckedState(!m_CheckedState);
+       setSendAsTextCheckedState(!m_CheckedState);
 }
 
-bool AlwaysSendAsTextListViewItem::getCheckedState() const
+bool AlwaysSendAsTextListViewItem::getSendAsTextCheckedState() const
 {
        return m_CheckedState;
 }