[Tizen] Fix -Werror=old-style-cast error 98/133598/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 13 Jun 2017 02:05:07 +0000 (11:05 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 13 Jun 2017 02:05:15 +0000 (11:05 +0900)
This reverts commit ee839f59c4e1fd369ee012bf24bd982a0a43fe15.

Change-Id: I27d970d4d107f4a06ee7153cc9cba97eba438aef

adaptors/ecore/wayland/key-grab-ecore-wl.cpp

index 85f92c3..892ba53 100755 (executable)
@@ -98,8 +98,8 @@ Dali::Vector<bool> GrabKeyList( Window window, const Dali::Vector<Dali::KEY>& da
 
   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>& da
       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;
@@ -167,8 +167,8 @@ Dali::Vector<bool> UngrabKeyList( Window window, const Dali::Vector<Dali::KEY>&
 
   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>&
       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;