Fixed: warnings, remove const from cb. method.

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

diff --git a/src/Common/Utils/src/TextDecorator.cpp b/src/Common/Utils/src/TextDecorator.cpp
index c8878ad..c80e539 100644 (file)
--- a/src/Common/Utils/src/TextDecorator.cpp
+++ b/src/Common/Utils/src/TextDecorator.cpp
@@ -29,7 +29,7 @@ const int TextStyle::defaultFontSize = 28;
 
 namespace
 {
-    const char * alignAsString(TextAlign align)
+    const char *alignAsString(TextAlign align)
     {
         switch(align)
         {
@@ -39,6 +39,9 @@ namespace
                 return "left";
             case TextAlign::Right:
                 return "right";
+            case TextAlign::None:
+            default:
+                break;
         }
 
         assert(false);

diff --git a/src/Common/View/inc/NaviFrameItem.h b/src/Common/View/inc/NaviFrameItem.h
index 2dbac64..f82e023 100644 (file)
--- a/src/Common/View/inc/NaviFrameItem.h
+++ b/src/Common/View/inc/NaviFrameItem.h
@@ -58,7 +58,7 @@ namespace Msg
             const NaviFrameView &getOwner() const;
 
         protected:
-            virtual void onButtonClicked(const NaviFrameItem &item, NaviButtonId buttonId) {};
+            virtual void onButtonClicked(NaviFrameItem &item, NaviButtonId buttonId) {};
 
             //ViewItem
             virtual void onAttached(ViewItem &item);

diff --git a/src/Conversation/Controller/inc/Conversation.h b/src/Conversation/Controller/inc/Conversation.h
index 24a7c83..73de453 100644 (file)
--- a/src/Conversation/Controller/inc/Conversation.h
+++ b/src/Conversation/Controller/inc/Conversation.h
@@ -64,7 +64,7 @@ namespace Msg
         private:
             // NaviFrameItem:
             virtual void onAttached(ViewItem &item);
-            virtual void onButtonClicked(const NaviFrameItem &item, NaviButtonId buttonId);
+            virtual void onButtonClicked(NaviFrameItem &item, NaviButtonId buttonId);
 
             // IMsgStorageListener:
             virtual void onMsgStorageChange();

diff --git a/src/Conversation/Controller/src/Conversation.cpp b/src/Conversation/Controller/src/Conversation.cpp
index 409fc5c..a87c88b 100644 (file)
--- a/src/Conversation/Controller/src/Conversation.cpp
+++ b/src/Conversation/Controller/src/Conversation.cpp
@@ -253,7 +253,7 @@ void Conversation::onHwMoreButtonClicked()
     MSG_LOG("");
 }
 
-void Conversation::onButtonClicked(const NaviFrameItem &item, NaviButtonId buttonId)
+void Conversation::onButtonClicked(NaviFrameItem &item, NaviButtonId buttonId)
 {
     //TODO: Handle other buttons
     switch(buttonId)

diff --git a/src/MsgThread/Controller/inc/MsgThread.h b/src/MsgThread/Controller/inc/MsgThread.h
index 23d316c..72c19a6 100644 (file)
--- a/src/MsgThread/Controller/inc/MsgThread.h
+++ b/src/MsgThread/Controller/inc/MsgThread.h
@@ -52,7 +52,7 @@ namespace Msg
         private:
             // NaviFrameItem:
             virtual void onAttached(ViewItem &item);
-            virtual void onButtonClicked(const NaviFrameItem &item, NaviButtonId buttonId);
+            virtual void onButtonClicked(NaviFrameItem &item, NaviButtonId buttonId);
 
             // IHwButtonListener:
             virtual void onHwBackButtonClicked();

diff --git a/src/MsgThread/Controller/src/MsgThread.cpp b/src/MsgThread/Controller/src/MsgThread.cpp
index d936202..f261174 100644 (file)
--- a/src/MsgThread/Controller/src/MsgThread.cpp
+++ b/src/MsgThread/Controller/src/MsgThread.cpp
@@ -295,7 +295,7 @@ void MsgThread::deleteSelectedItems()
     }
 }
 
-void MsgThread::onButtonClicked(const NaviFrameItem &item, NaviButtonId buttonId)
+void MsgThread::onButtonClicked(NaviFrameItem &item, NaviButtonId buttonId)
 {
     MSG_LOG("NaviButton id:", buttonId);
     if(buttonId == NaviOkButtonId)

diff --git a/src/MsgThread/View/inc/MsgThreadSearchPanel.h b/src/MsgThread/View/inc/MsgThreadSearchPanel.h
index 722a5c9..cb59347 100644 (file)
--- a/src/MsgThread/View/inc/MsgThreadSearchPanel.h
+++ b/src/MsgThread/View/inc/MsgThreadSearchPanel.h
@@ -52,7 +52,6 @@ namespace Msg
             void onClearButtonClicked(Evas_Object *obj, void *eventInfo);
 
         private:
-            Evas_Object *m_pLayout;
             Evas_Object *m_pEntry;
             Evas_Object *m_pClearButton;
             IMsgThreadSearchPanelListener *m_pListener;

diff --git a/src/MsgThread/View/src/MsgThreadSearchPanel.cpp b/src/MsgThread/View/src/MsgThreadSearchPanel.cpp
index 5804e57..1271a96 100644 (file)
--- a/src/MsgThread/View/src/MsgThreadSearchPanel.cpp
+++ b/src/MsgThread/View/src/MsgThreadSearchPanel.cpp
@@ -24,8 +24,7 @@
 using namespace Msg;
 
 MsgThreadSearchPanel::MsgThreadSearchPanel(Evas_Object *parent)
-    : m_pLayout(nullptr)
-    , m_pEntry(nullptr)
+    : m_pEntry(nullptr)
     , m_pClearButton(nullptr)
     , m_pListener(nullptr)
 {

diff --git a/src/Settings/Controller/inc/MsgOnSimCard.h b/src/Settings/Controller/inc/MsgOnSimCard.h
index 0f67922..2caa1d6 100644 (file)
--- a/src/Settings/Controller/inc/MsgOnSimCard.h
+++ b/src/Settings/Controller/inc/MsgOnSimCard.h
@@ -46,7 +46,7 @@ namespace Msg
         private:
             // NaviFrameItem:
             virtual void onAttached(ViewItem &item);
-            virtual void onButtonClicked(const NaviFrameItem &item, NaviButtonId buttonId);
+            virtual void onButtonClicked(NaviFrameItem &item, NaviButtonId buttonId);
             void calcChecked(int &check, int &total) const;
             int getItemsCount() const;
 

diff --git a/src/Settings/Controller/inc/Settings.h b/src/Settings/Controller/inc/Settings.h
index e5179ee..1ebd5df 100644 (file)
--- a/src/Settings/Controller/inc/Settings.h
+++ b/src/Settings/Controller/inc/Settings.h
@@ -43,7 +43,7 @@ namespace Msg
         private:
             // NaviFrameItem:
             virtual void onAttached(ViewItem &item);
-            virtual void onButtonClicked(const NaviFrameItem &item, NaviButtonId buttonId);
+            virtual void onButtonClicked(NaviFrameItem &item, NaviButtonId buttonId);
 
             // IListViewListener:
             virtual void onListItemSelected(ListItem &listItem, void *funcData);

diff --git a/src/Settings/Controller/src/MsgOnSimCard.cpp b/src/Settings/Controller/src/MsgOnSimCard.cpp
index 050290f..b86ff87 100644 (file)
--- a/src/Settings/Controller/src/MsgOnSimCard.cpp
+++ b/src/Settings/Controller/src/MsgOnSimCard.cpp
@@ -79,7 +79,7 @@ void MsgOnSimCard::onAttached(ViewItem &item)
     }*/
 }
 
-void MsgOnSimCard::onButtonClicked(const NaviFrameItem &item, NaviButtonId buttonId)
+void MsgOnSimCard::onButtonClicked(NaviFrameItem &item, NaviButtonId buttonId)
 {
     if(buttonId == NaviOkButtonId)
     {

diff --git a/src/Settings/Controller/src/Settings.cpp b/src/Settings/Controller/src/Settings.cpp
index 3538080..cd78e4c 100644 (file)
--- a/src/Settings/Controller/src/Settings.cpp
+++ b/src/Settings/Controller/src/Settings.cpp
@@ -404,7 +404,7 @@ void Settings::onNotiSoundChanged(MsgSettings &msgSetting)
     m_pSoundItem->update();
 }
 
-void Settings::onButtonClicked(const NaviFrameItem &item, NaviButtonId buttonId)
+void Settings::onButtonClicked(NaviFrameItem &item, NaviButtonId buttonId)
 {
     if(buttonId == NaviPrevButtonId)
     {

diff --git a/src/Viewer/Controller/inc/Viewer.h b/src/Viewer/Controller/inc/Viewer.h
index 25380e6..bc850d5 100644 (file)
--- a/src/Viewer/Controller/inc/Viewer.h
+++ b/src/Viewer/Controller/inc/Viewer.h
@@ -37,7 +37,7 @@ namespace Msg
 
             // NaviFrameItem:
             virtual void onAttached(ViewItem &item);
-            virtual void onButtonClicked(const NaviFrameItem &item, NaviButtonId buttonId);
+            virtual void onButtonClicked(NaviFrameItem &item, NaviButtonId buttonId);
 
             // IHwButtonListener:
             virtual void onHwBackButtonClicked();

diff --git a/src/Viewer/Controller/src/Viewer.cpp b/src/Viewer/Controller/src/Viewer.cpp
index d3c9827..9c53698 100644 (file)
--- a/src/Viewer/Controller/src/Viewer.cpp
+++ b/src/Viewer/Controller/src/Viewer.cpp
@@ -53,7 +53,7 @@ void Viewer::onHwMoreButtonClicked()
 
 }
 
-void Viewer::onButtonClicked(const NaviFrameItem &item, NaviButtonId buttonId)
+void Viewer::onButtonClicked(NaviFrameItem &item, NaviButtonId buttonId)
 {
     if(buttonId == NaviPrevButtonId)
     {