BETA merge

1 files changed, 13 insertions, 24 deletions

diff --git a/src/platform/API/Calendar/EventAlarm.cpp b/src/platform/API/Calendar/EventAlarm.cpp
index 9f58bb0..ee0f089 100755
--- a/src/platform/API/Calendar/EventAlarm.cpp
+++ b/src/platform/API/Calendar/EventAlarm.cpp
@@ -16,7 +16,7 @@
 
 
 #include "EventAlarm.h"
-#include <dpl/log.h>
+#include <dpl/log/log.h>
 
 namespace TizenApis {
 namespace Api {
@@ -25,8 +25,6 @@ namespace Calendar {
 EventAlarm::EventAlarm()
 {
     m_absoluteDate = 0;
-    m_minutes = 0;
-    m_days = 0;
 }
 EventAlarm::~EventAlarm()
 {
@@ -41,40 +39,31 @@ void EventAlarm::setAbsoluteDate(const std::time_t &value)
     m_absoluteDate = value;
 }
 
-std::string EventAlarm::getTimeZone() const
-{
-    return m_timeZone;
-}
-void EventAlarm::setTimeZone(const std::string &value)
-{
-    m_timeZone = value;
-}
-
-long EventAlarm::getMinutes() const
+TizenApis::Api::TimeUtil::DurationProperties EventAlarm::getDuration() const
 {
-    return m_minutes;
+    return m_duration;
 }
-void EventAlarm::setMinutes(const long &value)
+void EventAlarm::setDuration(TizenApis::Api::TimeUtil::DurationProperties value)
 {
-    m_minutes = value;
+    m_duration = value;
 }
 
-long EventAlarm::getDays() const
+std::vector<CalendarEvent::EventAlarmType> EventAlarm::getMethods() const
 {
-    return m_days;
+    return m_methods;
 }
-void EventAlarm::setDays(const long &value)
+void EventAlarm::setMethods(const std::vector<CalendarEvent::EventAlarmType> &value)
 {
-    m_days = value;
+    m_methods = value;
 }
 
-std::vector<int> EventAlarm::getMethods() const
+std::string EventAlarm::getTimeZone() const
 {
-    return m_methods;
+    return m_timeZone;
 }
-void EventAlarm::setMethods(const std::vector<int> &value)
+void EventAlarm::setTimeZone(const std::string &value)
 {
-    m_methods = value;
+    m_timeZone = value;
 }
 
 }