From: Pawel Andruszkiewicz <p.andruszkie@samsung.com>
Date: Thu, 9 Apr 2015 08:20:55 +0000 (+0200)
Subject: [NFC] Allow to create multiple instances of NFCInstance class.
X-Git-Tag: submit/tizen_tv/20150603.064601~1^2~172
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=63dffb9a4bb64dea29f0f4435b7d8d3d63b982d9;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

[NFC] Allow to create multiple instances of NFCInstance class.

Change-Id: I1df43b82d9c980b86edf0b91fe37dde0ca4b2014
---

diff --git a/src/nfc/nfc_extension.cc b/src/nfc/nfc_extension.cc
index fc3c793b..7ba564e5 100644
--- a/src/nfc/nfc_extension.cc
+++ b/src/nfc/nfc_extension.cc
@@ -30,5 +30,5 @@ NFCExtension::NFCExtension() {
 NFCExtension::~NFCExtension() {}
 
 common::Instance* NFCExtension::CreateInstance() {
-  return &extension::nfc::NFCInstance::getInstance();;
+  return new extension::nfc::NFCInstance();
 }
diff --git a/src/nfc/nfc_instance.cc b/src/nfc/nfc_instance.cc
index 1c6bd28b..e76bc2d5 100644
--- a/src/nfc/nfc_instance.cc
+++ b/src/nfc/nfc_instance.cc
@@ -32,11 +32,6 @@ const std::string kPrivilegeNfcTag = "http://tizen.org/privilege/nfc.tag";
 
 } // namespace
 
-NFCInstance& NFCInstance::getInstance() {
-  static NFCInstance instance;
-  return instance;
-}
-
 void NFCInstance::RespondAsync(const char* msg) {
   PostMessage(msg);
 }
diff --git a/src/nfc/nfc_instance.h b/src/nfc/nfc_instance.h
index da04ef07..83a8563d 100644
--- a/src/nfc/nfc_instance.h
+++ b/src/nfc/nfc_instance.h
@@ -14,13 +14,12 @@ namespace nfc {
 class NFCInstance: public common::ParsedInstance, NFCAdapter::IResponder
 {
  public:
-  static NFCInstance& getInstance();
-  void RespondAsync(const char* msg);
-
- private:
   NFCInstance();
   virtual ~NFCInstance();
 
+  void RespondAsync(const char* msg);
+
+ private:
   void GetDefaultAdapter(const picojson::value& args, picojson::object& out);
   void SetExclusiveMode(const picojson::value& args, picojson::object& out);
   void SetPowered(const picojson::value& args, picojson::object& out);