Update change log and spec for wrt-plugins-tizen_0.4.48-1

[platform/framework/web/wrt-plugins-tizen.git] / src / NFC / JSNFCAdapter.cpp

diff --git a/src/NFC/JSNFCAdapter.cpp b/src/NFC/JSNFCAdapter.cpp
old mode 100644 (file)
new mode 100755 (executable)
index e48b746..5805a85
--- a/src/NFC/JSNFCAdapter.cpp
+++ b/src/NFC/JSNFCAdapter.cpp
@@ -44,7 +44,7 @@
 #include <Logger.h>
 
 using namespace std;
-using namespace DPL;
+
 using namespace DeviceAPI::Common;
 using namespace WrtDeviceApis::Commons;
 using namespace WrtDeviceApis::CommonsJavaScript;
@@ -209,13 +209,13 @@ JSValueRef JSNFCAdapter::setTagListener (JSContextRef context, JSObjectRef objec
                    );
                EventNFCChangedEmitterPtr emitter(new EventNFCChangedEmitter);
                emitter->setListener(&NFCStaticController::getInstance());
-               emitter->setEventPrivateData(StaticPointerCast<EventNFCChanged::PrivateDataType>(privateData));
+               emitter->setEventPrivateData(DPL::StaticPointerCast<EventNFCChanged::PrivateDataType>(privateData));
 
                if (nfcAdapter->setTagListener(emitter, tagFilter) != 0)
                        Throw(WrtDeviceApis::Commons::UnknownException);
 
                NFCListenerCancellerPtr canceller = NFCListenerCancellerPtr(new NFCListenerCanceller(global_context, thisObject, static_cast<long>(ID_NFCADAPTER_TAG_LISTENER)));
-               IListenerItemPtr listenerItem = StaticPointerCast<IListenerItem>(canceller);
+               IListenerItemPtr listenerItem = DPL::StaticPointerCast<IListenerItem>(canceller);
                NFCListenerManagerSingleton::Instance().registerListener(listenerItem, global_context);
 
                return JSValueMakeUndefined(context);
@@ -273,13 +273,13 @@ JSValueRef JSNFCAdapter::setPeerListener (JSContextRef context, JSObjectRef obje
 
                EventNFCChangedEmitterPtr emitter(new EventNFCChangedEmitter);
                emitter->setListener(&NFCStaticController::getInstance());
-               emitter->setEventPrivateData(StaticPointerCast<EventNFCChanged::PrivateDataType>(privateData));
+               emitter->setEventPrivateData(DPL::StaticPointerCast<EventNFCChanged::PrivateDataType>(privateData));
 
                if (nfcAdapter->setPeerListener(emitter) != 0)
                        Throw(WrtDeviceApis::Commons::UnknownException);
 
                NFCListenerCancellerPtr canceller = NFCListenerCancellerPtr(new NFCListenerCanceller(global_context, thisObject, static_cast<long>(ID_NFCADAPTER_PEER_LISTENER)));
-               IListenerItemPtr listenerItem = StaticPointerCast<IListenerItem>(canceller);
+               IListenerItemPtr listenerItem = DPL::StaticPointerCast<IListenerItem>(canceller);
                NFCListenerManagerSingleton::Instance().registerListener(listenerItem, global_context);
 
                return JSValueMakeUndefined(context);
@@ -318,7 +318,7 @@ JSValueRef JSNFCAdapter::unsetTagListener(JSContextRef context, JSObjectRef obje
                nfcAdapter->unsetTagListener();
 
                NFCListenerCancellerPtr canceller = NFCListenerCancellerPtr(new NFCListenerCanceller(privateObject->getContext(), thisObject,  static_cast<long>(ID_NFCADAPTER_TAG_LISTENER)));
-               IListenerItemPtr listenerItem = StaticPointerCast<IListenerItem>(canceller);
+               IListenerItemPtr listenerItem = DPL::StaticPointerCast<IListenerItem>(canceller);
                NFCListenerManagerSingleton::Instance().unregisterListener(listenerItem);
 
                return JSValueMakeUndefined(context);
@@ -352,7 +352,7 @@ JSValueRef JSNFCAdapter::unsetPeerListener(JSContextRef context, JSObjectRef obj
                nfcAdapter->unsetPeerListener();
 
                NFCListenerCancellerPtr canceller = NFCListenerCancellerPtr(new NFCListenerCanceller(privateObject->getContext(), thisObject,  static_cast<long>(ID_NFCADAPTER_PEER_LISTENER)));
-               IListenerItemPtr listenerItem = StaticPointerCast<IListenerItem>(canceller);
+               IListenerItemPtr listenerItem = DPL::StaticPointerCast<IListenerItem>(canceller);
                NFCListenerManagerSingleton::Instance().unregisterListener(listenerItem);
 
                return JSValueMakeUndefined(context);
@@ -436,8 +436,9 @@ JSValueRef JSNFCAdapter::setPowered (JSContextRef context, JSObjectRef object,
                NFCConverter nfcConverter(context);
 
                EventNFCChangedSetPoweredPtr event(new EventNFCChangedSetPowered(state));
-               event->setPrivateData( StaticPointerCast<IEventPrivateData>(callbackManager) );
+               event->setPrivateData( DPL::StaticPointerCast<IEventPrivateData>(callbackManager) );
                event->setForAsynchronousCall(&NFCStaticController::getInstance());
+               callbackManager->setObject(thisObject);
                nfcAdapter->setPowered(event);
                NFCAsyncCallbackManagerSingleton::Instance().registerCallbackManager(callbackManager, global_context);
                return JSValueMakeUndefined(context);