kcms/keyboard: Rename x11_helper

It's not about X11 at all

kcms/keyboard/CMakeLists.txt

@@ -13,7 +13,7 @@ set( kcm_keyboard_PART_SRCS
     bindings.cpp
     flags.cpp
     tastenbrett.cpp
-    x11_helper.cpp
+    layoutunit.cpp
     xkb_rules.cpp
     shortcuthelper.cpp
     xkboptionsmodel.cpp

kcms/keyboard/bindings.cpp

@@ -15,7 +15,7 @@
 #include <QList>
 
 #include "flags.h"
-#include "x11_helper.h"
+#include "layoutunit.h"
 
 KeyboardLayoutActionCollection::KeyboardLayoutActionCollection(QObject *parent, bool configAction_)
     : KActionCollection(parent, QStringLiteral("KDE Keyboard Layout Switcher"))

kcms/keyboard/flags.cpp

@@ -17,7 +17,7 @@
 
 // for text handling
 #include "keyboard_config.h"
-#include "x11_helper.h"
+#include "layoutunit.h"
 #include "xkb_rules.h"
 
 QIcon Flags::getIcon(const QString &layout)

kcms/keyboard/kcm_keyboard.cpp

@@ -20,11 +20,11 @@
 #include "keyboardmiscsettings.h"
 #include "keyboardsettings.h"
 #include "keyboardsettingsdata.h"
+#include "layoutunit.h"
 #include "shortcuthelper.h"
 #include "tastenbrett.h"
 #include "userlayoutmodel.h"
 #include "workspace_options.h"
-#include "x11_helper.h"
 #include "xkboptionsmodel.h"
 
 #include "debug.h"

kcms/keyboard/keyboard_config.cpp

@@ -9,7 +9,7 @@
 
 #include "debug.h"
 #include "keyboardsettings.h"
-#include "x11_helper.h"
+#include "layoutunit.h"
 #include "xkb_rules.h"
 
 const QMap<KeyboardConfig::SwitchingPolicy, QString> switchingPolicyNames = {

kcms/keyboard/keyboard_hardware.cpp

@@ -14,7 +14,7 @@
 #include <math.h>
 
 #include "debug.h"
-#include "x11_helper.h"
+#include "layoutunit.h"
 
 #include <X11/XKBlib.h>
 #include <X11/Xlib.h>

kcms/keyboard/layoutmodel.cpp

@@ -8,7 +8,7 @@
 
 #include "debug.h"
 #include "keyboardsettings.h"
-#include "x11_helper.h"
+#include "layoutunit.h"
 #include "xkb_rules.h"
 
 LayoutModel::LayoutModel() noexcept

kcms/keyboard/layoutunit.cpp

@@ -4,7 +4,7 @@
     SPDX-License-Identifier: GPL-2.0-or-later
 */
 
-#include "x11_helper.h"
+#include "layoutunit.h"
 
 #include <QDebug>
 
@@ -36,5 +36,3 @@ QString LayoutUnit::toString() const
 }
 
 const int LayoutUnit::MAX_LABEL_LENGTH = 3;
-
-#include "moc_x11_helper.cpp"

kcms/keyboard/tests/flags_test.cpp

@@ -10,7 +10,7 @@
 #include "../flags.h"
 #include "../keyboard_config.h"
 #include "../keyboardsettings.h"
-#include "../x11_helper.h"
+#include "../layoutunit.h"
 
 class FlagsTest : public QObject
 {

kcms/keyboard/userlayoutmodel.cpp

@@ -10,7 +10,7 @@
 
 #include "debug.h"
 #include "keyboard_config.h"
-#include "x11_helper.h"
+#include "layoutunit.h"
 #include "xkb_rules.h"
 
 UserLayoutModel::UserLayoutModel(KeyboardConfig *config, QObject *parent) noexcept