TizenRefApp-6386 - fixed x64 build warnings

Change-Id: Ia9e7e766c59f6511153a91c182cae66c2f6e2774
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

diff --git a/src/Common/View/src/NaviFrameItem.cpp b/src/Common/View/src/NaviFrameItem.cpp
index 4cd1bed..326c245 100644 (file)
--- a/src/Common/View/src/NaviFrameItem.cpp
+++ b/src/Common/View/src/NaviFrameItem.cpp
@@ -252,7 +252,7 @@ void NaviFrameItem::NaviBar::showDownButtonPart(bool value)
 void NaviFrameItem::NaviBar::on_button_clicked(void *data, Evas_Object *obj, void *event_info)
 {
     NaviFrameItem::NaviBar *naviBar = static_cast<NaviFrameItem::NaviBar*>(data);
-    int type = (int)evas_object_data_get(obj, buttonTypeKey);
+    int type = (int)(intptr_t)evas_object_data_get(obj, buttonTypeKey);
     naviBar->getOwner().onButtonClicked(naviBar->getOwner(), (NaviButtonId)type);
 }
 

diff --git a/src/Common/View/src/Popup.cpp b/src/Common/View/src/Popup.cpp
index d56a9e5..46830c4 100644 (file)
--- a/src/Common/View/src/Popup.cpp
+++ b/src/Common/View/src/Popup.cpp
@@ -130,7 +130,7 @@ Evas_Object *Popup::addButton(const TText &text, int buttonId, PopupButtonCb but
     {
         ++m_CurrentButtonIndex;
         evas_object_show(btn);
-        evas_object_data_set(btn, buttonIdKey, (void*)buttonId);
+        evas_object_data_set(btn, buttonIdKey, (void*)(intptr_t)buttonId);
         evas_object_data_set(btn, buttonCbKey, (void*)buttonCb);
         evas_object_data_set(btn, buttonCbDataKey, userData);
         evas_object_smart_callback_add(btn, "clicked", on_button_clicked, this);
@@ -173,7 +173,7 @@ void Popup::on_button_clicked(void *data, Evas_Object *obj, void *event_info)
     {
         void *userData = evas_object_data_get(obj, buttonCbDataKey);
         Popup *popup = static_cast<Popup*>(data);
-        int buttonId = (int)evas_object_data_get(obj, buttonIdKey);
+        int buttonId = (int)(intptr_t)evas_object_data_get(obj, buttonIdKey);
         cb(*popup, buttonId, userData);
     }
 }

diff --git a/src/Conversation/Body/Controller/src/Body.cpp b/src/Conversation/Body/Controller/src/Body.cpp
index a107731..c2e4274 100644 (file)
--- a/src/Conversation/Body/Controller/src/Body.cpp
+++ b/src/Conversation/Body/Controller/src/Body.cpp
@@ -170,9 +170,9 @@ long long Body::getMsgSize()
     auto attachments = getAttachments();
     for(BodyAttachmentViewItem *attachment : attachments)
     {
-        long long size = attachment->getFileSize();
-        if(size > 0)
-            size += size;
+        long long fileSize = attachment->getFileSize();
+        if(fileSize > 0)
+            size += fileSize;
     }
 
     // Pages:
@@ -343,9 +343,9 @@ void Body::onCheckBoundaryText(TextPageViewItem &item, char **text)
     MSG_LOG("");
     if(isMms())
     {
-        int maxSize = m_App.getMsgEngine().getSettings().getMaxMmsSize();
+        long long maxSize = m_App.getMsgEngine().getSettings().getMaxMmsSize();
         std::string utfText = markupToUtf8(*text);
-        if(getMsgSize() + utfText.size() > maxSize)
+        if(getMsgSize() + static_cast<long long>(utfText.size()) > maxSize)
         {
             free(*text);
             *text = nullptr;

diff --git a/src/Conversation/Main/View/src/MessageInputPanel.cpp b/src/Conversation/Main/View/src/MessageInputPanel.cpp
index e89b9d1..0a3859f 100644 (file)
--- a/src/Conversation/Main/View/src/MessageInputPanel.cpp
+++ b/src/Conversation/Main/View/src/MessageInputPanel.cpp
@@ -151,7 +151,7 @@ void MessageInputPanel::onButtonClicked(Evas_Object *obj, void *event_info)
 {
     if(m_pListener)
     {
-        int id = (int)evas_object_data_get(obj, buttonIdKey);
+        int id = (int)(intptr_t)evas_object_data_get(obj, buttonIdKey);
         m_pListener->onButtonClicked(*this, (ButtonId)id);
     }
 }