X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftoolkit-clipboard-event-notifier.h;h=282a0c05de11a401130a3415a688bf96703ca348;hp=c7dcc08274ba4eb53241b16f1f4f57e9e2112ac6;hb=b694e7e2ae624e206e1548b1a863c554eb9cd4d7;hpb=fca68202d695c569739819fb8d58b9808b8decb5

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.h
index c7dcc08..282a0c0 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-clipboard-event-notifier.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_TOOLKIT_CLIPBOARD_EVENT_NOTIFIER_H__
-#define __DALI_TOOLKIT_CLIPBOARD_EVENT_NOTIFIER_H__
+#ifndef DALI_TOOLKIT_CLIPBOARD_EVENT_NOTIFIER_H
+#define DALI_TOOLKIT_CLIPBOARD_EVENT_NOTIFIER_H
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -22,7 +22,10 @@
 #include <string>
 
 // PUBLIC INCLUDES
-#include <dali/public-api/adaptor-framework/clipboard-event-notifier.h>
+#define DALI_CLIPBOARD_EVENT_NOTIFIER_H
+#include <dali/public-api/object/base-handle.h>
+#include <dali/public-api/signals/dali-signal.h>
+
 
 namespace Dali
 {
@@ -35,35 +38,25 @@ class ClipboardEventNotifier;
 }
 }
 
-/**
- * This creates a stubbed ClipboardEventNotifier so that internal Toolkit Adaptor calls work.
- */
-class ToolkitClipboardEventNotifier
+class ClipboardEventNotifier : public BaseHandle
 {
-public: // Constants
-
-public: // Construction & Destruction
-
-  ToolkitClipboardEventNotifier();
-  ~ToolkitClipboardEventNotifier();
-
-public: // Getters
-
-  ClipboardEventNotifier GetClipboardEventNotifier();
-
-public: // Signal Emissions
+public:
+  typedef Signal< void ( ClipboardEventNotifier& ) > ClipboardEventSignalType;
 
-  ClipboardEventNotifier::ClipboardEventSignalV2& SignalContentSelected();
+  ClipboardEventNotifier();
+  static ClipboardEventNotifier Get();
+  ~ClipboardEventNotifier();
 
-public: // TEST FUNCTIONS
+  const std::string& GetContent() const;
+  void SetContent( const std::string& content );
+  void ClearContent();
 
-private:
+  void EmitContentSelectedSignal();
+  ClipboardEventSignalType& ContentSelectedSignal();
 
-  Internal::Adaptor::ClipboardEventNotifier* mClipboardEventNotifierStub;
-  friend class Internal::Adaptor::ClipboardEventNotifier;
-  ClipboardEventNotifier mClipboardEventNotifier; // Hold a handle ourselves.
+  ClipboardEventNotifier( Internal::Adaptor::ClipboardEventNotifier* notifier );
 };
 
 } // namespace Dali
 
-#endif // __DALI_TOOLKIT_TOOLKIT_CLIPBOARD_EVENT_NOTIFIER_H__
+#endif // DALI_TOOLKIT_TOOLKIT_CLIPBOARD_EVENT_NOTIFIER_H