From fa2804293fd6c262b0efbdb2378e1b9e13eafdd4 Mon Sep 17 00:00:00 2001 From: Hokwon Song Date: Wed, 17 Apr 2013 15:39:25 +0900 Subject: [PATCH] Modified an api call flow for Calendar class Change-Id: I69d174939ef871047d4fbb3dbfa35ed52e23007f Signed-off-by: Hokwon Song --- src/locales/FLclCalendar.cpp | 16 ++++++++-------- src/locales/FLcl_CalendarImpl.cpp | 16 ++++++++-------- src/locales/FLcl_CalendarImpl.h | 16 ++++++++-------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/locales/FLclCalendar.cpp b/src/locales/FLclCalendar.cpp index 9d2abfd..65bbb9e 100644 --- a/src/locales/FLclCalendar.cpp +++ b/src/locales/FLclCalendar.cpp @@ -147,7 +147,7 @@ Calendar::After(const Calendar& otherCalendar, bool& after) r = E_INVALID_STATE; } SysTryReturnResult(NID_LCL, otherCalendar._pCalendarImpl, r, "Invalid argument is used. otherCalendar instance is invalid"); - return _pCalendarImpl->After(*otherCalendar._pCalendarImpl, after); + return _pCalendarImpl->AfterImpl(*otherCalendar._pCalendarImpl, after); } result @@ -162,7 +162,7 @@ Calendar::Before(const Calendar& otherCalendar, bool& before) r = E_INVALID_STATE; } SysTryReturnResult(NID_LCL, otherCalendar._pCalendarImpl, r, "Invalid argument is used. otherCalendar instance is invalid"); - return _pCalendarImpl->Before(*otherCalendar._pCalendarImpl, before); + return _pCalendarImpl->BeforeImpl(*otherCalendar._pCalendarImpl, before); } result @@ -190,14 +190,14 @@ Calendar::Equals(const Object& obj) const return false; } - return _pCalendarImpl->Equals(*pOtherInstance->_pCalendarImpl); + return _pCalendarImpl->EqualsImpl(*pOtherInstance->_pCalendarImpl); } int Calendar::GetHashCode(void) const { SysAssertf(_pCalendarImpl != null, "Not yet constructed! Construct() should be called before use."); - return _pCalendarImpl->GetHashCode(); + return _pCalendarImpl->GetHashCodeImpl(); } int @@ -225,28 +225,28 @@ int Calendar::GetGreatestMinTimeField(TimeField field) const { SysAssertf(_pCalendarImpl != null, "Not yet constructed! Construct() should be called before use."); - return _pCalendarImpl->GetGreatestMinTimeField(field); + return _pCalendarImpl->GetGreatestMinTimeFieldImpl(field); } int Calendar::GetLeastMaxTimeField(TimeField field) const { SysAssertf(_pCalendarImpl != null, "Not yet constructed! Construct() should be called before use."); - return _pCalendarImpl->GetLeastMaxTimeField(field); + return _pCalendarImpl->GetLeastMaxTimeFieldImpl(field); } int Calendar::GetMaxTimeField(TimeField field) const { SysAssertf(_pCalendarImpl != null, "Not yet constructed! Construct() should be called before use."); - return _pCalendarImpl->GetMaxTimeField(field); + return _pCalendarImpl->GetMaxTimeFieldImpl(field); } int Calendar::GetMinTimeField(TimeField field) const { SysAssertf(_pCalendarImpl != null, "Not yet constructed! Construct() should be called before use."); - return _pCalendarImpl->GetMinTimeField(field); + return _pCalendarImpl->GetMinTimeFieldImpl(field); } int diff --git a/src/locales/FLcl_CalendarImpl.cpp b/src/locales/FLcl_CalendarImpl.cpp index 7e991df..33f3aec 100644 --- a/src/locales/FLcl_CalendarImpl.cpp +++ b/src/locales/FLcl_CalendarImpl.cpp @@ -321,7 +321,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 +337,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 +353,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 +363,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 +424,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 +444,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 +454,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 +474,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, diff --git a/src/locales/FLcl_CalendarImpl.h b/src/locales/FLcl_CalendarImpl.h index 2dc8f28..a07fdf6 100644 --- a/src/locales/FLcl_CalendarImpl.h +++ b/src/locales/FLcl_CalendarImpl.h @@ -68,25 +68,25 @@ public: result RollImpl(TimeField field, int amount); // Methods to compare Calendars - result After(const _CalendarImpl& otherInstance, bool& after); - result Before(const _CalendarImpl& otherInstance, bool& before); - bool Equals(const _CalendarImpl& otherInstance) const; + result AfterImpl(const _CalendarImpl& otherInstance, bool& after); + result BeforeImpl(const _CalendarImpl& otherInstance, bool& before); + bool EqualsImpl(const _CalendarImpl& otherInstance) const; // Get methods - int GetHashCode(void) const; + int GetHashCodeImpl(void) const; CalendarType GetType(void) const; int GetTimeFieldImpl(TimeField field) const; result GetTimeInMillisecImpl(long long& millisec) const; Tizen::Base::DateTime GetTimeImpl(void) const; - int GetMinTimeField(TimeField field) const; + int GetMinTimeFieldImpl(TimeField field) const; int GetActualMinTimeFieldImpl(TimeField field) const; - int GetGreatestMinTimeField(TimeField field) const; + int GetGreatestMinTimeFieldImpl(TimeField field) const; - int GetLeastMaxTimeField(TimeField field) const; + int GetLeastMaxTimeFieldImpl(TimeField field) const; int GetActualMaxTimeFieldImpl(TimeField field) const; - int GetMaxTimeField(TimeField field) const; + int GetMaxTimeFieldImpl(TimeField field) const; int GetFirstDayOfWeekImpl(void) const; int GetMinDaysInFirstWeekImpl(void) const; -- 2.7.4