Modify wrong surrounding text function names as overridden virtual functions

Change-Id: I3ed9012a757d3718e389fb87df475be9236e16fc

diff --git a/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp b/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp
index 222b8c2..0565bb2 100644 (file)
--- a/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp
+++ b/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp
@@ -960,7 +960,7 @@ private:
         m_send_trans.write_to_socket(client_socket);
     }
 
-    void socket_update_surrounding_text(int client, uint32 context, const String& uuid, String text, uint32 cursor) {
+    void socket_update_surrounding_text(int client, uint32 context, const String& uuid, String& text, uint32 cursor) {
         SCIM_DEBUG_MAIN(4) << __FUNCTION__ << "...\n";
         LOGD ("client id:%d\n", client);
 

diff --git a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
index 3395e8d..7fdc43f 100644 (file)
--- a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
+++ b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
@@ -2231,7 +2231,7 @@ Eina_Bool wsc_context_prediction_allow_get (WSCContextISF *wsc_ctx)
 
 void wsc_context_delete_surrounding (WSCContextISF *wsc_ctx, int offset, int len)
 {
-    LOGD ("");
+    LOGD ("offset = %d, len = %d", offset, len);
 
     if (!wsc_ctx)
         return;
@@ -4310,13 +4310,13 @@ public:
     }
 
     void
-    get_surrounding_text (int id, uint32 context_id, int maxlen_before, int maxlen_after) {
+    socket_helper_get_surrounding_text (int id, uint32 context_id, uint32 maxlen_before, uint32 maxlen_after) {
         LOGD ("client id:%d", id);
         panel_slot_get_surrounding_text (context_id, maxlen_before, maxlen_after);
     }
 
     void
-    delete_surrounding_text (int id, uint32 context_id, int offset, int len) {
+    socket_helper_delete_surrounding_text (int id, uint32 context_id, uint32 offset, uint32 len) {
         LOGD ("client id:%d", id);
         panel_slot_delete_surrounding_text (context_id, offset, len);
     }

diff --git a/ism/src/isf_panel_agent_base.cpp b/ism/src/isf_panel_agent_base.cpp
index 65c92c5..109754d 100644 (file)
--- a/ism/src/isf_panel_agent_base.cpp
+++ b/ism/src/isf_panel_agent_base.cpp
@@ -347,7 +347,7 @@ void PanelAgentBase::reload_config (int client)
     LOGW ("not implemented for %s", m_name.c_str ());
 }
 
-void PanelAgentBase::socket_update_surrounding_text (int client, uint32 context, String& uuid, String text, uint32 cursor)
+void PanelAgentBase::socket_update_surrounding_text (int client, uint32 context, const String& uuid, String& text, uint32 cursor)
 {
     LOGW ("not implemented for %s", m_name.c_str ());
 }

diff --git a/ism/src/isf_panel_agent_base.h b/ism/src/isf_panel_agent_base.h
index d3da56b..21ad30d 100644 (file)
--- a/ism/src/isf_panel_agent_base.h
+++ b/ism/src/isf_panel_agent_base.h
@@ -545,7 +545,7 @@ public:
      *
      * @return none.
      */
-    virtual void socket_update_surrounding_text (int client, uint32 context, String& uuid, String text, uint32 cursor);
+    virtual void socket_update_surrounding_text (int client, uint32 context,const String& uuid, String& text, uint32 cursor);
 
     /**
      * @brief socket_update_selection.

diff --git a/ism/src/isf_panel_agent_manager.cpp b/ism/src/isf_panel_agent_manager.cpp
index 400e3fe..bdfe6d9 100644 (file)
--- a/ism/src/isf_panel_agent_manager.cpp
+++ b/ism/src/isf_panel_agent_manager.cpp
@@ -560,7 +560,7 @@ void PanelAgentManager::reload_config (int id)
         _p->reload_config (id);
 }
 
-void PanelAgentManager::socket_update_surrounding_text (int id, uint32 context_id, String& uuid, String text, uint32 cursor)
+void PanelAgentManager::socket_update_surrounding_text (int id, uint32 context_id, const String& uuid, String& text, uint32 cursor)
 {
     PanelAgentPointer _p = m_impl->get_panel_agent_by_id (id);
 

diff --git a/ism/src/isf_panel_agent_manager.h b/ism/src/isf_panel_agent_manager.h
index 4e3e2b0..ae126b9 100644 (file)
--- a/ism/src/isf_panel_agent_manager.h
+++ b/ism/src/isf_panel_agent_manager.h
@@ -314,7 +314,7 @@ public:
     void check_option_window (int client, uint32 context, String& uuid, _OUT_ uint32& avail);
     void reset_ise_option (int client_id, uint32 context);
     void reset_helper_context (int client_id, uint32 context, const String& uuid);
-    void socket_update_surrounding_text (int client, uint32 context, String& uuid, String text, uint32 cursor);
+    void socket_update_surrounding_text (int client, uint32 context, const String& uuid, String& text, uint32 cursor);
     void socket_update_selection (int client, uint32 context, String& uuid, String text);
     void socket_get_keyboard_ise_list (int client, uint32 context, const String& uuid, std::vector<String>& list);
     void socket_get_candidate_ui (int client, uint32 context, const String& uuid,  int style,  int mode);