Modified an api call flow

Change-Id: I096b4b3b4966aa2246d694a6bf30e0d20f3f1df0
Signed-off-by: Hokwon Song <hokwon.song@samsung.com>

diff --git a/src/locales/FLclCalendar.cpp b/src/locales/FLclCalendar.cpp
index 90005d9..9d2abfd 100644 (file)
--- a/src/locales/FLclCalendar.cpp
+++ b/src/locales/FLclCalendar.cpp
@@ -204,14 +204,14 @@ int
 Calendar::GetActualMaxTimeField(TimeField field) const
 {
        SysAssertf(_pCalendarImpl != null, "Not yet constructed! Construct() should be called before use.");
-       return _pCalendarImpl->GetActualMaxTimeField(field);
+       return _pCalendarImpl->GetActualMaxTimeFieldImpl(field);
 }
 
 int
 Calendar::GetActualMinTimeField(TimeField field) const
 {
        SysAssertf(_pCalendarImpl != null, "Not yet constructed! Construct() should be called before use.");
-       return _pCalendarImpl->GetActualMinTimeField(field);
+       return _pCalendarImpl->GetActualMinTimeFieldImpl(field);
 }
 
 int
@@ -295,7 +295,7 @@ result
 Calendar::Roll(TimeField field, int amount)
 {
        SysAssertf(_pCalendarImpl != null, "Not yet constructed! Construct() should be called before use.");
-       return _pCalendarImpl->Roll(field, amount);
+       return _pCalendarImpl->RollImpl(field, amount);
 }
 
 result

diff --git a/src/locales/FLcl_CalendarImpl.cpp b/src/locales/FLcl_CalendarImpl.cpp
index 8e75857..7e991df 100644 (file)
--- a/src/locales/FLcl_CalendarImpl.cpp
+++ b/src/locales/FLcl_CalendarImpl.cpp
@@ -305,10 +305,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())
        {
@@ -435,7 +434,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,
@@ -465,7 +464,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,

diff --git a/src/locales/FLcl_CalendarImpl.h b/src/locales/FLcl_CalendarImpl.h
index aafc35e..2dc8f28 100644 (file)
--- a/src/locales/FLcl_CalendarImpl.h
+++ b/src/locales/FLcl_CalendarImpl.h
@@ -65,7 +65,7 @@ public:
        result ClearImpl(TimeField field);
 
        result AddTimeField(TimeField field, int amount);
-       result Roll(TimeField field, int amount);
+       result RollImpl(TimeField field, int amount);
 
        // Methods to compare Calendars
        result After(const _CalendarImpl& otherInstance, bool& after);
@@ -81,11 +81,11 @@ public:
        Tizen::Base::DateTime GetTimeImpl(void) const;
 
        int GetMinTimeField(TimeField field) const;
-       int GetActualMinTimeField(TimeField field) const;
+       int GetActualMinTimeFieldImpl(TimeField field) const;
        int GetGreatestMinTimeField(TimeField field) const;
 
        int GetLeastMaxTimeField(TimeField field) const;
-       int GetActualMaxTimeField(TimeField field) const;
+       int GetActualMaxTimeFieldImpl(TimeField field) const;
        int GetMaxTimeField(TimeField field) const;
 
        int GetFirstDayOfWeekImpl(void) const;