[Tizen] Fix -Werror=old-style-cast error

[platform/core/uifw/dali-adaptor.git] / adaptors / ecore / wayland / key-grab-ecore-wl.cpp

diff --git a/adaptors/ecore/wayland/key-grab-ecore-wl.cpp b/adaptors/ecore/wayland/key-grab-ecore-wl.cpp
index 12ad210..892ba53 100755 (executable)
--- a/adaptors/ecore/wayland/key-grab-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/key-grab-ecore-wl.cpp
@@ -82,7 +82,7 @@ bool UngrabKey( Window window, Dali::KEY daliKey )
                                       0, 0 );
 }
 
-Dali::Vector<bool> GrabKeyList( Window window, const Dali::Vector<Dali::KEY> daliKeyVector, const Dali::Vector<KeyGrabMode> grabModeVector)
+Dali::Vector<bool> GrabKeyList( Window window, const Dali::Vector<Dali::KEY>& daliKeyVector, const Dali::Vector<KeyGrabMode>& grabModeVector)
 {
   Dali::Vector<bool> resultVector;
   Eina_List *keyList = NULL, *grabList = NULL, *l = NULL, *m = NULL;
@@ -98,8 +98,8 @@ Dali::Vector<bool> GrabKeyList( Window window, const Dali::Vector<Dali::KEY> dal
 
   for( Dali::Vector<float>::SizeType index = 0; index < keyCount; ++index )
   {
-    Ecore_Wl_Window_Keygrab_Info *info = (Ecore_Wl_Window_Keygrab_Info*)malloc(sizeof(Ecore_Wl_Window_Keygrab_Info));
-    info->key = (char*)Dali::Internal::Adaptor::KeyLookup::GetKeyName( daliKeyVector[index] );
+    Ecore_Wl_Window_Keygrab_Info *info = static_cast<Ecore_Wl_Window_Keygrab_Info*>(malloc(sizeof(Ecore_Wl_Window_Keygrab_Info)));
+    info->key = const_cast<char*>(Dali::Internal::Adaptor::KeyLookup::GetKeyName( daliKeyVector[index] ));
 
     switch(grabModeVector[index])
     {
@@ -137,7 +137,7 @@ Dali::Vector<bool> GrabKeyList( Window window, const Dali::Vector<Dali::KEY> dal
       Dali::Vector<float>::SizeType index = 0;
       EINA_LIST_FOREACH(keyList, l, listData)
       {
-        if(strcmp((char*)data, ((Ecore_Wl_Window_Keygrab_Info*)listData)->key) == 0)
+        if(strcmp(static_cast<char*>(data), (static_cast<Ecore_Wl_Window_Keygrab_Info*>(listData))->key) == 0)
           resultVector[index] = false;
 
         ++index;
@@ -152,7 +152,7 @@ Dali::Vector<bool> GrabKeyList( Window window, const Dali::Vector<Dali::KEY> dal
   return resultVector;
 }
 
-Dali::Vector<bool> UngrabKeyList( Window window, const Dali::Vector<Dali::KEY> daliKeyVector )
+Dali::Vector<bool> UngrabKeyList( Window window, const Dali::Vector<Dali::KEY>& daliKeyVector )
 {
   Dali::Vector<bool> resultVector;
   Eina_List *keyList = NULL, *ungrabList = NULL, *l = NULL, *m = NULL;
@@ -167,8 +167,8 @@ Dali::Vector<bool> UngrabKeyList( Window window, const Dali::Vector<Dali::KEY> d
 
   for( Dali::Vector<float>::SizeType index = 0; index < keyCount; ++index )
   {
-    Ecore_Wl_Window_Keygrab_Info *info = (Ecore_Wl_Window_Keygrab_Info*)malloc(sizeof(Ecore_Wl_Window_Keygrab_Info));
-    info->key = (char*)Dali::Internal::Adaptor::KeyLookup::GetKeyName( daliKeyVector[index] );
+    Ecore_Wl_Window_Keygrab_Info *info = static_cast<Ecore_Wl_Window_Keygrab_Info*>(malloc(sizeof(Ecore_Wl_Window_Keygrab_Info)));
+    info->key = const_cast<char*>(Dali::Internal::Adaptor::KeyLookup::GetKeyName( daliKeyVector[index] ));
     keyList = eina_list_append(keyList, info);
   }
 
@@ -186,7 +186,7 @@ Dali::Vector<bool> UngrabKeyList( Window window, const Dali::Vector<Dali::KEY> d
       Dali::Vector<float>::SizeType index = 0;
       EINA_LIST_FOREACH(keyList, l, listData)
       {
-        if(strcmp((char*)data, ((Ecore_Wl_Window_Keygrab_Info*)listData)->key) == 0)
+        if(strcmp(static_cast<char*>(data), (static_cast<Ecore_Wl_Window_Keygrab_Info*>(listData))->key) == 0)
           resultVector[index] = false;
 
         ++index;