Merge "Added FileReader and FileWriter classes to wrap FileCloser" into devel/master

[platform/core/uifw/dali-adaptor.git] / adaptors / common / virtual-keyboard-impl.h

diff --git a/adaptors/common/virtual-keyboard-impl.h b/adaptors/common/virtual-keyboard-impl.h
index 671f399..b0bc55b 100644 (file)
--- a/adaptors/common/virtual-keyboard-impl.h
+++ b/adaptors/common/virtual-keyboard-impl.h
@@ -2,7 +2,7 @@
 #define __DALI_INTERNAL_VIRTUAL_KEYBOARD_H__
 
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 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.
@@ -18,9 +18,6 @@
  *
  */
 
-// EXTERNAL INCLUDES
-#include <Ecore_IMF.h>
-
 // INTERNAL INCLUDES
 #include <virtual-keyboard.h>
 
@@ -40,20 +37,6 @@ namespace VirtualKeyboard
 {
 
 /**
- * Connect the virtual keyboard callbacks.
- * To get the virtual keyboard callbacks then you have to connect these callback.
- * If you don't connect callbacks, you can't get virtual keyboard signals.
- * The signals are StatusChangedSignal, ResizedSignal and LanguageChangedSignal.
- */
-void ConnectCallbacks( Ecore_IMF_Context *imfContext );
-
-/**
- * Disconnect the virtual keyboard callbacks.
- * The signals are StatusChangedSignal, ResizedSignal and LanguageChangedSignal.
- */
-void DisconnectCallbacks( Ecore_IMF_Context *imfContext );
-
-/**
  * @copydoc Dali::VirtualKeyboard::Show()
  */
 void Show();
@@ -69,14 +52,19 @@ void Hide();
 bool IsVisible();
 
 /**
+ * @copydoc Dali::VirtualKeyboard::ApplySettings()
+ */
+void ApplySettings( const Property::Map& settingsMap );
+
+/**
  * @copydoc Dali::VirtualKeyboard::SetReturnKeyType()
  */
-void SetReturnKeyType( Dali::VirtualKeyboard::ReturnKeyType type );
+void SetReturnKeyType( const Dali::InputMethod::ActionButton type );
 
 /**
  * @copydoc Dali::VirtualKeyboard::GetReturnKeyType()
  */
-Dali::VirtualKeyboard::ReturnKeyType GetReturnKeyType();
+Dali::InputMethod::ActionButton GetReturnKeyType();
 
 /**
  * @copydoc Dali::VirtualKeyboard::EnablePrediction()