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 7e991df..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);
@@ -321,7 +320,7 @@ _CalendarImpl::RollImpl(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();
@@ -424,7 +423,7 @@ _CalendarImpl::GetTimeImpl(void) const
 }
 
 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,
@@ -444,7 +443,7 @@ _CalendarImpl::GetActualMinTimeFieldImpl(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,
@@ -454,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,
@@ -474,7 +473,7 @@ _CalendarImpl::GetActualMaxTimeFieldImpl(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,