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 "Refactored ControlRenderer so that derived classes are responsible for the...
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-imf-manager.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp
index
986346e
..
e35ce05
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-imf-manager.cpp
@@
-19,10
+19,8
@@
#include "toolkit-imf-manager.h"
// EXTERNAL INCLUDES
#include "toolkit-imf-manager.h"
// EXTERNAL INCLUDES
-#include <boost/bind.hpp>
#include <dali/public-api/object/base-object.h>
#include <dali/integration-api/debug.h>
#include <dali/public-api/object/base-object.h>
#include <dali/integration-api/debug.h>
-#include <dali/integration-api/events/key-event-integ.h>
namespace Dali
{
namespace Dali
{
@@
-36,8
+34,8
@@
class RenderSurface;
class ImfManager : public Dali::BaseObject
{
public:
class ImfManager : public Dali::BaseObject
{
public:
- typedef Dali::ImfManager::ImfManagerSignal
V2 ImfManagerSignalV2
;
- typedef Dali::ImfManager::ImfEventSignal
V2 ImfEventSignalV2
;
+ typedef Dali::ImfManager::ImfManagerSignal
Type ImfManagerSignalType
;
+ typedef Dali::ImfManager::ImfEventSignal
Type ImfEventSignalType
;
public:
static Dali::ImfManager Get();
public:
static Dali::ImfManager Get();
@@
-50,16
+48,16
@@
public:
void Reset();
bool RestoreAfterFocusLost() const;
void Reset();
bool RestoreAfterFocusLost() const;
- void SetRestoreAferFocusLost( bool toggle );
+ void SetRestoreAf
t
erFocusLost( bool toggle );
void NotifyCursorPosition();
void NotifyCursorPosition();
- int GetCursorPosition();
void SetCursorPosition( unsigned int cursorPosition );
void SetCursorPosition( unsigned int cursorPosition );
- void SetSurroundingText( std::string text );
- std::string GetSurroundingText();
+ unsigned int GetCursorPosition() const;
+ void SetSurroundingText( const std::string& text );
+ const std::string& GetSurroundingText() const;
public: // Signals
public: // Signals
- ImfManagerSignal
V2& ActivatedSignal() { return mActivatedSignalV2
; }
- ImfEventSignal
V2& EventReceivedSignal() { return mEventSignalV2
; }
+ ImfManagerSignal
Type& ActivatedSignal() { return mActivatedSignal
; }
+ ImfEventSignal
Type& EventReceivedSignal() { return mEventSignal
; }
protected:
virtual ~ImfManager();
protected:
virtual ~ImfManager();
@@
-79,9
+77,8
@@
private:
bool mRestoreAfterFocusLost:1; ///< Whether the keyboard needs to be restored (activated ) after focus regained.
bool mIdleCallbackConnected:1; ///< Whether the idle callback is already connected.
bool mRestoreAfterFocusLost:1; ///< Whether the keyboard needs to be restored (activated ) after focus regained.
bool mIdleCallbackConnected:1; ///< Whether the idle callback is already connected.
- std::vector<Dali::Integration::KeyEvent> mKeyEvents; ///< Stores key events to be sent from idle call-back.
- ImfManagerSignalV2 mActivatedSignalV2;
- ImfEventSignalV2 mEventSignalV2;
+ ImfManagerSignalType mActivatedSignal;
+ ImfEventSignalType mEventSignal;
static Dali::ImfManager mToolkitImfManager;
static Dali::ImfManager mToolkitImfManager;
@@
-121,10
+118,9
@@
Dali::ImfManager ImfManager::Get()
ImfManager::ImfManager( /*Ecore_X_Window ecoreXwin*/ )
: mIMFCursorPosition( 0 ),
ImfManager::ImfManager( /*Ecore_X_Window ecoreXwin*/ )
: mIMFCursorPosition( 0 ),
- mSurroundingText(
""
),
+ mSurroundingText(),
mRestoreAfterFocusLost( false ),
mRestoreAfterFocusLost( false ),
- mIdleCallbackConnected( false ),
- mKeyEvents()
+ mIdleCallbackConnected( false )
{
CreateContext( /*ecoreXwin*/ );
ConnectCallbacks();
{
CreateContext( /*ecoreXwin*/ );
ConnectCallbacks();
@@
-170,7
+166,7
@@
bool ImfManager::RestoreAfterFocusLost() const
return mRestoreAfterFocusLost;
}
return mRestoreAfterFocusLost;
}
-void ImfManager::SetRestoreAferFocusLost( bool toggle )
+void ImfManager::SetRestoreAf
t
erFocusLost( bool toggle )
{
mRestoreAfterFocusLost = toggle;
}
{
mRestoreAfterFocusLost = toggle;
}
@@
-179,22
+175,22
@@
void ImfManager::NotifyCursorPosition()
{
}
{
}
-
int ImfManager::GetCursorPosition(
)
+
void ImfManager::SetCursorPosition( unsigned int cursorPosition
)
{
{
-
return mIMFCursorPosition
;
+
mIMFCursorPosition = static_cast< int >( cursorPosition )
;
}
}
-void ImfManager::SetCursorPosition( unsigned int cursorPosition )
+unsigned int ImfManager::GetCursorPosition() const
{
{
-
mIMFCursorPosition = ( int )cursorPosition
;
+
return static_cast<unsigned int>( mIMFCursorPosition )
;
}
}
-void ImfManager::SetSurroundingText(
std::string
text )
+void ImfManager::SetSurroundingText(
const std::string&
text )
{
mSurroundingText = text;
}
{
mSurroundingText = text;
}
-std::string ImfManager::GetSurroundingText()
+const std::string& ImfManager::GetSurroundingText() const
{
return mSurroundingText;
}
{
return mSurroundingText;
}
@@
-221,11
+217,6
@@
ImfManager ImfManager::Get()
return Internal::Adaptor::ImfManager::Get();
}
return Internal::Adaptor::ImfManager::Get();
}
-ImfContext ImfManager::GetContext()
-{
- return NULL;
-}
-
void ImfManager::Activate()
{
Internal::Adaptor::ImfManager::GetImplementation(*this).Activate();
void ImfManager::Activate()
{
Internal::Adaptor::ImfManager::GetImplementation(*this).Activate();
@@
-241,9
+232,9
@@
bool ImfManager::RestoreAfterFocusLost() const
return Internal::Adaptor::ImfManager::GetImplementation(*this).RestoreAfterFocusLost();
}
return Internal::Adaptor::ImfManager::GetImplementation(*this).RestoreAfterFocusLost();
}
-void ImfManager::SetRestoreAferFocusLost( bool toggle )
+void ImfManager::SetRestoreAf
t
erFocusLost( bool toggle )
{
{
- Internal::Adaptor::ImfManager::GetImplementation(*this).SetRestoreAferFocusLost( toggle );
+ Internal::Adaptor::ImfManager::GetImplementation(*this).SetRestoreAf
t
erFocusLost( toggle );
}
void ImfManager::Reset()
}
void ImfManager::Reset()
@@
-261,27
+252,27
@@
void ImfManager::SetCursorPosition( unsigned int SetCursorPosition )
Internal::Adaptor::ImfManager::GetImplementation(*this).SetCursorPosition( SetCursorPosition );
}
Internal::Adaptor::ImfManager::GetImplementation(*this).SetCursorPosition( SetCursorPosition );
}
-int ImfManager::GetCursorPosition()
+unsigned int ImfManager::GetCursorPosition() const
{
return Internal::Adaptor::ImfManager::GetImplementation(*this).GetCursorPosition();
}
{
return Internal::Adaptor::ImfManager::GetImplementation(*this).GetCursorPosition();
}
-void ImfManager::SetSurroundingText(
std::string
text )
+void ImfManager::SetSurroundingText(
const std::string&
text )
{
Internal::Adaptor::ImfManager::GetImplementation(*this).SetSurroundingText( text );
}
{
Internal::Adaptor::ImfManager::GetImplementation(*this).SetSurroundingText( text );
}
-std::string ImfManager::GetSurroundingText()
+const std::string& ImfManager::GetSurroundingText() const
{
return Internal::Adaptor::ImfManager::GetImplementation(*this).GetSurroundingText();
}
{
return Internal::Adaptor::ImfManager::GetImplementation(*this).GetSurroundingText();
}
-ImfManager::ImfManagerSignal
V2
& ImfManager::ActivatedSignal()
+ImfManager::ImfManagerSignal
Type
& ImfManager::ActivatedSignal()
{
return Internal::Adaptor::ImfManager::GetImplementation(*this).ActivatedSignal();
}
{
return Internal::Adaptor::ImfManager::GetImplementation(*this).ActivatedSignal();
}
-ImfManager::ImfEventSignal
V2
& ImfManager::EventReceivedSignal()
+ImfManager::ImfEventSignal
Type
& ImfManager::EventReceivedSignal()
{
return Internal::Adaptor::ImfManager::GetImplementation(*this).EventReceivedSignal();
}
{
return Internal::Adaptor::ImfManager::GetImplementation(*this).EventReceivedSignal();
}