From e7aafaf374d0c6838e76e8b7c341914e3d405c45 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Tue, 25 Jun 2019 13:35:14 +0900 Subject: [PATCH] Revert "[Tizen] Add GetLogicalKey API in DevelKeyEvent" This reverts commit 804ed8b9f3b595fea4c37717d7b9190af5c74eec. Change-Id: I311e9c0503f9d4f33e289a730b7ef570c63bddbc --- dali/devel-api/CMakeLists.txt | 2 -- dali/devel-api/events/key-event-devel.cpp | 36 ------------------------- dali/devel-api/events/key-event-devel.h | 45 ------------------------------- dali/devel-api/file.list | 4 +-- 4 files changed, 1 insertion(+), 86 deletions(-) delete mode 100644 dali/devel-api/events/key-event-devel.cpp delete mode 100644 dali/devel-api/events/key-event-devel.h diff --git a/dali/devel-api/CMakeLists.txt b/dali/devel-api/CMakeLists.txt index c9c559e..0aca8ad 100644 --- a/dali/devel-api/CMakeLists.txt +++ b/dali/devel-api/CMakeLists.txt @@ -8,7 +8,6 @@ SET( SOURCES ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/common/hash.cpp ${CMAKE_CURRENT_SOURCE_DIR}/common/stage-devel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/events/hit-test-algorithm.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/events/key-event-devel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/events/touch-data-devel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/images/distance-field.cpp ${CMAKE_CURRENT_SOURCE_DIR}/images/texture-set-image.cpp @@ -45,7 +44,6 @@ SET( DEVEL_API_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/common/stage-devel.h ${CMAKE_CURRENT_SOURCE_DIR}/events/hit-test-algorithm.h - ${CMAKE_CURRENT_SOURCE_DIR}/events/key-event-devel.h ${CMAKE_CURRENT_SOURCE_DIR}/events/touch-data-devel.h ${CMAKE_CURRENT_SOURCE_DIR}/images/distance-field.h diff --git a/dali/devel-api/events/key-event-devel.cpp b/dali/devel-api/events/key-event-devel.cpp deleted file mode 100644 index 502404e..0000000 --- a/dali/devel-api/events/key-event-devel.cpp +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2019 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// INTERNAL INCLUDES -#include -#include - -namespace Dali -{ - -namespace DevelKeyEvent -{ - -std::string GetLogicalKey( KeyEvent keyEvent ) -{ - return GetImplementation( &keyEvent )->GetLogicalKey(); -} - -} // namespace DevelKeyEvent - -} // namespace Dali - diff --git a/dali/devel-api/events/key-event-devel.h b/dali/devel-api/events/key-event-devel.h deleted file mode 100644 index bdf1680..0000000 --- a/dali/devel-api/events/key-event-devel.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef DALI_KEY_EVENT_DEVEL_H -#define DALI_KEY_EVENT_DEVEL_H - -/* - * Copyright (c) 2019 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -// INTERNAL INCLUDES -#include - -namespace Dali -{ - -namespace DevelKeyEvent -{ - -/** - * @brief Gets the logical key string. - * - * For example, when the user presses 'shift' key and '1' key together, the logical key is "exclamation". - * Plus, the keyPressedName is "1", and the keyPressed is "!". - * - * @param[in] keyEvent The instance of KeyEvent. - * @return The logical key symbol - */ -DALI_CORE_API std::string GetLogicalKey( KeyEvent keyEvent ); - -} // namespace DevelKeyEvent - -} // namespace Dali - -#endif // DALI_KEY_EVENT_DEVEL_H diff --git a/dali/devel-api/file.list b/dali/devel-api/file.list index 06b2fb7..bd74e49 100755 --- a/dali/devel-api/file.list +++ b/dali/devel-api/file.list @@ -9,7 +9,6 @@ devel_api_src_files = \ $(devel_api_src_dir)/common/stage-devel.cpp \ $(devel_api_src_dir)/events/hit-test-algorithm.cpp \ $(devel_api_src_dir)/events/touch-data-devel.cpp \ - $(devel_api_src_dir)/events/key-event-devel.cpp \ $(devel_api_src_dir)/images/distance-field.cpp \ $(devel_api_src_dir)/images/texture-set-image.cpp \ $(devel_api_src_dir)/images/nine-patch-image.cpp \ @@ -48,8 +47,7 @@ devel_api_core_common_header_files = \ devel_api_core_events_header_files = \ $(devel_api_src_dir)/events/hit-test-algorithm.h \ - $(devel_api_src_dir)/events/touch-data-devel.h \ - $(devel_api_src_dir)/events/key-event-devel.h + $(devel_api_src_dir)/events/touch-data-devel.h devel_api_core_images_header_files = \ $(devel_api_src_dir)/images/distance-field.h \ -- 2.7.4