From: Piotr Kosko Date: Wed, 1 Jul 2015 11:36:41 +0000 (+0200) Subject: [Notification] Changed code to avoid compilation warnings X-Git-Tag: submit/tizen_tv/20150720.124123^2^2~32^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d17730578b49ecb41b1b66688627497b5030de1;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [Notification] Changed code to avoid compilation warnings [Verification] Code compiles without errors and warnings. Change-Id: I7956808c39589adb5a67a24029bd2bb43392c415 Signed-off-by: Piotr Kosko --- diff --git a/src/notification/status_notification.cc b/src/notification/status_notification.cc index c523a273..af3d043a 100644 --- a/src/notification/status_notification.cc +++ b/src/notification/status_notification.cc @@ -328,7 +328,8 @@ PlatformResult StatusNotification::GetDetailInfos(notification_h noti_handle, picojson::object& detail_info_obj = detail_info.get(); std::string text; - for (int idx = 0; idx < info_map_.size(); ++idx) { + size_t info_map_size = info_map_.size(); + for (size_t idx = 0; idx < info_map_size; ++idx) { PlatformResult status = GetText(noti_handle, info_map_.at(idx), &text); if (status.IsError()) return status; @@ -356,8 +357,9 @@ PlatformResult StatusNotification::SetDetailInfos( notification_h noti_handle, const picojson::array& value) { LoggerD("Enter"); - int idx = 0; + size_t idx = 0; + size_t info_map_size = info_map_.size(); for (auto& item : value) { const picojson::object& obj = JsonCast(item); @@ -379,7 +381,7 @@ PlatformResult StatusNotification::SetDetailInfos( ++idx; - if (idx > info_map_.size()) { + if (idx > info_map_size) { LoggerE("Too many values in notification detailInfo array"); return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Too many values in notification detailInfo array"); @@ -524,7 +526,8 @@ PlatformResult StatusNotification::GetThumbnails(notification_h noti_handle, picojson::array* out) { LoggerD("Enter"); std::string text; - for (int idx = 0; idx < thumbnails_map_.size(); ++idx) { + size_t thumbnails_map_size = thumbnails_map_.size(); + for (size_t idx = 0; idx < thumbnails_map_size; ++idx) { PlatformResult status = GetImage(noti_handle, thumbnails_map_.at(idx), &text); if (status.IsError()) @@ -542,8 +545,9 @@ PlatformResult StatusNotification::GetThumbnails(notification_h noti_handle, PlatformResult StatusNotification::SetThumbnails(notification_h noti_handle, const picojson::array& value) { LoggerD("Enter"); - int idx = 0; + size_t idx = 0; + size_t thumbnails_map_size = thumbnails_map_.size(); for (auto& item : value) { const std::string& text = JsonCast(item); @@ -554,7 +558,7 @@ PlatformResult StatusNotification::SetThumbnails(notification_h noti_handle, ++idx; - if (idx > thumbnails_map_.size()) { + if (idx > thumbnails_map_size) { LoggerE("Too many values in notification thumbnail array"); return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Too many values in notification thumbnail array");