Revert "Fix N_SE-46938 for tz list."

[platform/framework/native/appfw.git] / src / locales / FLcl_CalendarImpl.cpp

diff --git a/src/locales/FLcl_CalendarImpl.cpp b/src/locales/FLcl_CalendarImpl.cpp
index 2c55ae3..d4e6e08 100644 (file)
--- a/src/locales/FLcl_CalendarImpl.cpp
+++ b/src/locales/FLcl_CalendarImpl.cpp
@@ -1,5 +1,4 @@
 //
-// Open Service Platform
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the License);
@@ -225,14 +224,15 @@ _CalendarImpl::SetTimeInMillisecImpl(long long millisec)
 result
 _CalendarImpl::SetTimeImpl(const DateTime& dateTime)
 {
-       return SetTimeImpl(dateTime.GetYear(), dateTime.GetMonth(), dateTime.GetDay(), dateTime.GetHour(), dateTime.GetMinute(), dateTime.GetSecond());
+       return SetTimeImpl(dateTime.GetYear(), dateTime.GetMonth(), dateTime.GetDay(),
+                        dateTime.GetHour(), dateTime.GetMinute(), dateTime.GetSecond(), dateTime.GetMillisecond());
 }
 
 result
-_CalendarImpl::SetTimeImpl(int year, int month, int day, int hour, int minute, int second)
+_CalendarImpl::SetTimeImpl(int year, int month, int day, int hour, int minute, int second, int millisecond)
 {
        SysAssertf(__pCalendar != null, "Not yet constructed! Construct() should be called before use.");
-       return __pCalendar->SetTime(year, month, day, hour, minute, second);
+       return __pCalendar->SetTime(year, month, day, hour, minute, second, millisecond);
 }
 
 result
@@ -304,10 +304,9 @@ _CalendarImpl::AddTimeField(TimeField field, int amount)
 }
 
 result
-_CalendarImpl::Roll(TimeField field, int amount)
+_CalendarImpl::RollImpl(TimeField field, int amount)
 {
        SysAssertf(__pCalendar != null, "Not yet constructed! Construct() should be called before use.");
-
        result r = E_INVALID_ARG;
        if (Tizen::App::_AppInfo::GetApiVersion() == _API_VERSION_2_0 && Tizen::App::_AppInfo::IsOspCompat())
        {
@@ -321,7 +320,7 @@ _CalendarImpl::Roll(TimeField field, int amount)
 }
 
 result
-_CalendarImpl::After(const _CalendarImpl& otherInstance, bool& after)
+_CalendarImpl::AfterImpl(const _CalendarImpl& otherInstance, bool& after)
 {
        SysAssertf(__pCalendar != null, "Not yet constructed! Construct() should be called before use.");
 
@@ -337,7 +336,7 @@ _CalendarImpl::After(const _CalendarImpl& otherInstance, bool& after)
 }
 
 result
-_CalendarImpl::Before(const _CalendarImpl& otherInstance, bool& before)
+_CalendarImpl::BeforeImpl(const _CalendarImpl& otherInstance, bool& before)
 {
        SysAssertf(__pCalendar != null, "Not yet constructed! Construct() should be called before use.");
 
@@ -353,7 +352,7 @@ _CalendarImpl::Before(const _CalendarImpl& otherInstance, bool& before)
 }
 
 bool
-_CalendarImpl::Equals(const _CalendarImpl& otherInstance) const
+_CalendarImpl::EqualsImpl(const _CalendarImpl& otherInstance) const
 {
        if ((__pCalendar != null) && (otherInstance.__pCalendar != null))
        {
@@ -363,7 +362,7 @@ _CalendarImpl::Equals(const _CalendarImpl& otherInstance) const
 }
 
 int
-_CalendarImpl::GetHashCode(void) const
+_CalendarImpl::GetHashCodeImpl(void) const
 {
        Integer intValues = IsLenient() + GetFirstDayOfWeek() + GetMinDaysInFirstWeek();
        int hashCode = intValues.GetHashCode();
@@ -414,16 +413,17 @@ _CalendarImpl::GetTimeImpl(void) const
        int hour = __pCalendar->GetTimeField(TIME_FIELD_HOUR_OF_DAY);
        int minute = __pCalendar->GetTimeField(TIME_FIELD_MINUTE);
        int second = __pCalendar->GetTimeField(TIME_FIELD_SECOND);
+       int millisecond = __pCalendar->GetTimeField(TIME_FIELD_MILLISECOND);
 
        DateTime dateTime;
-       result r = dateTime.SetValue(year, month, date, hour, minute, second);
+       result r = dateTime.SetValue(year, month, date, hour, minute, second, millisecond);
        SysTryReturn(NID_LCL, r == E_SUCCESS, DateTime(), r, "[%s] Unable to set time in DateTime object", GetErrorMessage(r));
 
        return dateTime;
 }
 
 int
-_CalendarImpl::GetMinTimeField(TimeField field) const
+_CalendarImpl::GetMinTimeFieldImpl(TimeField field) const
 {
        SysAssertf(__pCalendar != null, "Not yet constructed! Construct() should be called before use.");
        SysTryReturn(NID_LCL, ValidateTimeField(field), -1, E_INVALID_ARG,
@@ -433,7 +433,7 @@ _CalendarImpl::GetMinTimeField(TimeField field) const
 }
 
 int
-_CalendarImpl::GetActualMinTimeField(TimeField field) const
+_CalendarImpl::GetActualMinTimeFieldImpl(TimeField field) const
 {
        SysAssertf(__pCalendar != null, "Not yet constructed! Construct() should be called before use.");
        SysTryReturn(NID_LCL, ValidateTimeField(field), -1, E_INVALID_ARG,
@@ -443,7 +443,7 @@ _CalendarImpl::GetActualMinTimeField(TimeField field) const
 }
 
 int
-_CalendarImpl::GetGreatestMinTimeField(TimeField field) const
+_CalendarImpl::GetGreatestMinTimeFieldImpl(TimeField field) const
 {
        SysAssertf(__pCalendar != null, "Not yet constructed! Construct() should be called before use.");
        SysTryReturn(NID_LCL, ValidateTimeField(field), -1, E_INVALID_ARG,
@@ -453,7 +453,7 @@ _CalendarImpl::GetGreatestMinTimeField(TimeField field) const
 }
 
 int
-_CalendarImpl::GetLeastMaxTimeField(TimeField field) const
+_CalendarImpl::GetLeastMaxTimeFieldImpl(TimeField field) const
 {
        SysAssertf(__pCalendar != null, "Not yet constructed! Construct() should be called before use.");
        SysTryReturn(NID_LCL, ValidateTimeField(field), -1, E_INVALID_ARG,
@@ -463,7 +463,7 @@ _CalendarImpl::GetLeastMaxTimeField(TimeField field) const
 }
 
 int
-_CalendarImpl::GetActualMaxTimeField(TimeField field) const
+_CalendarImpl::GetActualMaxTimeFieldImpl(TimeField field) const
 {
        SysAssertf(__pCalendar != null, "Not yet constructed! Construct() should be called before use.");
        SysTryReturn(NID_LCL, ValidateTimeField(field), -1, E_INVALID_ARG,
@@ -473,7 +473,7 @@ _CalendarImpl::GetActualMaxTimeField(TimeField field) const
 }
 
 int
-_CalendarImpl::GetMaxTimeField(TimeField field) const
+_CalendarImpl::GetMaxTimeFieldImpl(TimeField field) const
 {
        SysAssertf(__pCalendar != null, "Not yet constructed! Construct() should be called before use.");
        SysTryReturn(NID_LCL, ValidateTimeField(field), -1, E_INVALID_ARG,