projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "replaced toolkit pushbutton images with shorter images." into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-clipboard-event-notifier.cpp
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
..
a9f7956
100644
(file)
--- 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
@@
-19,7
+19,7
@@
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/object/base-object.h>
#include <dali/public-api/common/dali-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
{
namespace Dali
{
@@
-34,7
+34,7
@@
class ClipboardEventNotifier : public Dali::BaseObject
{
public:
{
public:
- typedef Dali::ClipboardEventNotifier::ClipboardEventSignal
V2 ClipboardEventSignalV2
;
+ typedef Dali::ClipboardEventNotifier::ClipboardEventSignal
Type ClipboardEventSignalType
;
// Creation
static Dali::ClipboardEventNotifier New();
// Creation
static Dali::ClipboardEventNotifier New();
@@
-47,9
+47,9
@@
public:
void EmitContentSelectedSignal();
// Signals
void EmitContentSelectedSignal();
// Signals
- ClipboardEventSignal
V2
& ContentSelectedSignal()
+ ClipboardEventSignal
Type
& ContentSelectedSignal()
{
{
- return mContentSelectedSignal
V2
;
+ return mContentSelectedSignal;
}
private:
}
private:
@@
-64,7
+64,7
@@
private:
private:
std::string mContent; ///< The current selected content.
private:
std::string mContent; ///< The current selected content.
- ClipboardEventSignal
V2 mContentSelectedSignalV2
;
+ ClipboardEventSignal
Type mContentSelectedSignal
;
static Dali::ClipboardEventNotifier mToolkitClipboardEventNotifier;
static Dali::ClipboardEventNotifier mToolkitClipboardEventNotifier;
@@
-125,10
+125,10
@@
void ClipboardEventNotifier::ClearContent()
void ClipboardEventNotifier::EmitContentSelectedSignal()
{
void ClipboardEventNotifier::EmitContentSelectedSignal()
{
- if ( !mContentSelectedSignal
V2
.Empty() )
+ if ( !mContentSelectedSignal.Empty() )
{
Dali::ClipboardEventNotifier handle( this );
{
Dali::ClipboardEventNotifier handle( this );
- mContentSelectedSignal
V2
.Emit( handle );
+ mContentSelectedSignal.Emit( handle );
}
}
}
}
@@
-146,8
+146,6
@@
ClipboardEventNotifier::~ClipboardEventNotifier()
////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
-const char* const ClipboardEventNotifier::SIGNAL_CONTENT_SELECTED( "content-selected" );
-
ClipboardEventNotifier::ClipboardEventNotifier()
{
}
ClipboardEventNotifier::ClipboardEventNotifier()
{
}
@@
-181,7
+179,7
@@
void ClipboardEventNotifier::EmitContentSelectedSignal()
Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).EmitContentSelectedSignal();
}
Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).EmitContentSelectedSignal();
}
-ClipboardEventNotifier::ClipboardEventSignal
V2
& ClipboardEventNotifier::ContentSelectedSignal()
+ClipboardEventNotifier::ClipboardEventSignal
Type
& ClipboardEventNotifier::ContentSelectedSignal()
{
return Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).ContentSelectedSignal();
}
{
return Internal::Adaptor::ClipboardEventNotifier::GetImplementation(*this).ContentSelectedSignal();
}