From ee839f59c4e1fd369ee012bf24bd982a0a43fe15 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Tue, 13 Jun 2017 10:53:27 +0900 Subject: [PATCH] Revert "[Tizen] Fix -Werror=old-style-cast error" This reverts commit 9641fa686caba7bdfd831745fc06d36f39c37477. Change-Id: I21e4cc7bbabb8a2e9eaf1083fa3cce773e7fe6bc --- adaptors/ecore/wayland/key-grab-ecore-wl.cpp | 12 ++++++------ adaptors/tizen/accessibility-adaptor-impl-tizen.cpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/adaptors/ecore/wayland/key-grab-ecore-wl.cpp b/adaptors/ecore/wayland/key-grab-ecore-wl.cpp index 892ba53..85f92c3 100755 --- a/adaptors/ecore/wayland/key-grab-ecore-wl.cpp +++ b/adaptors/ecore/wayland/key-grab-ecore-wl.cpp @@ -98,8 +98,8 @@ Dali::Vector GrabKeyList( Window window, const Dali::Vector& da for( Dali::Vector::SizeType index = 0; index < keyCount; ++index ) { - Ecore_Wl_Window_Keygrab_Info *info = static_cast(malloc(sizeof(Ecore_Wl_Window_Keygrab_Info))); - info->key = const_cast(Dali::Internal::Adaptor::KeyLookup::GetKeyName( daliKeyVector[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] ); switch(grabModeVector[index]) { @@ -137,7 +137,7 @@ Dali::Vector GrabKeyList( Window window, const Dali::Vector& da Dali::Vector::SizeType index = 0; EINA_LIST_FOREACH(keyList, l, listData) { - if(strcmp(static_cast(data), (static_cast(listData))->key) == 0) + if(strcmp((char*)data, ((Ecore_Wl_Window_Keygrab_Info*)listData)->key) == 0) resultVector[index] = false; ++index; @@ -167,8 +167,8 @@ Dali::Vector UngrabKeyList( Window window, const Dali::Vector& for( Dali::Vector::SizeType index = 0; index < keyCount; ++index ) { - Ecore_Wl_Window_Keygrab_Info *info = static_cast(malloc(sizeof(Ecore_Wl_Window_Keygrab_Info))); - info->key = const_cast(Dali::Internal::Adaptor::KeyLookup::GetKeyName( daliKeyVector[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] ); keyList = eina_list_append(keyList, info); } @@ -186,7 +186,7 @@ Dali::Vector UngrabKeyList( Window window, const Dali::Vector& Dali::Vector::SizeType index = 0; EINA_LIST_FOREACH(keyList, l, listData) { - if(strcmp(static_cast(data), (static_cast(listData))->key) == 0) + if(strcmp((char*)data, ((Ecore_Wl_Window_Keygrab_Info*)listData)->key) == 0) resultVector[index] = false; ++index; diff --git a/adaptors/tizen/accessibility-adaptor-impl-tizen.cpp b/adaptors/tizen/accessibility-adaptor-impl-tizen.cpp index 65ba859..588cfae 100644 --- a/adaptors/tizen/accessibility-adaptor-impl-tizen.cpp +++ b/adaptors/tizen/accessibility-adaptor-impl-tizen.cpp @@ -52,7 +52,7 @@ bool GetEnabledVConf() vconf_get_bool( VCONFKEY_SETAPPL_ACCESSIBILITY_TTS, &isEnabled ); } - return static_cast(isEnabled); + return (bool)isEnabled; } #if defined(DEBUG_ENABLED) -- 2.7.4