Revert "[Tizen] Add GetLogicalKey API in DevelKeyEvent"

This reverts commit 622e0df51d2538bb6f55abd135c43d9a3567b120.

Change-Id: I059ee7682c524cef4c53a6a6fee45ce5cf1652c6

diff --git a/dali/devel-api/CMakeLists.txt b/dali/devel-api/CMakeLists.txt
index c9c559e..0aca8ad 100644 (file)
--- 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}/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
   ${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}/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
   ${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 (file)
index 502404e..0000000
--- a/dali/devel-api/events/key-event-devel.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*\r
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- *\r
- */\r
-\r
-// INTERNAL INCLUDES\r
-#include <dali/devel-api/events/key-event-devel.h>\r
-#include <dali/internal/event/events/key-event-impl.h>\r
-\r
-namespace Dali\r
-{\r
-\r
-namespace DevelKeyEvent\r
-{\r
-\r
-std::string GetLogicalKey( KeyEvent keyEvent )\r
-{\r
-  return GetImplementation( &keyEvent )->GetLogicalKey();\r
-}\r
-\r
-} // namespace DevelKeyEvent\r
-\r
-} // namespace Dali\r
-\r

diff --git a/dali/devel-api/events/key-event-devel.h b/dali/devel-api/events/key-event-devel.h
deleted file mode 100644 (file)
index bdf1680..0000000
--- a/dali/devel-api/events/key-event-devel.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef DALI_KEY_EVENT_DEVEL_H\r
-#define DALI_KEY_EVENT_DEVEL_H\r
-\r
-/*\r
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- *\r
- */\r
-\r
-// INTERNAL INCLUDES\r
-#include <dali/public-api/events/key-event.h>\r
-\r
-namespace Dali\r
-{\r
-\r
-namespace DevelKeyEvent\r
-{\r
-\r
-/**\r
- * @brief Gets the logical key string.\r
- *\r
- * For example, when the user presses 'shift' key and '1' key together, the logical key is "exclamation".\r
- * Plus, the keyPressedName is "1", and the keyPressed is "!".\r
- *\r
- * @param[in] keyEvent The instance of KeyEvent.\r
- * @return The logical key symbol\r
- */\r
-DALI_CORE_API std::string GetLogicalKey( KeyEvent keyEvent );\r
-\r
-} // namespace DevelKeyEvent\r
-\r
-} // namespace Dali\r
-\r
-#endif // DALI_KEY_EVENT_DEVEL_H\r

diff --git a/dali/devel-api/file.list b/dali/devel-api/file.list
index 06b2fb7..bd74e49 100755 (executable)
--- 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)/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 \
   $(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_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 \
 
 devel_api_core_images_header_files = \
   $(devel_api_src_dir)/images/distance-field.h \