From 5350a041dc52dc3d32daf832536955e169ca437d Mon Sep 17 00:00:00 2001
From: Paul Wisbey <p.wisbey@samsung.com>
Date: Wed, 26 Feb 2020 17:56:45 +0000
Subject: [PATCH] Moved SingletonService into dali-core

Change-Id: I29451604967d49e0a3b658a96c9b8b0178a2d39a
---
 dali-extension/internal/evas-plugin/evas-plugin-impl.cpp | 8 --------
 dali-extension/internal/evas-plugin/evas-plugin-impl.h   | 2 --
 2 files changed, 10 deletions(-)

diff --git a/dali-extension/internal/evas-plugin/evas-plugin-impl.cpp b/dali-extension/internal/evas-plugin/evas-plugin-impl.cpp
index 13959c2..1484c9e 100755
--- a/dali-extension/internal/evas-plugin/evas-plugin-impl.cpp
+++ b/dali-extension/internal/evas-plugin/evas-plugin-impl.cpp
@@ -50,9 +50,6 @@ Adaptor* EvasPlugin::mAdaptor = nullptr;
 
 uint32_t EvasPlugin::mEvasPluginCount = 0;
 
-SingletonService EvasPlugin::mSingletonService = SingletonService();
-
-
 IntrusivePtr< EvasPlugin > EvasPlugin::New( Evas_Object* parentEvasObject, int width, int height, bool isTranslucent )
 {
   IntrusivePtr< EvasPlugin > evasPlugin = new EvasPlugin( parentEvasObject, width, height, isTranslucent );
@@ -84,9 +81,6 @@ void EvasPlugin::Initialize()
 
   if( !mAdaptor )
   {
-    // Create the singleton service
-    mSingletonService = SingletonService::New();
-
     // Create an adaptor or add new scene holder to the adaptor
     mAdaptor = &Adaptor::New( sceneHolderHandler, *surface, Configuration::APPLICATION_DOES_NOT_HANDLE_CONTEXT_LOSS );
   }
@@ -110,8 +104,6 @@ EvasPlugin::~EvasPlugin()
   if( !mEvasPluginCount )
   {
     delete mAdaptor;
-
-    mSingletonService.UnregisterAll();
   }
 }
 
diff --git a/dali-extension/internal/evas-plugin/evas-plugin-impl.h b/dali-extension/internal/evas-plugin/evas-plugin-impl.h
index 103f956..78da4e3 100755
--- a/dali-extension/internal/evas-plugin/evas-plugin-impl.h
+++ b/dali-extension/internal/evas-plugin/evas-plugin-impl.h
@@ -22,7 +22,6 @@
 #include <memory>
 #include <Ecore_IMF_Evas.h>
 
-#include <dali/devel-api/adaptor-framework/singleton-service.h>
 #include <dali/integration-api/adaptor-framework/scene-holder-impl.h>
 #include <dali/public-api/common/intrusive-ptr.h>
 #include <dali/public-api/math/rect.h>
@@ -283,7 +282,6 @@ private:
 
   static Adaptor*                           mAdaptor;
   static uint32_t                           mEvasPluginCount;
-  static SingletonService                   mSingletonService;
 
   std::unique_ptr< EvasWrapper >            mEvasWrapper;
   std::unique_ptr< TriggerEventInterface >  mRenderNotification;
-- 
2.7.4