From f306ddb78b6ff14d0c747383605203a605221014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=BCseyin=20ASLIT=C3=9CRK?= Date: Thu, 4 Jun 2020 14:25:39 +0300 Subject: [PATCH] Userland: Remove keymap app from system We have new KeyboardSettings application and it supports both GUI and CLI. --- Userland/CMakeLists.txt | 1 - Userland/keymap.cpp | 49 ----------------------------------------- 2 files changed, 50 deletions(-) delete mode 100644 Userland/keymap.cpp diff --git a/Userland/CMakeLists.txt b/Userland/CMakeLists.txt index 797900c1a2..5ea7c15358 100644 --- a/Userland/CMakeLists.txt +++ b/Userland/CMakeLists.txt @@ -14,7 +14,6 @@ target_link_libraries(disasm LibX86) target_link_libraries(functrace LibDebug LibX86) target_link_libraries(html LibWeb) target_link_libraries(ht LibWeb) -target_link_libraries(keymap LibKeyboard) target_link_libraries(lspci LibPCIDB) target_link_libraries(man LibMarkdown) target_link_libraries(md LibMarkdown) diff --git a/Userland/keymap.cpp b/Userland/keymap.cpp deleted file mode 100644 index 6c2eefeefd..0000000000 --- a/Userland/keymap.cpp +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include - -int main(int argc, char** argv) -{ - if (argc != 2) { - fprintf(stderr, "usage: keymap \n"); - return 0; - } - - String filename = argv[1]; - - Keyboard::CharacterMap character_map(filename); - int ret_val = character_map.set_system_map(); - - if (ret_val == -EPERM) - fprintf(stderr, "Permission denied.\n"); - - if (ret_val == 0) - fprintf(stderr, "New keymap loaded from \"%s\".\n", filename.characters()); - - return ret_val; -}