merge wrt-plugins-tizen_0.2.0-12

[profile/ivi/wrt-plugins-tizen.git] / src / standards / Tizen / Calendar / JSCalendarItemProperties.cpp

diff --git a/src/standards/Tizen/Calendar/JSCalendarItemProperties.cpp b/src/standards/Tizen/Calendar/JSCalendarItemProperties.cpp
index fb7304f..7dba891 100755 (executable)
--- a/src/standards/Tizen/Calendar/JSCalendarItemProperties.cpp
+++ b/src/standards/Tizen/Calendar/JSCalendarItemProperties.cpp
@@ -663,11 +663,12 @@ JSValueRef JSCalendarItemProperties::getPropertyAlarms(JSContextRef context,
     LogDebug("entered");
     Try
     {
-        CalendarConverterFactory::ConverterType converter =
-            CalendarConverterFactory::getConverter(context);
+        CalendarItemPropertiesPrivObject *priv =
+            static_cast<CalendarItemPropertiesPrivObject*>(JSObjectGetPrivate(object));
+
         CalendarEventPtr event = getPrivateObject(object);
 
-        JSObjectRef jsResult = JSCreateArrayObject(context, 0, NULL);
+        JSObjectRef jsResult = JSCreateArrayObject(priv->getContext(), 0, NULL);
         if (NULL == jsResult) {
             ThrowMsg(NullPointerException, "Could not create js array object");
         }
@@ -683,7 +684,7 @@ JSValueRef JSCalendarItemProperties::getPropertyAlarms(JSContextRef context,
             alarm->setTimeZone(event->getTimeZone());
             alarm->setDescription(event->getAlarmsDescription().at(i));
 
-            if (!JSSetArrayElement(context, jsResult, i, JSCalendarAlarm::createJSCalendarAlarm(context, alarm))) {
+            if (!JSSetArrayElement(priv->getContext(), jsResult, i, JSCalendarAlarm::createJSCalendarAlarm(priv->getContext(), alarm))) {
                ThrowMsg(UnknownException, "Could not insert value into js array");
             }
         }
@@ -984,13 +985,14 @@ JSValueRef JSCalendarItemProperties::getPropertyRecurrenceRule(JSContextRef cont
     LogDebug("entered");
     Try
     {
-        CalendarConverterFactory::ConverterType converter =
-            CalendarConverterFactory::getConverter(context);
+        CalendarItemPropertiesPrivObject *priv =
+            static_cast<CalendarItemPropertiesPrivObject*>(JSObjectGetPrivate(object));
+
         CalendarEventPtr event = getPrivateObject(object);
         EventRecurrenceRulePtr rrule = event->getRecurrenceRule();
 
         if (rrule) {
-            return JSCalendarRecurrenceRule::createJSCalendarRecurrenceRule(context, rrule);
+            return JSCalendarRecurrenceRule::createJSCalendarRecurrenceRule(priv->getContext(), rrule);
         }
     }
     Catch(Exception)
@@ -1130,15 +1132,18 @@ JSValueRef JSCalendarItemProperties::getPropertyAttendees(JSContextRef context,
     LogDebug("entered");
     Try
     {
+        CalendarItemPropertiesPrivObject *priv =
+            static_cast<CalendarItemPropertiesPrivObject*>(JSObjectGetPrivate(object));
+
         CalendarEventPtr event = getPrivateObject(object);
         EventAttendeeListPtr attendees = event->getAttendees();
         if (attendees) {
-            JSObjectRef jsResult = JSCreateArrayObject(context, 0, NULL);
+            JSObjectRef jsResult = JSCreateArrayObject(priv->getContext(), 0, NULL);
             if (NULL == jsResult) {
                 ThrowMsg(NullPointerException, "Could not create js array object");
             }
             for(unsigned int i=0; i<attendees->size(); i++) {
-                if (!JSSetArrayElement(context, jsResult, i, JSCalendarAttendee::createJSCalendarAttendee(context, attendees->at(i)))) {
+                if (!JSSetArrayElement(priv->getContext(), jsResult, i, JSCalendarAttendee::createJSCalendarAttendee(priv->getContext(), attendees->at(i)))) {
                    ThrowMsg(UnknownException, "Could not insert value into js array");
                 }
             }