Fix for build warning

Change-Id: I7df42e29d33540749dc8c30042c432f7160301ba
Signed-off-by: hs321.lee <hs321.lee@samsung.com>

diff --git a/src/FSclAttendee.cpp b/src/FSclAttendee.cpp
index 937565a..506ebf8 100644 (file)
--- a/src/FSclAttendee.cpp
+++ b/src/FSclAttendee.cpp
@@ -35,8 +35,8 @@ Attendee::Attendee(const String& email)
        : __email(email)
        , __attendeeRole(ATTENDEE_ROLE_ATTENDEE)
        , __attendeeStatus(ATTENDEE_STATUS_NONE)
-       , __pAttendeeImpl(null)
        , __personId(INVALID_RECORD_ID)
+       , __pAttendeeImpl(null)
 {
        // empty body.
 }
@@ -47,8 +47,8 @@ Attendee::Attendee(const Attendee& rhs)
        , __phoneNumber(rhs.__phoneNumber)
        , __attendeeRole(rhs.__attendeeRole)
        , __attendeeStatus(rhs.__attendeeStatus)
-       , __pAttendeeImpl(null)
        , __personId(rhs.__personId)
+       , __pAttendeeImpl(null)
 {
        // empty body.
 }

diff --git a/src/FSclReminder.cpp b/src/FSclReminder.cpp
index 02a2664..a036398 100644 (file)
--- a/src/FSclReminder.cpp
+++ b/src/FSclReminder.cpp
@@ -48,9 +48,9 @@ Reminder::Reminder(void)
 }
 
 Reminder::Reminder(const Reminder& rhs)
-       : __timeUnit(rhs.__timeUnit)
+       : __soundFilePath(rhs.__soundFilePath)
+       , __timeUnit(rhs.__timeUnit)
        , __timeOffset(rhs.__timeOffset)
-       , __soundFilePath(rhs.__soundFilePath)
        , __pReminderImpl(null)
 {
        __pReminderImpl = new (std::nothrow) _ReminderImpl(*rhs.__pReminderImpl);

diff --git a/src/FScl_CalEventImpl.cpp b/src/FScl_CalEventImpl.cpp
index 6f7b101..7b9344b 100644 (file)
--- a/src/FScl_CalEventImpl.cpp
+++ b/src/FScl_CalEventImpl.cpp
@@ -624,7 +624,7 @@ _CalEventImpl::GetAllAttendeesN(void) const
        unsigned int attendeeCount = 0;
        calendar_record_get_child_record_count(__eventRecord.GetHandle(), _calendar_event.calendar_attendee, &attendeeCount);
 
-       for (int i = 0; i < attendeeCount; i++)
+       for (unsigned int i = 0; i < attendeeCount; i++)
        {
                calendar_record_h tmpAttendeeHandle = null;
                char* pTmpEmail = null;
@@ -1648,7 +1648,7 @@ _CalEventImpl::GetAttendeeIndex(const char* pAttendeeEmail)
 
        calendar_record_h tmpAttendeeHandle = null;
        char* pTmpAttendeeEmail = null;
-       for (int i = 0; i < attendeeCount; i++)
+       for (unsigned int i = 0; i < attendeeCount; i++)
        {
                calendar_record_get_child_record_at_p(__eventRecord.GetHandle(), _calendar_event.calendar_attendee, i, &tmpAttendeeHandle);
                calendar_record_get_str_p(tmpAttendeeHandle, _calendar_attendee.email, &pTmpAttendeeEmail);

diff --git a/src/FScl_CalendarbookImpl.cpp b/src/FScl_CalendarbookImpl.cpp
index 56f0a3d..ce67c7c 100644 (file)
--- a/src/FScl_CalendarbookImpl.cpp
+++ b/src/FScl_CalendarbookImpl.cpp
@@ -1399,7 +1399,6 @@ _CalendarbookImpl::UpdateEventInstance(const CalEventInstance& eventInstance, Ca
        calendar_time_s tmpTimeValue;
        calendar_record_get_caltime(baseEventHandle, _calendar_event.until_time, &tmpTimeValue);
 
-       bool tmpIsAllDay = 0;
        calendar_time_s tmpStartTimeValue;
        DateTime convertedTime;
        calendar_record_get_caltime(eventHandle, _calendar_event.start_time, &tmpStartTimeValue);
@@ -2167,7 +2166,7 @@ _CalendarbookImpl::GetEventInstancesOfCategoryN(const calendar_time_s& startTime
                calendar_record_get_int(tmpRecordHandle, _calendar_instance_allday_calendar_book.event_id, &eventId);
                pEventCategoryMap->GetValue(eventId, tmpCategory);
 
-               if (tmpCategory == category)
+               if ((unsigned long) tmpCategory == category)
                {
                        if (candidateCount >= startIndex)
                        {
@@ -2270,7 +2269,7 @@ _CalendarbookImpl::GetEventInstancesOfCategoryN(const calendar_time_s& startTime
                        calendar_record_get_int(tmpRecordHandle, _calendar_instance_normal_calendar_book.event_id, &eventId);
                        pEventCategoryMap->GetValue(eventId, tmpCategory);
 
-                       if (tmpCategory == category)
+                       if ((unsigned long) tmpCategory == category)
                        {
                                if (candidateCount >= startIndex)
                                {

diff --git a/src/FScl_CalendarbookUtil.cpp b/src/FScl_CalendarbookUtil.cpp
index 4c6ff28..261a914 100644 (file)
--- a/src/FScl_CalendarbookUtil.cpp
+++ b/src/FScl_CalendarbookUtil.cpp
@@ -193,7 +193,7 @@ _CalendarbookUtil::ConvertEventAlarmsToReminderList(calendar_record_h calendarRe
                return E_SUCCESS;
        }
 
-       for (int i = 0; i< reminderCount; i++)
+       for (unsigned int i = 0; i< reminderCount; i++)
        {
                calendar_record_h tmpAlarmHandle = null;
                int tmpAlarmTickUnit = CALENDAR_ALARM_NONE;
@@ -275,7 +275,7 @@ _CalendarbookUtil::ConvertTodoAlarmsToReminderList(calendar_record_h calendarRec
                return E_SUCCESS;
        }
 
-       for (int i = 0; i< reminderCount; i++)
+       for (unsigned int i = 0; i< reminderCount; i++)
        {
                calendar_record_h tmpAlarmHandle = null;
                int tmpAlarmTickUnit = CALENDAR_ALARM_NONE;