X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-clipboard-event-notifier.cpp;h=cbfe93e0aa38de75f10a1f9a527868d2506f83c6;hb=1a0dc2cc53708bbc32546da6031e996465544f51;hp=cf00a92423588618104f8130661cf699e8561104;hpb=ad9e64505734ea0a7b6f58198b8dd192e613ee6d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp
index cf00a92..cbfe93e 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@
 
 #include "toolkit-clipboard-event-notifier.h"
 
-#include <dali/public-api/common/dali-common.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
 #include <dali/public-api/object/base-object.h>
-#include <dali/public-api/signals/dali-signal-v2.h>
+#include <dali/public-api/signals/dali-signal.h>
 
 namespace Dali
 {
@@ -34,7 +34,7 @@ class ClipboardEventNotifier : public Dali::BaseObject
 {
 public:
 
-  typedef Dali::ClipboardEventNotifier::ClipboardEventSignalV2 ClipboardEventSignalV2;
+  typedef Dali::ClipboardEventNotifier::ClipboardEventSignalType ClipboardEventSignalType;
 
   // Creation
   static Dali::ClipboardEventNotifier New();
@@ -47,9 +47,9 @@ public:
   void EmitContentSelectedSignal();
 
   // Signals
-  ClipboardEventSignalV2& ContentSelectedSignal()
+  ClipboardEventSignalType& ContentSelectedSignal()
   {
-    return mContentSelectedSignalV2;
+    return mContentSelectedSignal;
   }
 
 private:
@@ -64,7 +64,7 @@ private:
 private:
 
   std::string mContent;    ///< The current selected content.
-  ClipboardEventSignalV2 mContentSelectedSignalV2;
+  ClipboardEventSignalType mContentSelectedSignal;
 
   static Dali::ClipboardEventNotifier mToolkitClipboardEventNotifier;
 
@@ -125,10 +125,10 @@ void ClipboardEventNotifier::ClearContent()
 
 void ClipboardEventNotifier::EmitContentSelectedSignal()
 {
-  if ( !mContentSelectedSignalV2.Empty() )
+  if ( !mContentSelectedSignal.Empty() )
   {
     Dali::ClipboardEventNotifier handle( this );
-    mContentSelectedSignalV2.Emit( handle );
+    mContentSelectedSignal.Emit( handle );
   }
 }
 
@@ -146,8 +146,6 @@ ClipboardEventNotifier::~ClipboardEventNotifier()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-const char* const ClipboardEventNotifier::SIGNAL_CONTENT_SELECTED( "content-selected" );
-
 ClipboardEventNotifier::ClipboardEventNotifier()
 {
 }
@@ -181,7 +179,7 @@ void ClipboardEventNotifier::EmitContentSelectedSignal()
   Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).EmitContentSelectedSignal();
 }
 
-ClipboardEventNotifier::ClipboardEventSignalV2& ClipboardEventNotifier::ContentSelectedSignal()
+ClipboardEventNotifier::ClipboardEventSignalType& ClipboardEventNotifier::ContentSelectedSignal()
 {
   return Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).ContentSelectedSignal();
 }