Added an devel-API to check whether video texture is supported

[platform/core/uifw/dali-adaptor.git] / adaptors / common / clipboard-event-notifier-impl.cpp

diff --git a/adaptors/common/clipboard-event-notifier-impl.cpp b/adaptors/common/clipboard-event-notifier-impl.cpp
index c28dcf0..ffd6a14 100644 (file)
--- a/adaptors/common/clipboard-event-notifier-impl.cpp
+++ b/adaptors/common/clipboard-event-notifier-impl.cpp
@@ -19,7 +19,7 @@
 #include "clipboard-event-notifier-impl.h"
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/dali-core.h>
+#include <dali/public-api/object/type-registry.h>
 
 // INTERNAL INCLUDES
 #include <singleton-service-impl.h>
@@ -33,29 +33,6 @@ namespace Internal
 namespace Adaptor
 {
 
-namespace
-{
-BaseHandle Create()
-{
-  BaseHandle handle( ClipboardEventNotifier::Get() );
-
-  if ( !handle )
-  {
-    Dali::SingletonService service( SingletonService::Get() );
-    if ( service )
-    {
-      Dali::ClipboardEventNotifier notifier( ClipboardEventNotifier::New() );
-      service.Register( typeid( notifier ), notifier );
-      handle = notifier;
-    }
-  }
-
-  return handle;
-}
-TypeRegistration CLIPBOARD_EVENT_NOTIFIER_TYPE( typeid(Dali::ClipboardEventNotifier), typeid(Dali::BaseHandle), Create, true /* Create Instance At Startup */ );
-
-} // unnamed namespace
-
 Dali::ClipboardEventNotifier ClipboardEventNotifier::New()
 {
   Dali::ClipboardEventNotifier notifier = Dali::ClipboardEventNotifier(new ClipboardEventNotifier());
@@ -77,6 +54,11 @@ Dali::ClipboardEventNotifier ClipboardEventNotifier::Get()
       // If so, downcast the handle
       notifier = Dali::ClipboardEventNotifier( dynamic_cast< ClipboardEventNotifier* >( handle.GetObjectPtr() ) );
     }
+    else
+    {
+      notifier = Dali::ClipboardEventNotifier( ClipboardEventNotifier::New() );
+      service.Register( typeid( notifier ), notifier );
+    }
   }
 
   return notifier;
@@ -99,10 +81,10 @@ void ClipboardEventNotifier::ClearContent()
 
 void ClipboardEventNotifier::EmitContentSelectedSignal()
 {
-  if ( !mContentSelectedSignalV2.Empty() )
+  if ( !mContentSelectedSignal.Empty() )
   {
     Dali::ClipboardEventNotifier handle( this );
-    mContentSelectedSignalV2.Emit( handle );
+    mContentSelectedSignal.Emit( handle );
   }
 }