Merge pull request xbmc#23938 from enen92/wayland_input_deadcode

ksooo · Oct 15, 2023 · 7529c5b · 7529c5b
2 parents e620c50 + c94e5df
commit 7529c5b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 21 deletions.
diff --git a/xbmc/windowing/wayland/XkbcommonKeymap.cpp b/xbmc/windowing/wayland/XkbcommonKeymap.cpp
@@ -224,26 +224,6 @@ std::unique_ptr<CXkbcommonKeymap> CXkbcommonContext::KeymapFromString(std::strin
   return std::make_unique<CXkbcommonKeymap>(std::move(xkbKeymap));
 }
 
-std::unique_ptr<CXkbcommonKeymap> CXkbcommonContext::KeymapFromNames(const std::string& rules, const std::string& model, const std::string& layout, const std::string& variant, const std::string& options)
-{
-  xkb_rule_names names = {
-    rules.c_str(),
-    model.c_str(),
-    layout.c_str(),
-    variant.c_str(),
-    options.c_str()
-  };
-
-  std::unique_ptr<xkb_keymap, CXkbcommonKeymap::XkbKeymapDeleter> keymap{xkb_keymap_new_from_names(m_context.get(), &names, XKB_KEYMAP_COMPILE_NO_FLAGS), CXkbcommonKeymap::XkbKeymapDeleter()};
-
-  if (!keymap)
-  {
-    throw std::runtime_error("Failed to compile keymap");
-  }
-
-  return std::make_unique<CXkbcommonKeymap>(std::move(keymap));
-}
-
 std::unique_ptr<xkb_state, CXkbcommonKeymap::XkbStateDeleter> CXkbcommonKeymap::CreateXkbStateFromKeymap(xkb_keymap* keymap)
 {
   std::unique_ptr<xkb_state, XkbStateDeleter> state{xkb_state_new(keymap), XkbStateDeleter()};

diff --git a/xbmc/windowing/wayland/XkbcommonKeymap.h b/xbmc/windowing/wayland/XkbcommonKeymap.h
@@ -127,7 +127,6 @@ class CXkbcommonContext
    * from this function.
    */
   std::unique_ptr<CXkbcommonKeymap> KeymapFromString(std::string const& keymap);
-  std::unique_ptr<CXkbcommonKeymap> KeymapFromNames(const std::string &rules, const std::string &model, const std::string &layout, const std::string &variant, const std::string &options);
 
 private:
   struct XkbContextDeleter