From cc813f016e3db393cc43f5d08413a28b8ef29694 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Fri, 31 Jul 2026 07:56:36 -0400 Subject: [PATCH] chore: rename x11layoutsparser -> xkblayoutsparser --- src/lib/deskflow/CMakeLists.txt | 4 ++-- src/lib/deskflow/unix/AppUtilUnix.cpp | 6 +++--- ...X11LayoutsParser.cpp => XkbLayoutsParser.cpp} | 16 ++++++++-------- .../{X11LayoutsParser.h => XkbLayoutsParser.h} | 4 ++-- src/unittests/deskflow/CMakeLists.txt | 4 ++-- ...tParserTests.cpp => XkbLayoutParserTests.cpp} | 14 +++++++------- ...ayoutParserTests.h => XkbLayoutParserTests.h} | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) rename src/lib/deskflow/unix/{X11LayoutsParser.cpp => XkbLayoutsParser.cpp} (92%) rename src/lib/deskflow/unix/{X11LayoutsParser.h => XkbLayoutsParser.h} (93%) rename src/unittests/deskflow/{X11LayoutParserTests.cpp => XkbLayoutParserTests.cpp} (63%) rename src/unittests/deskflow/{X11LayoutParserTests.h => XkbLayoutParserTests.h} (90%) diff --git a/src/lib/deskflow/CMakeLists.txt b/src/lib/deskflow/CMakeLists.txt index 63f7101e8..d248df539 100644 --- a/src/lib/deskflow/CMakeLists.txt +++ b/src/lib/deskflow/CMakeLists.txt @@ -19,8 +19,8 @@ elseif(UNIX) unix/DeskflowXkbKeyboard.cpp unix/DeskflowXkbKeyboard.h unix/ISO639Table.h - unix/X11LayoutsParser.cpp - unix/X11LayoutsParser.h + unix/XkbLayoutsParser.cpp + unix/XkbLayoutsParser.h ) endif() diff --git a/src/lib/deskflow/unix/AppUtilUnix.cpp b/src/lib/deskflow/unix/AppUtilUnix.cpp index 80bef0d67..15cd7ac50 100644 --- a/src/lib/deskflow/unix/AppUtilUnix.cpp +++ b/src/lib/deskflow/unix/AppUtilUnix.cpp @@ -12,8 +12,8 @@ #include "common/PlatformInfo.h" #if WINAPI_XWINDOWS -#include "deskflow/unix/X11LayoutsParser.h" #include +#include #elif defined(Q_OS_MAC) #include #include @@ -44,7 +44,7 @@ std::vector AppUtilUnix::getKeyboardLayoutList() std::vector layoutLangCodes; #if WINAPI_XWINDOWS - layoutLangCodes = X11LayoutsParser::getX11LanguageList(); + layoutLangCodes = XkbLayoutsParser::getXkbLanguageList(); #elif defined(Q_OS_MAC) CFStringRef keys[] = {kTISPropertyInputSourceCategory}; @@ -140,7 +140,7 @@ std::string AppUtilUnix::getCurrentLanguageCode() XFree(kbdDescr); XCloseDisplay(display); - result = X11LayoutsParser::convertLayoutToISO(result); + result = XkbLayoutsParser::convertLayoutToISO(result); #elif defined(Q_OS_MAC) AutoTISInputSourceRef source(nullptr, CFRelease); diff --git a/src/lib/deskflow/unix/X11LayoutsParser.cpp b/src/lib/deskflow/unix/XkbLayoutsParser.cpp similarity index 92% rename from src/lib/deskflow/unix/X11LayoutsParser.cpp rename to src/lib/deskflow/unix/XkbLayoutsParser.cpp index 237fd78a0..18fcdd4b3 100644 --- a/src/lib/deskflow/unix/X11LayoutsParser.cpp +++ b/src/lib/deskflow/unix/XkbLayoutsParser.cpp @@ -14,7 +14,7 @@ #include "DeskflowXkbKeyboard.h" #include "ISO639Table.h" -#include "X11LayoutsParser.h" +#include "XkbLayoutsParser.h" #include @@ -32,7 +32,7 @@ void splitLine(std::vector &parts, const std::string &line, char de } // namespace -std::vector X11LayoutsParser::getAllLanguageData() +std::vector XkbLayoutsParser::getAllLanguageData() { std::vector allCodes; @@ -81,7 +81,7 @@ std::vector X11LayoutsParser::getAllLanguageData() return allCodes; } -void X11LayoutsParser::appendVectorUniq(const std::vector &source, std::vector &dst) +void XkbLayoutsParser::appendVectorUniq(const std::vector &source, std::vector &dst) { for (const auto &elem : source) { if (std::ranges::find_if(dst, [&elem](const std::string_view &s) { return s == elem; }) == dst.end()) { @@ -90,12 +90,12 @@ void X11LayoutsParser::appendVectorUniq(const std::vector &source, } } -void X11LayoutsParser::convertLayoutToISO639_2( +void XkbLayoutsParser::convertLayoutToISO639_2( const std::vector &layoutNames, const std::vector &layoutVariantNames, std::vector &iso639_2Codes ) { - static std::vector allLang; + static std::vector allLang; if (allLang.empty()) { allLang = getAllLanguageData(); } @@ -144,7 +144,7 @@ void X11LayoutsParser::convertLayoutToISO639_2( } } -std::vector X11LayoutsParser::getX11LanguageList() +std::vector XkbLayoutsParser::getXkbLanguageList() { std::vector layoutNames; std::vector layoutVariantNames; @@ -159,7 +159,7 @@ std::vector X11LayoutsParser::getX11LanguageList() return convertISO639_2ToISO639_1(iso639_2Codes); } -std::string X11LayoutsParser::convertLayoutToISO(const std::string &layoutLangCode) +std::string XkbLayoutsParser::convertLayoutToISO(const std::string &layoutLangCode) { if (layoutLangCode.empty()) { LOG_VERBOSE("skip converting empty layout lang code"); @@ -182,7 +182,7 @@ std::string X11LayoutsParser::convertLayoutToISO(const std::string &layoutLangCo return *iso639_1Codes.begin(); } -std::vector X11LayoutsParser::convertISO639_2ToISO639_1(const std::vector &iso639_2Codes) +std::vector XkbLayoutsParser::convertISO639_2ToISO639_1(const std::vector &iso639_2Codes) { std::vector result; for (const auto &isoCode : iso639_2Codes) { diff --git a/src/lib/deskflow/unix/X11LayoutsParser.h b/src/lib/deskflow/unix/XkbLayoutsParser.h similarity index 93% rename from src/lib/deskflow/unix/X11LayoutsParser.h rename to src/lib/deskflow/unix/XkbLayoutsParser.h index 9d2830fbf..198dcd935 100644 --- a/src/lib/deskflow/unix/X11LayoutsParser.h +++ b/src/lib/deskflow/unix/XkbLayoutsParser.h @@ -12,10 +12,10 @@ #include #include -class X11LayoutsParser +class XkbLayoutsParser { public: - static std::vector getX11LanguageList(); + static std::vector getXkbLanguageList(); static std::string convertLayoutToISO(const std::string &layoutLangCode); private: diff --git a/src/unittests/deskflow/CMakeLists.txt b/src/unittests/deskflow/CMakeLists.txt index f3514ff99..1a5f444b3 100644 --- a/src/unittests/deskflow/CMakeLists.txt +++ b/src/unittests/deskflow/CMakeLists.txt @@ -55,10 +55,10 @@ create_test( if(BUILD_X11_SUPPORT) create_test( - NAME X11LayoutParserTests + NAME XkbLayoutParserTests DEPENDS app LIBS arch base ${extra_libs} - SOURCE X11LayoutParserTests.cpp + SOURCE XkbLayoutParserTests.cpp WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/lib/deskflow" ) endif() diff --git a/src/unittests/deskflow/X11LayoutParserTests.cpp b/src/unittests/deskflow/XkbLayoutParserTests.cpp similarity index 63% rename from src/unittests/deskflow/X11LayoutParserTests.cpp rename to src/unittests/deskflow/XkbLayoutParserTests.cpp index 5b1a8d25e..5d27b4288 100644 --- a/src/unittests/deskflow/X11LayoutParserTests.cpp +++ b/src/unittests/deskflow/XkbLayoutParserTests.cpp @@ -6,21 +6,21 @@ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception */ -#include "X11LayoutParserTests.h" +#include "XkbLayoutParserTests.h" -#include "deskflow/unix/X11LayoutsParser.h" +#include "deskflow/unix/XkbLayoutsParser.h" -void X11LayoutParserTests::convertLayouts() +void XkbLayoutParserTests::convertLayouts() { // An empty layout name yields an empty result. - QCOMPARE(X11LayoutsParser::convertLayoutToISO(""), ""); + QCOMPARE(XkbLayoutsParser::convertLayoutToISO(""), ""); // An unknown layout name is not present in the registry. - QCOMPARE(X11LayoutsParser::convertLayoutToISO("notARealLayout"), ""); + QCOMPARE(XkbLayoutsParser::convertLayoutToISO("notARealLayout"), ""); // A well-known layout resolves to its ISO 639-1 code. "us" is always // present in the xkeyboard-config data and maps to "eng" -> "en". - QCOMPARE(X11LayoutsParser::convertLayoutToISO("us"), "en"); + QCOMPARE(XkbLayoutsParser::convertLayoutToISO("us"), "en"); } -QTEST_MAIN(X11LayoutParserTests) +QTEST_MAIN(XkbLayoutParserTests) diff --git a/src/unittests/deskflow/X11LayoutParserTests.h b/src/unittests/deskflow/XkbLayoutParserTests.h similarity index 90% rename from src/unittests/deskflow/X11LayoutParserTests.h rename to src/unittests/deskflow/XkbLayoutParserTests.h index 04e08c6b7..c11a0bae3 100644 --- a/src/unittests/deskflow/X11LayoutParserTests.h +++ b/src/unittests/deskflow/XkbLayoutParserTests.h @@ -9,7 +9,7 @@ #include -class X11LayoutParserTests : public QObject +class XkbLayoutParserTests : public QObject { Q_OBJECT private Q_SLOTS: