X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-clipboard-event-notifier.cpp;h=cfc2a96ee73915d5285569271fda5933cd62dc8e;hb=b5fdcb56243dd488c2e0cbc955eb56a48188fffe;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..cfc2a96 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
 {
@@ -30,15 +30,15 @@ namespace Internal
 namespace Adaptor
 {
 
-class ClipboardEventNotifier : public Dali::BaseObject
+class TextClipboardEventNotifier : public Dali::BaseObject
 {
 public:
 
-  typedef Dali::ClipboardEventNotifier::ClipboardEventSignalV2 ClipboardEventSignalV2;
+  typedef Dali::TextClipboardEventNotifier::TextClipboardEventSignalType TextClipboardEventSignalType;
 
   // Creation
-  static Dali::ClipboardEventNotifier New();
-  static Dali::ClipboardEventNotifier Get();
+  static Dali::TextClipboardEventNotifier New();
+  static Dali::TextClipboardEventNotifier Get();
 
   // Public API
   const std::string& GetContent() const;
@@ -47,97 +47,97 @@ public:
   void EmitContentSelectedSignal();
 
   // Signals
-  ClipboardEventSignalV2& ContentSelectedSignal()
+  TextClipboardEventSignalType& ContentSelectedSignal()
   {
-    return mContentSelectedSignalV2;
+    return mContentSelectedSignal;
   }
 
 private:
   // Construction & Destruction
-  ClipboardEventNotifier();
-  virtual ~ClipboardEventNotifier();
+  TextClipboardEventNotifier();
+  virtual ~TextClipboardEventNotifier();
 
   // Undefined
-  ClipboardEventNotifier( const ClipboardEventNotifier& );
-  ClipboardEventNotifier& operator=( ClipboardEventNotifier& );
+  TextClipboardEventNotifier( const TextClipboardEventNotifier& );
+  TextClipboardEventNotifier& operator=( TextClipboardEventNotifier& );
 
 private:
 
   std::string mContent;    ///< The current selected content.
-  ClipboardEventSignalV2 mContentSelectedSignalV2;
+  TextClipboardEventSignalType mContentSelectedSignal;
 
-  static Dali::ClipboardEventNotifier mToolkitClipboardEventNotifier;
+  static Dali::TextClipboardEventNotifier mToolkitClipboardEventNotifier;
 
 public:
 
   // Helpers for public-api forwarding methods
 
-  inline static Internal::Adaptor::ClipboardEventNotifier& GetImplementation(Dali::ClipboardEventNotifier& detector)
+  inline static Internal::Adaptor::TextClipboardEventNotifier& GetImplementation(Dali::TextClipboardEventNotifier& detector)
   {
-    DALI_ASSERT_ALWAYS( detector && "ClipboardEventNotifier handle is empty" );
+    DALI_ASSERT_ALWAYS( detector && "TextClipboardEventNotifier handle is empty" );
 
     BaseObject& handle = detector.GetBaseObject();
 
-    return static_cast<Internal::Adaptor::ClipboardEventNotifier&>(handle);
+    return static_cast<Internal::Adaptor::TextClipboardEventNotifier&>(handle);
   }
 
-  inline static const Internal::Adaptor::ClipboardEventNotifier& GetImplementation(const Dali::ClipboardEventNotifier& detector)
+  inline static const Internal::Adaptor::TextClipboardEventNotifier& GetImplementation(const Dali::TextClipboardEventNotifier& detector)
   {
-    DALI_ASSERT_ALWAYS( detector && "ClipboardEventNotifier handle is empty" );
+    DALI_ASSERT_ALWAYS( detector && "TextClipboardEventNotifier handle is empty" );
 
     const BaseObject& handle = detector.GetBaseObject();
 
-    return static_cast<const Internal::Adaptor::ClipboardEventNotifier&>(handle);
+    return static_cast<const Internal::Adaptor::TextClipboardEventNotifier&>(handle);
   }
 
 };
 
-Dali::ClipboardEventNotifier ClipboardEventNotifier::mToolkitClipboardEventNotifier;
+Dali::TextClipboardEventNotifier TextClipboardEventNotifier::mToolkitClipboardEventNotifier;
 
-Dali::ClipboardEventNotifier ClipboardEventNotifier::New()
+Dali::TextClipboardEventNotifier TextClipboardEventNotifier::New()
 {
   return Get();
 }
 
-Dali::ClipboardEventNotifier ClipboardEventNotifier::Get()
+Dali::TextClipboardEventNotifier TextClipboardEventNotifier::Get()
 {
   if ( !mToolkitClipboardEventNotifier )
   {
-    mToolkitClipboardEventNotifier = Dali::ClipboardEventNotifier( new ClipboardEventNotifier );
+    mToolkitClipboardEventNotifier = Dali::TextClipboardEventNotifier( new TextClipboardEventNotifier );
   }
   return mToolkitClipboardEventNotifier;
 }
 
-const std::string& ClipboardEventNotifier::GetContent() const
+const std::string& TextClipboardEventNotifier::GetContent() const
 {
   return mContent;
 }
 
-void ClipboardEventNotifier::SetContent( const std::string& content )
+void TextClipboardEventNotifier::SetContent( const std::string& content )
 {
   mContent = content;
 }
 
-void ClipboardEventNotifier::ClearContent()
+void TextClipboardEventNotifier::ClearContent()
 {
   mContent.clear();
 }
 
-void ClipboardEventNotifier::EmitContentSelectedSignal()
+void TextClipboardEventNotifier::EmitContentSelectedSignal()
 {
-  if ( !mContentSelectedSignalV2.Empty() )
+  if ( !mContentSelectedSignal.Empty() )
   {
-    Dali::ClipboardEventNotifier handle( this );
-    mContentSelectedSignalV2.Emit( handle );
+    Dali::TextClipboardEventNotifier handle( this );
+    mContentSelectedSignal.Emit( handle );
   }
 }
 
-ClipboardEventNotifier::ClipboardEventNotifier()
+TextClipboardEventNotifier::TextClipboardEventNotifier()
 : mContent()
 {
 }
 
-ClipboardEventNotifier::~ClipboardEventNotifier()
+TextClipboardEventNotifier::~TextClipboardEventNotifier()
 {
 }
 
@@ -146,47 +146,45 @@ ClipboardEventNotifier::~ClipboardEventNotifier()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-const char* const ClipboardEventNotifier::SIGNAL_CONTENT_SELECTED( "content-selected" );
-
-ClipboardEventNotifier::ClipboardEventNotifier()
+TextClipboardEventNotifier::TextClipboardEventNotifier()
 {
 }
 
-ClipboardEventNotifier ClipboardEventNotifier::Get()
+TextClipboardEventNotifier TextClipboardEventNotifier::Get()
 {
-  return Internal::Adaptor::ClipboardEventNotifier::Get();
+  return Internal::Adaptor::TextClipboardEventNotifier::Get();
 }
 
-ClipboardEventNotifier::~ClipboardEventNotifier()
+TextClipboardEventNotifier::~TextClipboardEventNotifier()
 {
 }
 
-const std::string& ClipboardEventNotifier::GetContent() const
+const std::string& TextClipboardEventNotifier::GetContent() const
 {
-  return Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).GetContent();
+  return Internal::Adaptor::TextClipboardEventNotifier::GetImplementation(*this).GetContent();
 }
 
-void ClipboardEventNotifier::SetContent( const std::string& content )
+void TextClipboardEventNotifier::SetContent( const std::string& content )
 {
-  Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).SetContent(content);
+  Internal::Adaptor::TextClipboardEventNotifier::GetImplementation(*this).SetContent(content);
 }
 
-void ClipboardEventNotifier::ClearContent()
+void TextClipboardEventNotifier::ClearContent()
 {
-  Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).ClearContent();
+  Internal::Adaptor::TextClipboardEventNotifier::GetImplementation(*this).ClearContent();
 }
 
-void ClipboardEventNotifier::EmitContentSelectedSignal()
+void TextClipboardEventNotifier::EmitContentSelectedSignal()
 {
-  Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).EmitContentSelectedSignal();
+  Internal::Adaptor::TextClipboardEventNotifier::GetImplementation(*this).EmitContentSelectedSignal();
 }
 
-ClipboardEventNotifier::ClipboardEventSignalV2& ClipboardEventNotifier::ContentSelectedSignal()
+TextClipboardEventNotifier::TextClipboardEventSignalType& TextClipboardEventNotifier::ContentSelectedSignal()
 {
-  return Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).ContentSelectedSignal();
+  return Internal::Adaptor::TextClipboardEventNotifier::GetImplementation(*this).ContentSelectedSignal();
 }
 
-ClipboardEventNotifier::ClipboardEventNotifier( Internal::Adaptor::ClipboardEventNotifier* notifier )
+TextClipboardEventNotifier::TextClipboardEventNotifier( Internal::Adaptor::TextClipboardEventNotifier* notifier )
 : BaseHandle( notifier )
 {
 }