[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 fc3c793b4cb265cd9132aad555c6fe5be8f7be1b..7ba564e56d3894866b1a85a39d410d3020877999 100644 (file)
--- 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 1c6bd28b0e23fa6193699177803d7701ce9acd8f..e76bc2d5e2ff5a23e762fb59cb317408180702ce 100644 (file)
--- 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 da04ef07d19b8aaad8939b9ffa80fa7244d049d7..83a8563d31ef7b32b7905e5da4be055753fb2872 100644 (file)
--- 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);