From f94b8bfa860507ff478bf056d93f71068276dbe6 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Sat, 17 Dec 2022 16:08:19 +0200 Subject: [PATCH] kcms: Simplify directory naming Remove "kwin", it's repetitive and doesn't add new information. In addition to that, prefixing commits that change kcms will become more straightforward. There's more than one scheme people use, some include "kwin", some don't. --- src/CMakeLists.txt | 2 +- src/kcmkwin/CMakeLists.txt | 17 ----------------- src/kcms/CMakeLists.txt | 17 +++++++++++++++++ src/{kcmkwin => kcms}/common/CMakeLists.txt | 0 src/{kcmkwin => kcms}/common/Messages.sh | 0 src/{kcmkwin => kcms}/common/effectsmodel.cpp | 0 src/{kcmkwin => kcms}/common/effectsmodel.h | 0 .../compositing}/CMakeLists.txt | 0 .../compositing}/Messages.sh | 0 .../compositing}/compositing.ui | 0 .../compositing}/kwincompositing.json | 0 .../compositing}/kwincompositing_setting.kcfg | 0 .../compositing}/kwincompositing_setting.kcfgc | 0 .../compositing}/kwincompositingdata.cpp | 0 .../compositing}/kwincompositingdata.h | 0 .../compositing}/main.cpp | 0 .../decoration}/CMakeLists.txt | 0 .../decoration}/Messages.sh | 0 .../declarative-plugin/CMakeLists.txt | 0 .../declarative-plugin/buttonsmodel.cpp | 0 .../declarative-plugin/buttonsmodel.h | 0 .../decoration}/declarative-plugin/plugin.cpp | 0 .../decoration}/declarative-plugin/plugin.h | 0 .../declarative-plugin/previewbridge.cpp | 0 .../declarative-plugin/previewbridge.h | 0 .../declarative-plugin/previewbutton.cpp | 0 .../declarative-plugin/previewbutton.h | 0 .../declarative-plugin/previewclient.cpp | 0 .../declarative-plugin/previewclient.h | 0 .../declarative-plugin/previewitem.cpp | 0 .../declarative-plugin/previewitem.h | 0 .../declarative-plugin/previewsettings.cpp | 0 .../declarative-plugin/previewsettings.h | 0 .../decoration}/declarative-plugin/qmldir | 0 .../decoration}/decorationmodel.cpp | 0 .../decoration}/decorationmodel.h | 0 .../kwindecoration => kcms/decoration}/kcm.cpp | 0 .../kwindecoration => kcms/decoration}/kcm.h | 0 .../decoration}/kcm_kwindecoration.json | 0 .../decoration}/kwin-applywindowdecoration.cpp | 0 .../decoration}/kwindecorationsettings.kcfg | 0 .../decoration}/kwindecorationsettings.kcfgc | 0 .../package/contents/ui/ButtonGroup.qml | 0 .../package/contents/ui/Buttons.qml | 0 .../decoration}/package/contents/ui/Themes.qml | 0 .../decoration}/package/contents/ui/main.qml | 0 .../decoration}/utils.cpp | 0 .../kwindecoration => kcms/decoration}/utils.h | 0 .../decoration}/window-decorations.knsrc.cmake | 0 .../desktop}/CMakeLists.txt | 0 .../kwindesktop => kcms/desktop}/Messages.sh | 0 .../desktop}/animationsmodel.cpp | 0 .../desktop}/animationsmodel.h | 0 .../desktop}/desktopsmodel.cpp | 0 .../desktop}/desktopsmodel.h | 0 .../desktop}/kcm_kwin_virtualdesktops.json | 0 .../desktop}/package/contents/ui/main.qml | 0 .../desktop}/virtualdesktops.cpp | 0 .../desktop}/virtualdesktops.h | 0 .../desktop}/virtualdesktopsdata.cpp | 0 .../desktop}/virtualdesktopsdata.h | 0 .../desktop}/virtualdesktopssettings.kcfg | 0 .../desktop}/virtualdesktopssettings.kcfgc | 0 .../effects}/CMakeLists.txt | 0 .../kwineffects => kcms/effects}/Messages.sh | 0 .../effects}/desktopeffectsdata.cpp | 0 .../effects}/desktopeffectsdata.h | 0 .../effects}/effectsfilterproxymodel.cpp | 0 .../effects}/effectsfilterproxymodel.h | 0 .../kwineffects => kcms/effects}/kcm.cpp | 0 .../kwineffects => kcms/effects}/kcm.h | 0 .../effects}/kcm_kwin_effects.json | 0 .../effects}/kwineffect.knsrc | 0 .../effects}/package/contents/ui/Effect.qml | 0 .../effects}/package/contents/ui/Video.qml | 0 .../effects}/package/contents/ui/main.qml | 0 .../kwinoptions => kcms/options}/AUTHORS | 0 .../options}/CMakeLists.txt | 0 .../kwinoptions => kcms/options}/ChangeLog | 0 .../kwinoptions => kcms/options}/Messages.sh | 0 .../kwinoptions => kcms/options}/actions.ui | 0 .../kwinoptions => kcms/options}/advanced.ui | 0 .../kwinoptions => kcms/options}/focus.ui | 0 .../options}/kcm_kwinoptions.json | 0 .../kwinoptions_kdeglobals_settings.kcfg | 0 .../kwinoptions_kdeglobals_settings.kcfgc | 0 .../options}/kwinoptions_settings.kcfg | 0 .../options}/kwinoptions_settings.kcfgc | 0 .../kwinoptions => kcms/options}/main.cpp | 0 .../kwinoptions => kcms/options}/main.h | 0 .../kwinoptions => kcms/options}/mouse.cpp | 0 .../kwinoptions => kcms/options}/mouse.h | 0 .../kwinoptions => kcms/options}/mouse.ui | 0 .../kwinoptions => kcms/options}/moving.ui | 0 .../kwinoptions => kcms/options}/windows.cpp | 0 .../kwinoptions => kcms/options}/windows.h | 0 .../kwinrules => kcms/rules}/CMakeLists.txt | 0 .../kwinrules => kcms/rules}/Messages.sh | 0 .../rules}/kcm_kwinrules.json | 0 .../kwinrules => kcms/rules}/kcmrules.cpp | 0 .../kwinrules => kcms/rules}/kcmrules.h | 0 .../kwinrules => kcms/rules}/kwinsrc.cpp | 0 src/{kcmkwin/kwinrules => kcms/rules}/main.cpp | 0 .../kwinrules => kcms/rules}/optionsmodel.cpp | 0 .../kwinrules => kcms/rules}/optionsmodel.h | 0 .../rules}/org.kde.kwin_rules_dialog.desktop | 0 .../package/contents/ui/FileDialogLoader.qml | 0 .../package/contents/ui/OptionsComboBox.qml | 0 .../package/contents/ui/RuleItemDelegate.qml | 0 .../rules}/package/contents/ui/RulesEditor.qml | 0 .../rules}/package/contents/ui/ValueEditor.qml | 0 .../rules}/package/contents/ui/main.qml | 0 .../kwinrules => kcms/rules}/rulebookmodel.cpp | 0 .../kwinrules => kcms/rules}/rulebookmodel.h | 0 .../kwinrules => kcms/rules}/ruleitem.cpp | 0 .../kwinrules => kcms/rules}/ruleitem.h | 0 .../kwinrules => kcms/rules}/rulesmodel.cpp | 0 .../kwinrules => kcms/rules}/rulesmodel.h | 0 .../screenedges}/CMakeLists.txt | 0 .../screenedges}/Messages.sh | 0 .../screenedges}/kcm_kwinscreenedges.json | 0 .../screenedges}/kcm_kwintouchscreen.json | 0 .../screenedges}/kwinscreenedge.cpp | 0 .../screenedges}/kwinscreenedge.h | 0 .../screenedges}/kwinscreenedgeconfigform.cpp | 0 .../screenedges}/kwinscreenedgeconfigform.h | 0 .../kwinscreenedgeeffectsettings.kcfg | 0 .../kwinscreenedgeeffectsettings.kcfgc | 0 .../kwinscreenedgescriptsettings.kcfg | 0 .../kwinscreenedgescriptsettings.kcfgc | 0 .../screenedges}/kwinscreenedgesettings.kcfg | 0 .../screenedges}/kwinscreenedgesettings.kcfgc | 0 .../kwintouchscreenedgeconfigform.cpp | 0 .../kwintouchscreenedgeconfigform.h | 0 .../kwintouchscreenedgeeffectsettings.kcfg | 0 .../kwintouchscreenedgeeffectsettings.kcfgc | 0 .../kwintouchscreenscriptsettings.kcfg | 0 .../kwintouchscreenscriptsettings.kcfgc | 0 .../screenedges}/kwintouchscreensettings.kcfg | 0 .../screenedges}/kwintouchscreensettings.kcfgc | 0 .../screenedges}/main.cpp | 0 .../screenedges}/main.h | 0 .../screenedges}/main.ui | 0 .../screenedges}/monitor.cpp | 0 .../screenedges}/monitor.h | 0 .../screenedges}/screenpreviewwidget.cpp | 0 .../screenedges}/screenpreviewwidget.h | 0 .../screenedges}/touch.cpp | 0 .../screenedges}/touch.h | 0 .../screenedges}/touch.ui | 0 .../scripts}/CMakeLists.txt | 0 .../kwinscripts => kcms/scripts}/Messages.sh | 0 .../scripts}/kcm_kwin_scripts.json | 0 .../scripts}/kwinscripts.knsrc | 0 .../scripts}/kwinscriptsdata.cpp | 0 .../scripts}/kwinscriptsdata.h | 0 .../kwinscripts => kcms/scripts}/module.cpp | 0 .../kwinscripts => kcms/scripts}/module.h | 0 .../scripts}/package/contents/ui/main.qml | 0 .../kwintabbox => kcms/tabbox}/CMakeLists.txt | 0 .../kwintabbox => kcms/tabbox}/Messages.sh | 0 .../tabbox}/kcm_kwintabbox.json | 0 .../tabbox}/kwinpluginssettings.kcfg | 0 .../tabbox}/kwinpluginssettings.kcfgc | 0 .../tabbox}/kwinswitcheffectsettings.kcfg | 0 .../tabbox}/kwinswitcheffectsettings.kcfgc | 0 .../tabbox}/kwinswitcher.knsrc | 0 .../tabbox}/kwintabboxconfigform.cpp | 0 .../tabbox}/kwintabboxconfigform.h | 0 .../tabbox}/kwintabboxdata.cpp | 0 .../tabbox}/kwintabboxdata.h | 0 .../tabbox}/kwintabboxsettings.kcfg | 0 .../tabbox}/kwintabboxsettings.kcfgc | 0 .../tabbox}/layoutpreview.cpp | 0 .../kwintabbox => kcms/tabbox}/layoutpreview.h | 0 .../kwintabbox => kcms/tabbox}/main.cpp | 0 src/{kcmkwin/kwintabbox => kcms/tabbox}/main.h | 0 .../kwintabbox => kcms/tabbox}/main.ui | 0 .../tabbox}/thumbnailitem.cpp | 0 .../kwintabbox => kcms/tabbox}/thumbnailitem.h | 0 .../tabbox}/thumbnails/desktop.png | Bin .../tabbox}/thumbnails/dolphin.png | Bin .../tabbox}/thumbnails/kmail.png | Bin .../tabbox}/thumbnails/konqueror.png | Bin .../tabbox}/thumbnails/systemsettings.png | Bin .../virtualkeyboard}/CMakeLists.txt | 0 .../virtualkeyboard}/Messages.sh | 0 .../virtualkeyboard}/kcm_virtualkeyboard.json | 0 .../virtualkeyboard}/kcmvirtualkeyboard.cpp | 0 .../virtualkeyboard}/kcmvirtualkeyboard.h | 0 .../package/contents/ui/main.qml | 0 .../virtualkeyboardsettings.kcfg | 0 .../virtualkeyboardsettings.kcfgc | 0 .../xwayland}/CMakeLists.txt | 0 .../kwinxwayland => kcms/xwayland}/Messages.sh | 0 .../xwayland}/kcm_kwinxwayland.json | 0 .../xwayland}/kcmkwinxwayland.cpp | 0 .../xwayland}/kcmkwinxwayland.h | 0 .../xwayland}/kwinxwaylandsettings.kcfg | 0 .../xwayland}/kwinxwaylandsettings.kcfgc | 0 .../xwayland}/package/contents/ui/main.qml | 0 201 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 src/kcmkwin/CMakeLists.txt create mode 100644 src/kcms/CMakeLists.txt rename src/{kcmkwin => kcms}/common/CMakeLists.txt (100%) rename src/{kcmkwin => kcms}/common/Messages.sh (100%) rename src/{kcmkwin => kcms}/common/effectsmodel.cpp (100%) rename src/{kcmkwin => kcms}/common/effectsmodel.h (100%) rename src/{kcmkwin/kwincompositing => kcms/compositing}/CMakeLists.txt (100%) rename src/{kcmkwin/kwincompositing => kcms/compositing}/Messages.sh (100%) rename src/{kcmkwin/kwincompositing => kcms/compositing}/compositing.ui (100%) rename src/{kcmkwin/kwincompositing => kcms/compositing}/kwincompositing.json (100%) rename src/{kcmkwin/kwincompositing => kcms/compositing}/kwincompositing_setting.kcfg (100%) rename src/{kcmkwin/kwincompositing => kcms/compositing}/kwincompositing_setting.kcfgc (100%) rename src/{kcmkwin/kwincompositing => kcms/compositing}/kwincompositingdata.cpp (100%) rename src/{kcmkwin/kwincompositing => kcms/compositing}/kwincompositingdata.h (100%) rename src/{kcmkwin/kwincompositing => kcms/compositing}/main.cpp (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/CMakeLists.txt (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/Messages.sh (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/declarative-plugin/CMakeLists.txt (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/declarative-plugin/buttonsmodel.cpp (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/declarative-plugin/buttonsmodel.h (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/declarative-plugin/plugin.cpp (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/declarative-plugin/plugin.h (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/declarative-plugin/previewbridge.cpp (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/declarative-plugin/previewbridge.h (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/declarative-plugin/previewbutton.cpp (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/declarative-plugin/previewbutton.h (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/declarative-plugin/previewclient.cpp (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/declarative-plugin/previewclient.h (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/declarative-plugin/previewitem.cpp (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/declarative-plugin/previewitem.h (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/declarative-plugin/previewsettings.cpp (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/declarative-plugin/previewsettings.h (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/declarative-plugin/qmldir (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/decorationmodel.cpp (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/decorationmodel.h (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/kcm.cpp (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/kcm.h (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/kcm_kwindecoration.json (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/kwin-applywindowdecoration.cpp (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/kwindecorationsettings.kcfg (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/kwindecorationsettings.kcfgc (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/package/contents/ui/ButtonGroup.qml (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/package/contents/ui/Buttons.qml (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/package/contents/ui/Themes.qml (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/package/contents/ui/main.qml (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/utils.cpp (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/utils.h (100%) rename src/{kcmkwin/kwindecoration => kcms/decoration}/window-decorations.knsrc.cmake (100%) rename src/{kcmkwin/kwindesktop => kcms/desktop}/CMakeLists.txt (100%) rename src/{kcmkwin/kwindesktop => kcms/desktop}/Messages.sh (100%) rename src/{kcmkwin/kwindesktop => kcms/desktop}/animationsmodel.cpp (100%) rename src/{kcmkwin/kwindesktop => kcms/desktop}/animationsmodel.h (100%) rename src/{kcmkwin/kwindesktop => kcms/desktop}/desktopsmodel.cpp (100%) rename src/{kcmkwin/kwindesktop => kcms/desktop}/desktopsmodel.h (100%) rename src/{kcmkwin/kwindesktop => kcms/desktop}/kcm_kwin_virtualdesktops.json (100%) rename src/{kcmkwin/kwindesktop => kcms/desktop}/package/contents/ui/main.qml (100%) rename src/{kcmkwin/kwindesktop => kcms/desktop}/virtualdesktops.cpp (100%) rename src/{kcmkwin/kwindesktop => kcms/desktop}/virtualdesktops.h (100%) rename src/{kcmkwin/kwindesktop => kcms/desktop}/virtualdesktopsdata.cpp (100%) rename src/{kcmkwin/kwindesktop => kcms/desktop}/virtualdesktopsdata.h (100%) rename src/{kcmkwin/kwindesktop => kcms/desktop}/virtualdesktopssettings.kcfg (100%) rename src/{kcmkwin/kwindesktop => kcms/desktop}/virtualdesktopssettings.kcfgc (100%) rename src/{kcmkwin/kwineffects => kcms/effects}/CMakeLists.txt (100%) rename src/{kcmkwin/kwineffects => kcms/effects}/Messages.sh (100%) rename src/{kcmkwin/kwineffects => kcms/effects}/desktopeffectsdata.cpp (100%) rename src/{kcmkwin/kwineffects => kcms/effects}/desktopeffectsdata.h (100%) rename src/{kcmkwin/kwineffects => kcms/effects}/effectsfilterproxymodel.cpp (100%) rename src/{kcmkwin/kwineffects => kcms/effects}/effectsfilterproxymodel.h (100%) rename src/{kcmkwin/kwineffects => kcms/effects}/kcm.cpp (100%) rename src/{kcmkwin/kwineffects => kcms/effects}/kcm.h (100%) rename src/{kcmkwin/kwineffects => kcms/effects}/kcm_kwin_effects.json (100%) rename src/{kcmkwin/kwineffects => kcms/effects}/kwineffect.knsrc (100%) rename src/{kcmkwin/kwineffects => kcms/effects}/package/contents/ui/Effect.qml (100%) rename src/{kcmkwin/kwineffects => kcms/effects}/package/contents/ui/Video.qml (100%) rename src/{kcmkwin/kwineffects => kcms/effects}/package/contents/ui/main.qml (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/AUTHORS (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/CMakeLists.txt (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/ChangeLog (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/Messages.sh (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/actions.ui (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/advanced.ui (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/focus.ui (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/kcm_kwinoptions.json (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/kwinoptions_kdeglobals_settings.kcfg (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/kwinoptions_kdeglobals_settings.kcfgc (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/kwinoptions_settings.kcfg (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/kwinoptions_settings.kcfgc (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/main.cpp (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/main.h (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/mouse.cpp (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/mouse.h (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/mouse.ui (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/moving.ui (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/windows.cpp (100%) rename src/{kcmkwin/kwinoptions => kcms/options}/windows.h (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/CMakeLists.txt (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/Messages.sh (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/kcm_kwinrules.json (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/kcmrules.cpp (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/kcmrules.h (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/kwinsrc.cpp (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/main.cpp (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/optionsmodel.cpp (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/optionsmodel.h (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/org.kde.kwin_rules_dialog.desktop (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/package/contents/ui/FileDialogLoader.qml (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/package/contents/ui/OptionsComboBox.qml (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/package/contents/ui/RuleItemDelegate.qml (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/package/contents/ui/RulesEditor.qml (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/package/contents/ui/ValueEditor.qml (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/package/contents/ui/main.qml (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/rulebookmodel.cpp (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/rulebookmodel.h (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/ruleitem.cpp (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/ruleitem.h (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/rulesmodel.cpp (100%) rename src/{kcmkwin/kwinrules => kcms/rules}/rulesmodel.h (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/CMakeLists.txt (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/Messages.sh (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kcm_kwinscreenedges.json (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kcm_kwintouchscreen.json (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kwinscreenedge.cpp (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kwinscreenedge.h (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kwinscreenedgeconfigform.cpp (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kwinscreenedgeconfigform.h (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kwinscreenedgeeffectsettings.kcfg (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kwinscreenedgeeffectsettings.kcfgc (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kwinscreenedgescriptsettings.kcfg (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kwinscreenedgescriptsettings.kcfgc (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kwinscreenedgesettings.kcfg (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kwinscreenedgesettings.kcfgc (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kwintouchscreenedgeconfigform.cpp (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kwintouchscreenedgeconfigform.h (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kwintouchscreenedgeeffectsettings.kcfg (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kwintouchscreenedgeeffectsettings.kcfgc (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kwintouchscreenscriptsettings.kcfg (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kwintouchscreenscriptsettings.kcfgc (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kwintouchscreensettings.kcfg (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/kwintouchscreensettings.kcfgc (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/main.cpp (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/main.h (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/main.ui (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/monitor.cpp (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/monitor.h (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/screenpreviewwidget.cpp (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/screenpreviewwidget.h (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/touch.cpp (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/touch.h (100%) rename src/{kcmkwin/kwinscreenedges => kcms/screenedges}/touch.ui (100%) rename src/{kcmkwin/kwinscripts => kcms/scripts}/CMakeLists.txt (100%) rename src/{kcmkwin/kwinscripts => kcms/scripts}/Messages.sh (100%) rename src/{kcmkwin/kwinscripts => kcms/scripts}/kcm_kwin_scripts.json (100%) rename src/{kcmkwin/kwinscripts => kcms/scripts}/kwinscripts.knsrc (100%) rename src/{kcmkwin/kwinscripts => kcms/scripts}/kwinscriptsdata.cpp (100%) rename src/{kcmkwin/kwinscripts => kcms/scripts}/kwinscriptsdata.h (100%) rename src/{kcmkwin/kwinscripts => kcms/scripts}/module.cpp (100%) rename src/{kcmkwin/kwinscripts => kcms/scripts}/module.h (100%) rename src/{kcmkwin/kwinscripts => kcms/scripts}/package/contents/ui/main.qml (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/CMakeLists.txt (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/Messages.sh (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/kcm_kwintabbox.json (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/kwinpluginssettings.kcfg (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/kwinpluginssettings.kcfgc (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/kwinswitcheffectsettings.kcfg (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/kwinswitcheffectsettings.kcfgc (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/kwinswitcher.knsrc (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/kwintabboxconfigform.cpp (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/kwintabboxconfigform.h (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/kwintabboxdata.cpp (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/kwintabboxdata.h (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/kwintabboxsettings.kcfg (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/kwintabboxsettings.kcfgc (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/layoutpreview.cpp (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/layoutpreview.h (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/main.cpp (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/main.h (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/main.ui (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/thumbnailitem.cpp (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/thumbnailitem.h (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/thumbnails/desktop.png (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/thumbnails/dolphin.png (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/thumbnails/kmail.png (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/thumbnails/konqueror.png (100%) rename src/{kcmkwin/kwintabbox => kcms/tabbox}/thumbnails/systemsettings.png (100%) rename src/{kcmkwin/kwinvirtualkeyboard => kcms/virtualkeyboard}/CMakeLists.txt (100%) rename src/{kcmkwin/kwinvirtualkeyboard => kcms/virtualkeyboard}/Messages.sh (100%) rename src/{kcmkwin/kwinvirtualkeyboard => kcms/virtualkeyboard}/kcm_virtualkeyboard.json (100%) rename src/{kcmkwin/kwinvirtualkeyboard => kcms/virtualkeyboard}/kcmvirtualkeyboard.cpp (100%) rename src/{kcmkwin/kwinvirtualkeyboard => kcms/virtualkeyboard}/kcmvirtualkeyboard.h (100%) rename src/{kcmkwin/kwinvirtualkeyboard => kcms/virtualkeyboard}/package/contents/ui/main.qml (100%) rename src/{kcmkwin/kwinvirtualkeyboard => kcms/virtualkeyboard}/virtualkeyboardsettings.kcfg (100%) rename src/{kcmkwin/kwinvirtualkeyboard => kcms/virtualkeyboard}/virtualkeyboardsettings.kcfgc (100%) rename src/{kcmkwin/kwinxwayland => kcms/xwayland}/CMakeLists.txt (100%) rename src/{kcmkwin/kwinxwayland => kcms/xwayland}/Messages.sh (100%) rename src/{kcmkwin/kwinxwayland => kcms/xwayland}/kcm_kwinxwayland.json (100%) rename src/{kcmkwin/kwinxwayland => kcms/xwayland}/kcmkwinxwayland.cpp (100%) rename src/{kcmkwin/kwinxwayland => kcms/xwayland}/kcmkwinxwayland.h (100%) rename src/{kcmkwin/kwinxwayland => kcms/xwayland}/kwinxwaylandsettings.kcfg (100%) rename src/{kcmkwin/kwinxwayland => kcms/xwayland}/kwinxwaylandsettings.kcfgc (100%) rename src/{kcmkwin/kwinxwayland => kcms/xwayland}/package/contents/ui/main.qml (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d12c7645f8..d00a4480be 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -18,7 +18,7 @@ add_subdirectory(qml) add_subdirectory(libkwineffects) if (KWIN_BUILD_KCMS) - add_subdirectory(kcmkwin) + add_subdirectory(kcms) endif() add_library(kwin SHARED) diff --git a/src/kcmkwin/CMakeLists.txt b/src/kcmkwin/CMakeLists.txt deleted file mode 100644 index 6694585145..0000000000 --- a/src/kcmkwin/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) - -add_subdirectory(common) -add_subdirectory(kwincompositing) -add_subdirectory(kwinoptions) -add_subdirectory(kwindecoration) -add_subdirectory(kwinrules) -add_subdirectory(kwinscreenedges) -add_subdirectory(kwinscripts) -add_subdirectory(kwindesktop) -add_subdirectory(kwineffects) -add_subdirectory(kwinvirtualkeyboard) -add_subdirectory(kwinxwayland) - -if (KWIN_BUILD_TABBOX) - add_subdirectory(kwintabbox) -endif() diff --git a/src/kcms/CMakeLists.txt b/src/kcms/CMakeLists.txt new file mode 100644 index 0000000000..9fd4f534f6 --- /dev/null +++ b/src/kcms/CMakeLists.txt @@ -0,0 +1,17 @@ +remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) + +add_subdirectory(common) +add_subdirectory(compositing) +add_subdirectory(options) +add_subdirectory(decoration) +add_subdirectory(rules) +add_subdirectory(screenedges) +add_subdirectory(scripts) +add_subdirectory(desktop) +add_subdirectory(effects) +add_subdirectory(virtualkeyboard) +add_subdirectory(xwayland) + +if (KWIN_BUILD_TABBOX) + add_subdirectory(tabbox) +endif() diff --git a/src/kcmkwin/common/CMakeLists.txt b/src/kcms/common/CMakeLists.txt similarity index 100% rename from src/kcmkwin/common/CMakeLists.txt rename to src/kcms/common/CMakeLists.txt diff --git a/src/kcmkwin/common/Messages.sh b/src/kcms/common/Messages.sh similarity index 100% rename from src/kcmkwin/common/Messages.sh rename to src/kcms/common/Messages.sh diff --git a/src/kcmkwin/common/effectsmodel.cpp b/src/kcms/common/effectsmodel.cpp similarity index 100% rename from src/kcmkwin/common/effectsmodel.cpp rename to src/kcms/common/effectsmodel.cpp diff --git a/src/kcmkwin/common/effectsmodel.h b/src/kcms/common/effectsmodel.h similarity index 100% rename from src/kcmkwin/common/effectsmodel.h rename to src/kcms/common/effectsmodel.h diff --git a/src/kcmkwin/kwincompositing/CMakeLists.txt b/src/kcms/compositing/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwincompositing/CMakeLists.txt rename to src/kcms/compositing/CMakeLists.txt diff --git a/src/kcmkwin/kwincompositing/Messages.sh b/src/kcms/compositing/Messages.sh similarity index 100% rename from src/kcmkwin/kwincompositing/Messages.sh rename to src/kcms/compositing/Messages.sh diff --git a/src/kcmkwin/kwincompositing/compositing.ui b/src/kcms/compositing/compositing.ui similarity index 100% rename from src/kcmkwin/kwincompositing/compositing.ui rename to src/kcms/compositing/compositing.ui diff --git a/src/kcmkwin/kwincompositing/kwincompositing.json b/src/kcms/compositing/kwincompositing.json similarity index 100% rename from src/kcmkwin/kwincompositing/kwincompositing.json rename to src/kcms/compositing/kwincompositing.json diff --git a/src/kcmkwin/kwincompositing/kwincompositing_setting.kcfg b/src/kcms/compositing/kwincompositing_setting.kcfg similarity index 100% rename from src/kcmkwin/kwincompositing/kwincompositing_setting.kcfg rename to src/kcms/compositing/kwincompositing_setting.kcfg diff --git a/src/kcmkwin/kwincompositing/kwincompositing_setting.kcfgc b/src/kcms/compositing/kwincompositing_setting.kcfgc similarity index 100% rename from src/kcmkwin/kwincompositing/kwincompositing_setting.kcfgc rename to src/kcms/compositing/kwincompositing_setting.kcfgc diff --git a/src/kcmkwin/kwincompositing/kwincompositingdata.cpp b/src/kcms/compositing/kwincompositingdata.cpp similarity index 100% rename from src/kcmkwin/kwincompositing/kwincompositingdata.cpp rename to src/kcms/compositing/kwincompositingdata.cpp diff --git a/src/kcmkwin/kwincompositing/kwincompositingdata.h b/src/kcms/compositing/kwincompositingdata.h similarity index 100% rename from src/kcmkwin/kwincompositing/kwincompositingdata.h rename to src/kcms/compositing/kwincompositingdata.h diff --git a/src/kcmkwin/kwincompositing/main.cpp b/src/kcms/compositing/main.cpp similarity index 100% rename from src/kcmkwin/kwincompositing/main.cpp rename to src/kcms/compositing/main.cpp diff --git a/src/kcmkwin/kwindecoration/CMakeLists.txt b/src/kcms/decoration/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwindecoration/CMakeLists.txt rename to src/kcms/decoration/CMakeLists.txt diff --git a/src/kcmkwin/kwindecoration/Messages.sh b/src/kcms/decoration/Messages.sh similarity index 100% rename from src/kcmkwin/kwindecoration/Messages.sh rename to src/kcms/decoration/Messages.sh diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/CMakeLists.txt b/src/kcms/decoration/declarative-plugin/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/CMakeLists.txt rename to src/kcms/decoration/declarative-plugin/CMakeLists.txt diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/buttonsmodel.cpp b/src/kcms/decoration/declarative-plugin/buttonsmodel.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/buttonsmodel.cpp rename to src/kcms/decoration/declarative-plugin/buttonsmodel.cpp diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/buttonsmodel.h b/src/kcms/decoration/declarative-plugin/buttonsmodel.h similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/buttonsmodel.h rename to src/kcms/decoration/declarative-plugin/buttonsmodel.h diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/plugin.cpp b/src/kcms/decoration/declarative-plugin/plugin.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/plugin.cpp rename to src/kcms/decoration/declarative-plugin/plugin.cpp diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/plugin.h b/src/kcms/decoration/declarative-plugin/plugin.h similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/plugin.h rename to src/kcms/decoration/declarative-plugin/plugin.h diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp b/src/kcms/decoration/declarative-plugin/previewbridge.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewbridge.cpp rename to src/kcms/decoration/declarative-plugin/previewbridge.cpp diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewbridge.h b/src/kcms/decoration/declarative-plugin/previewbridge.h similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewbridge.h rename to src/kcms/decoration/declarative-plugin/previewbridge.h diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewbutton.cpp b/src/kcms/decoration/declarative-plugin/previewbutton.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewbutton.cpp rename to src/kcms/decoration/declarative-plugin/previewbutton.cpp diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewbutton.h b/src/kcms/decoration/declarative-plugin/previewbutton.h similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewbutton.h rename to src/kcms/decoration/declarative-plugin/previewbutton.h diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp b/src/kcms/decoration/declarative-plugin/previewclient.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp rename to src/kcms/decoration/declarative-plugin/previewclient.cpp diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewclient.h b/src/kcms/decoration/declarative-plugin/previewclient.h similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewclient.h rename to src/kcms/decoration/declarative-plugin/previewclient.h diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewitem.cpp b/src/kcms/decoration/declarative-plugin/previewitem.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewitem.cpp rename to src/kcms/decoration/declarative-plugin/previewitem.cpp diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewitem.h b/src/kcms/decoration/declarative-plugin/previewitem.h similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewitem.h rename to src/kcms/decoration/declarative-plugin/previewitem.h diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewsettings.cpp b/src/kcms/decoration/declarative-plugin/previewsettings.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewsettings.cpp rename to src/kcms/decoration/declarative-plugin/previewsettings.cpp diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/previewsettings.h b/src/kcms/decoration/declarative-plugin/previewsettings.h similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/previewsettings.h rename to src/kcms/decoration/declarative-plugin/previewsettings.h diff --git a/src/kcmkwin/kwindecoration/declarative-plugin/qmldir b/src/kcms/decoration/declarative-plugin/qmldir similarity index 100% rename from src/kcmkwin/kwindecoration/declarative-plugin/qmldir rename to src/kcms/decoration/declarative-plugin/qmldir diff --git a/src/kcmkwin/kwindecoration/decorationmodel.cpp b/src/kcms/decoration/decorationmodel.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/decorationmodel.cpp rename to src/kcms/decoration/decorationmodel.cpp diff --git a/src/kcmkwin/kwindecoration/decorationmodel.h b/src/kcms/decoration/decorationmodel.h similarity index 100% rename from src/kcmkwin/kwindecoration/decorationmodel.h rename to src/kcms/decoration/decorationmodel.h diff --git a/src/kcmkwin/kwindecoration/kcm.cpp b/src/kcms/decoration/kcm.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/kcm.cpp rename to src/kcms/decoration/kcm.cpp diff --git a/src/kcmkwin/kwindecoration/kcm.h b/src/kcms/decoration/kcm.h similarity index 100% rename from src/kcmkwin/kwindecoration/kcm.h rename to src/kcms/decoration/kcm.h diff --git a/src/kcmkwin/kwindecoration/kcm_kwindecoration.json b/src/kcms/decoration/kcm_kwindecoration.json similarity index 100% rename from src/kcmkwin/kwindecoration/kcm_kwindecoration.json rename to src/kcms/decoration/kcm_kwindecoration.json diff --git a/src/kcmkwin/kwindecoration/kwin-applywindowdecoration.cpp b/src/kcms/decoration/kwin-applywindowdecoration.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/kwin-applywindowdecoration.cpp rename to src/kcms/decoration/kwin-applywindowdecoration.cpp diff --git a/src/kcmkwin/kwindecoration/kwindecorationsettings.kcfg b/src/kcms/decoration/kwindecorationsettings.kcfg similarity index 100% rename from src/kcmkwin/kwindecoration/kwindecorationsettings.kcfg rename to src/kcms/decoration/kwindecorationsettings.kcfg diff --git a/src/kcmkwin/kwindecoration/kwindecorationsettings.kcfgc b/src/kcms/decoration/kwindecorationsettings.kcfgc similarity index 100% rename from src/kcmkwin/kwindecoration/kwindecorationsettings.kcfgc rename to src/kcms/decoration/kwindecorationsettings.kcfgc diff --git a/src/kcmkwin/kwindecoration/package/contents/ui/ButtonGroup.qml b/src/kcms/decoration/package/contents/ui/ButtonGroup.qml similarity index 100% rename from src/kcmkwin/kwindecoration/package/contents/ui/ButtonGroup.qml rename to src/kcms/decoration/package/contents/ui/ButtonGroup.qml diff --git a/src/kcmkwin/kwindecoration/package/contents/ui/Buttons.qml b/src/kcms/decoration/package/contents/ui/Buttons.qml similarity index 100% rename from src/kcmkwin/kwindecoration/package/contents/ui/Buttons.qml rename to src/kcms/decoration/package/contents/ui/Buttons.qml diff --git a/src/kcmkwin/kwindecoration/package/contents/ui/Themes.qml b/src/kcms/decoration/package/contents/ui/Themes.qml similarity index 100% rename from src/kcmkwin/kwindecoration/package/contents/ui/Themes.qml rename to src/kcms/decoration/package/contents/ui/Themes.qml diff --git a/src/kcmkwin/kwindecoration/package/contents/ui/main.qml b/src/kcms/decoration/package/contents/ui/main.qml similarity index 100% rename from src/kcmkwin/kwindecoration/package/contents/ui/main.qml rename to src/kcms/decoration/package/contents/ui/main.qml diff --git a/src/kcmkwin/kwindecoration/utils.cpp b/src/kcms/decoration/utils.cpp similarity index 100% rename from src/kcmkwin/kwindecoration/utils.cpp rename to src/kcms/decoration/utils.cpp diff --git a/src/kcmkwin/kwindecoration/utils.h b/src/kcms/decoration/utils.h similarity index 100% rename from src/kcmkwin/kwindecoration/utils.h rename to src/kcms/decoration/utils.h diff --git a/src/kcmkwin/kwindecoration/window-decorations.knsrc.cmake b/src/kcms/decoration/window-decorations.knsrc.cmake similarity index 100% rename from src/kcmkwin/kwindecoration/window-decorations.knsrc.cmake rename to src/kcms/decoration/window-decorations.knsrc.cmake diff --git a/src/kcmkwin/kwindesktop/CMakeLists.txt b/src/kcms/desktop/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwindesktop/CMakeLists.txt rename to src/kcms/desktop/CMakeLists.txt diff --git a/src/kcmkwin/kwindesktop/Messages.sh b/src/kcms/desktop/Messages.sh similarity index 100% rename from src/kcmkwin/kwindesktop/Messages.sh rename to src/kcms/desktop/Messages.sh diff --git a/src/kcmkwin/kwindesktop/animationsmodel.cpp b/src/kcms/desktop/animationsmodel.cpp similarity index 100% rename from src/kcmkwin/kwindesktop/animationsmodel.cpp rename to src/kcms/desktop/animationsmodel.cpp diff --git a/src/kcmkwin/kwindesktop/animationsmodel.h b/src/kcms/desktop/animationsmodel.h similarity index 100% rename from src/kcmkwin/kwindesktop/animationsmodel.h rename to src/kcms/desktop/animationsmodel.h diff --git a/src/kcmkwin/kwindesktop/desktopsmodel.cpp b/src/kcms/desktop/desktopsmodel.cpp similarity index 100% rename from src/kcmkwin/kwindesktop/desktopsmodel.cpp rename to src/kcms/desktop/desktopsmodel.cpp diff --git a/src/kcmkwin/kwindesktop/desktopsmodel.h b/src/kcms/desktop/desktopsmodel.h similarity index 100% rename from src/kcmkwin/kwindesktop/desktopsmodel.h rename to src/kcms/desktop/desktopsmodel.h diff --git a/src/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.json b/src/kcms/desktop/kcm_kwin_virtualdesktops.json similarity index 100% rename from src/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.json rename to src/kcms/desktop/kcm_kwin_virtualdesktops.json diff --git a/src/kcmkwin/kwindesktop/package/contents/ui/main.qml b/src/kcms/desktop/package/contents/ui/main.qml similarity index 100% rename from src/kcmkwin/kwindesktop/package/contents/ui/main.qml rename to src/kcms/desktop/package/contents/ui/main.qml diff --git a/src/kcmkwin/kwindesktop/virtualdesktops.cpp b/src/kcms/desktop/virtualdesktops.cpp similarity index 100% rename from src/kcmkwin/kwindesktop/virtualdesktops.cpp rename to src/kcms/desktop/virtualdesktops.cpp diff --git a/src/kcmkwin/kwindesktop/virtualdesktops.h b/src/kcms/desktop/virtualdesktops.h similarity index 100% rename from src/kcmkwin/kwindesktop/virtualdesktops.h rename to src/kcms/desktop/virtualdesktops.h diff --git a/src/kcmkwin/kwindesktop/virtualdesktopsdata.cpp b/src/kcms/desktop/virtualdesktopsdata.cpp similarity index 100% rename from src/kcmkwin/kwindesktop/virtualdesktopsdata.cpp rename to src/kcms/desktop/virtualdesktopsdata.cpp diff --git a/src/kcmkwin/kwindesktop/virtualdesktopsdata.h b/src/kcms/desktop/virtualdesktopsdata.h similarity index 100% rename from src/kcmkwin/kwindesktop/virtualdesktopsdata.h rename to src/kcms/desktop/virtualdesktopsdata.h diff --git a/src/kcmkwin/kwindesktop/virtualdesktopssettings.kcfg b/src/kcms/desktop/virtualdesktopssettings.kcfg similarity index 100% rename from src/kcmkwin/kwindesktop/virtualdesktopssettings.kcfg rename to src/kcms/desktop/virtualdesktopssettings.kcfg diff --git a/src/kcmkwin/kwindesktop/virtualdesktopssettings.kcfgc b/src/kcms/desktop/virtualdesktopssettings.kcfgc similarity index 100% rename from src/kcmkwin/kwindesktop/virtualdesktopssettings.kcfgc rename to src/kcms/desktop/virtualdesktopssettings.kcfgc diff --git a/src/kcmkwin/kwineffects/CMakeLists.txt b/src/kcms/effects/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwineffects/CMakeLists.txt rename to src/kcms/effects/CMakeLists.txt diff --git a/src/kcmkwin/kwineffects/Messages.sh b/src/kcms/effects/Messages.sh similarity index 100% rename from src/kcmkwin/kwineffects/Messages.sh rename to src/kcms/effects/Messages.sh diff --git a/src/kcmkwin/kwineffects/desktopeffectsdata.cpp b/src/kcms/effects/desktopeffectsdata.cpp similarity index 100% rename from src/kcmkwin/kwineffects/desktopeffectsdata.cpp rename to src/kcms/effects/desktopeffectsdata.cpp diff --git a/src/kcmkwin/kwineffects/desktopeffectsdata.h b/src/kcms/effects/desktopeffectsdata.h similarity index 100% rename from src/kcmkwin/kwineffects/desktopeffectsdata.h rename to src/kcms/effects/desktopeffectsdata.h diff --git a/src/kcmkwin/kwineffects/effectsfilterproxymodel.cpp b/src/kcms/effects/effectsfilterproxymodel.cpp similarity index 100% rename from src/kcmkwin/kwineffects/effectsfilterproxymodel.cpp rename to src/kcms/effects/effectsfilterproxymodel.cpp diff --git a/src/kcmkwin/kwineffects/effectsfilterproxymodel.h b/src/kcms/effects/effectsfilterproxymodel.h similarity index 100% rename from src/kcmkwin/kwineffects/effectsfilterproxymodel.h rename to src/kcms/effects/effectsfilterproxymodel.h diff --git a/src/kcmkwin/kwineffects/kcm.cpp b/src/kcms/effects/kcm.cpp similarity index 100% rename from src/kcmkwin/kwineffects/kcm.cpp rename to src/kcms/effects/kcm.cpp diff --git a/src/kcmkwin/kwineffects/kcm.h b/src/kcms/effects/kcm.h similarity index 100% rename from src/kcmkwin/kwineffects/kcm.h rename to src/kcms/effects/kcm.h diff --git a/src/kcmkwin/kwineffects/kcm_kwin_effects.json b/src/kcms/effects/kcm_kwin_effects.json similarity index 100% rename from src/kcmkwin/kwineffects/kcm_kwin_effects.json rename to src/kcms/effects/kcm_kwin_effects.json diff --git a/src/kcmkwin/kwineffects/kwineffect.knsrc b/src/kcms/effects/kwineffect.knsrc similarity index 100% rename from src/kcmkwin/kwineffects/kwineffect.knsrc rename to src/kcms/effects/kwineffect.knsrc diff --git a/src/kcmkwin/kwineffects/package/contents/ui/Effect.qml b/src/kcms/effects/package/contents/ui/Effect.qml similarity index 100% rename from src/kcmkwin/kwineffects/package/contents/ui/Effect.qml rename to src/kcms/effects/package/contents/ui/Effect.qml diff --git a/src/kcmkwin/kwineffects/package/contents/ui/Video.qml b/src/kcms/effects/package/contents/ui/Video.qml similarity index 100% rename from src/kcmkwin/kwineffects/package/contents/ui/Video.qml rename to src/kcms/effects/package/contents/ui/Video.qml diff --git a/src/kcmkwin/kwineffects/package/contents/ui/main.qml b/src/kcms/effects/package/contents/ui/main.qml similarity index 100% rename from src/kcmkwin/kwineffects/package/contents/ui/main.qml rename to src/kcms/effects/package/contents/ui/main.qml diff --git a/src/kcmkwin/kwinoptions/AUTHORS b/src/kcms/options/AUTHORS similarity index 100% rename from src/kcmkwin/kwinoptions/AUTHORS rename to src/kcms/options/AUTHORS diff --git a/src/kcmkwin/kwinoptions/CMakeLists.txt b/src/kcms/options/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwinoptions/CMakeLists.txt rename to src/kcms/options/CMakeLists.txt diff --git a/src/kcmkwin/kwinoptions/ChangeLog b/src/kcms/options/ChangeLog similarity index 100% rename from src/kcmkwin/kwinoptions/ChangeLog rename to src/kcms/options/ChangeLog diff --git a/src/kcmkwin/kwinoptions/Messages.sh b/src/kcms/options/Messages.sh similarity index 100% rename from src/kcmkwin/kwinoptions/Messages.sh rename to src/kcms/options/Messages.sh diff --git a/src/kcmkwin/kwinoptions/actions.ui b/src/kcms/options/actions.ui similarity index 100% rename from src/kcmkwin/kwinoptions/actions.ui rename to src/kcms/options/actions.ui diff --git a/src/kcmkwin/kwinoptions/advanced.ui b/src/kcms/options/advanced.ui similarity index 100% rename from src/kcmkwin/kwinoptions/advanced.ui rename to src/kcms/options/advanced.ui diff --git a/src/kcmkwin/kwinoptions/focus.ui b/src/kcms/options/focus.ui similarity index 100% rename from src/kcmkwin/kwinoptions/focus.ui rename to src/kcms/options/focus.ui diff --git a/src/kcmkwin/kwinoptions/kcm_kwinoptions.json b/src/kcms/options/kcm_kwinoptions.json similarity index 100% rename from src/kcmkwin/kwinoptions/kcm_kwinoptions.json rename to src/kcms/options/kcm_kwinoptions.json diff --git a/src/kcmkwin/kwinoptions/kwinoptions_kdeglobals_settings.kcfg b/src/kcms/options/kwinoptions_kdeglobals_settings.kcfg similarity index 100% rename from src/kcmkwin/kwinoptions/kwinoptions_kdeglobals_settings.kcfg rename to src/kcms/options/kwinoptions_kdeglobals_settings.kcfg diff --git a/src/kcmkwin/kwinoptions/kwinoptions_kdeglobals_settings.kcfgc b/src/kcms/options/kwinoptions_kdeglobals_settings.kcfgc similarity index 100% rename from src/kcmkwin/kwinoptions/kwinoptions_kdeglobals_settings.kcfgc rename to src/kcms/options/kwinoptions_kdeglobals_settings.kcfgc diff --git a/src/kcmkwin/kwinoptions/kwinoptions_settings.kcfg b/src/kcms/options/kwinoptions_settings.kcfg similarity index 100% rename from src/kcmkwin/kwinoptions/kwinoptions_settings.kcfg rename to src/kcms/options/kwinoptions_settings.kcfg diff --git a/src/kcmkwin/kwinoptions/kwinoptions_settings.kcfgc b/src/kcms/options/kwinoptions_settings.kcfgc similarity index 100% rename from src/kcmkwin/kwinoptions/kwinoptions_settings.kcfgc rename to src/kcms/options/kwinoptions_settings.kcfgc diff --git a/src/kcmkwin/kwinoptions/main.cpp b/src/kcms/options/main.cpp similarity index 100% rename from src/kcmkwin/kwinoptions/main.cpp rename to src/kcms/options/main.cpp diff --git a/src/kcmkwin/kwinoptions/main.h b/src/kcms/options/main.h similarity index 100% rename from src/kcmkwin/kwinoptions/main.h rename to src/kcms/options/main.h diff --git a/src/kcmkwin/kwinoptions/mouse.cpp b/src/kcms/options/mouse.cpp similarity index 100% rename from src/kcmkwin/kwinoptions/mouse.cpp rename to src/kcms/options/mouse.cpp diff --git a/src/kcmkwin/kwinoptions/mouse.h b/src/kcms/options/mouse.h similarity index 100% rename from src/kcmkwin/kwinoptions/mouse.h rename to src/kcms/options/mouse.h diff --git a/src/kcmkwin/kwinoptions/mouse.ui b/src/kcms/options/mouse.ui similarity index 100% rename from src/kcmkwin/kwinoptions/mouse.ui rename to src/kcms/options/mouse.ui diff --git a/src/kcmkwin/kwinoptions/moving.ui b/src/kcms/options/moving.ui similarity index 100% rename from src/kcmkwin/kwinoptions/moving.ui rename to src/kcms/options/moving.ui diff --git a/src/kcmkwin/kwinoptions/windows.cpp b/src/kcms/options/windows.cpp similarity index 100% rename from src/kcmkwin/kwinoptions/windows.cpp rename to src/kcms/options/windows.cpp diff --git a/src/kcmkwin/kwinoptions/windows.h b/src/kcms/options/windows.h similarity index 100% rename from src/kcmkwin/kwinoptions/windows.h rename to src/kcms/options/windows.h diff --git a/src/kcmkwin/kwinrules/CMakeLists.txt b/src/kcms/rules/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwinrules/CMakeLists.txt rename to src/kcms/rules/CMakeLists.txt diff --git a/src/kcmkwin/kwinrules/Messages.sh b/src/kcms/rules/Messages.sh similarity index 100% rename from src/kcmkwin/kwinrules/Messages.sh rename to src/kcms/rules/Messages.sh diff --git a/src/kcmkwin/kwinrules/kcm_kwinrules.json b/src/kcms/rules/kcm_kwinrules.json similarity index 100% rename from src/kcmkwin/kwinrules/kcm_kwinrules.json rename to src/kcms/rules/kcm_kwinrules.json diff --git a/src/kcmkwin/kwinrules/kcmrules.cpp b/src/kcms/rules/kcmrules.cpp similarity index 100% rename from src/kcmkwin/kwinrules/kcmrules.cpp rename to src/kcms/rules/kcmrules.cpp diff --git a/src/kcmkwin/kwinrules/kcmrules.h b/src/kcms/rules/kcmrules.h similarity index 100% rename from src/kcmkwin/kwinrules/kcmrules.h rename to src/kcms/rules/kcmrules.h diff --git a/src/kcmkwin/kwinrules/kwinsrc.cpp b/src/kcms/rules/kwinsrc.cpp similarity index 100% rename from src/kcmkwin/kwinrules/kwinsrc.cpp rename to src/kcms/rules/kwinsrc.cpp diff --git a/src/kcmkwin/kwinrules/main.cpp b/src/kcms/rules/main.cpp similarity index 100% rename from src/kcmkwin/kwinrules/main.cpp rename to src/kcms/rules/main.cpp diff --git a/src/kcmkwin/kwinrules/optionsmodel.cpp b/src/kcms/rules/optionsmodel.cpp similarity index 100% rename from src/kcmkwin/kwinrules/optionsmodel.cpp rename to src/kcms/rules/optionsmodel.cpp diff --git a/src/kcmkwin/kwinrules/optionsmodel.h b/src/kcms/rules/optionsmodel.h similarity index 100% rename from src/kcmkwin/kwinrules/optionsmodel.h rename to src/kcms/rules/optionsmodel.h diff --git a/src/kcmkwin/kwinrules/org.kde.kwin_rules_dialog.desktop b/src/kcms/rules/org.kde.kwin_rules_dialog.desktop similarity index 100% rename from src/kcmkwin/kwinrules/org.kde.kwin_rules_dialog.desktop rename to src/kcms/rules/org.kde.kwin_rules_dialog.desktop diff --git a/src/kcmkwin/kwinrules/package/contents/ui/FileDialogLoader.qml b/src/kcms/rules/package/contents/ui/FileDialogLoader.qml similarity index 100% rename from src/kcmkwin/kwinrules/package/contents/ui/FileDialogLoader.qml rename to src/kcms/rules/package/contents/ui/FileDialogLoader.qml diff --git a/src/kcmkwin/kwinrules/package/contents/ui/OptionsComboBox.qml b/src/kcms/rules/package/contents/ui/OptionsComboBox.qml similarity index 100% rename from src/kcmkwin/kwinrules/package/contents/ui/OptionsComboBox.qml rename to src/kcms/rules/package/contents/ui/OptionsComboBox.qml diff --git a/src/kcmkwin/kwinrules/package/contents/ui/RuleItemDelegate.qml b/src/kcms/rules/package/contents/ui/RuleItemDelegate.qml similarity index 100% rename from src/kcmkwin/kwinrules/package/contents/ui/RuleItemDelegate.qml rename to src/kcms/rules/package/contents/ui/RuleItemDelegate.qml diff --git a/src/kcmkwin/kwinrules/package/contents/ui/RulesEditor.qml b/src/kcms/rules/package/contents/ui/RulesEditor.qml similarity index 100% rename from src/kcmkwin/kwinrules/package/contents/ui/RulesEditor.qml rename to src/kcms/rules/package/contents/ui/RulesEditor.qml diff --git a/src/kcmkwin/kwinrules/package/contents/ui/ValueEditor.qml b/src/kcms/rules/package/contents/ui/ValueEditor.qml similarity index 100% rename from src/kcmkwin/kwinrules/package/contents/ui/ValueEditor.qml rename to src/kcms/rules/package/contents/ui/ValueEditor.qml diff --git a/src/kcmkwin/kwinrules/package/contents/ui/main.qml b/src/kcms/rules/package/contents/ui/main.qml similarity index 100% rename from src/kcmkwin/kwinrules/package/contents/ui/main.qml rename to src/kcms/rules/package/contents/ui/main.qml diff --git a/src/kcmkwin/kwinrules/rulebookmodel.cpp b/src/kcms/rules/rulebookmodel.cpp similarity index 100% rename from src/kcmkwin/kwinrules/rulebookmodel.cpp rename to src/kcms/rules/rulebookmodel.cpp diff --git a/src/kcmkwin/kwinrules/rulebookmodel.h b/src/kcms/rules/rulebookmodel.h similarity index 100% rename from src/kcmkwin/kwinrules/rulebookmodel.h rename to src/kcms/rules/rulebookmodel.h diff --git a/src/kcmkwin/kwinrules/ruleitem.cpp b/src/kcms/rules/ruleitem.cpp similarity index 100% rename from src/kcmkwin/kwinrules/ruleitem.cpp rename to src/kcms/rules/ruleitem.cpp diff --git a/src/kcmkwin/kwinrules/ruleitem.h b/src/kcms/rules/ruleitem.h similarity index 100% rename from src/kcmkwin/kwinrules/ruleitem.h rename to src/kcms/rules/ruleitem.h diff --git a/src/kcmkwin/kwinrules/rulesmodel.cpp b/src/kcms/rules/rulesmodel.cpp similarity index 100% rename from src/kcmkwin/kwinrules/rulesmodel.cpp rename to src/kcms/rules/rulesmodel.cpp diff --git a/src/kcmkwin/kwinrules/rulesmodel.h b/src/kcms/rules/rulesmodel.h similarity index 100% rename from src/kcmkwin/kwinrules/rulesmodel.h rename to src/kcms/rules/rulesmodel.h diff --git a/src/kcmkwin/kwinscreenedges/CMakeLists.txt b/src/kcms/screenedges/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwinscreenedges/CMakeLists.txt rename to src/kcms/screenedges/CMakeLists.txt diff --git a/src/kcmkwin/kwinscreenedges/Messages.sh b/src/kcms/screenedges/Messages.sh similarity index 100% rename from src/kcmkwin/kwinscreenedges/Messages.sh rename to src/kcms/screenedges/Messages.sh diff --git a/src/kcmkwin/kwinscreenedges/kcm_kwinscreenedges.json b/src/kcms/screenedges/kcm_kwinscreenedges.json similarity index 100% rename from src/kcmkwin/kwinscreenedges/kcm_kwinscreenedges.json rename to src/kcms/screenedges/kcm_kwinscreenedges.json diff --git a/src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json b/src/kcms/screenedges/kcm_kwintouchscreen.json similarity index 100% rename from src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.json rename to src/kcms/screenedges/kcm_kwintouchscreen.json diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedge.cpp b/src/kcms/screenedges/kwinscreenedge.cpp similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedge.cpp rename to src/kcms/screenedges/kwinscreenedge.cpp diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedge.h b/src/kcms/screenedges/kwinscreenedge.h similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedge.h rename to src/kcms/screenedges/kwinscreenedge.h diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedgeconfigform.cpp b/src/kcms/screenedges/kwinscreenedgeconfigform.cpp similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedgeconfigform.cpp rename to src/kcms/screenedges/kwinscreenedgeconfigform.cpp diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedgeconfigform.h b/src/kcms/screenedges/kwinscreenedgeconfigform.h similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedgeconfigform.h rename to src/kcms/screenedges/kwinscreenedgeconfigform.h diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedgeeffectsettings.kcfg b/src/kcms/screenedges/kwinscreenedgeeffectsettings.kcfg similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedgeeffectsettings.kcfg rename to src/kcms/screenedges/kwinscreenedgeeffectsettings.kcfg diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedgeeffectsettings.kcfgc b/src/kcms/screenedges/kwinscreenedgeeffectsettings.kcfgc similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedgeeffectsettings.kcfgc rename to src/kcms/screenedges/kwinscreenedgeeffectsettings.kcfgc diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedgescriptsettings.kcfg b/src/kcms/screenedges/kwinscreenedgescriptsettings.kcfg similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedgescriptsettings.kcfg rename to src/kcms/screenedges/kwinscreenedgescriptsettings.kcfg diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedgescriptsettings.kcfgc b/src/kcms/screenedges/kwinscreenedgescriptsettings.kcfgc similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedgescriptsettings.kcfgc rename to src/kcms/screenedges/kwinscreenedgescriptsettings.kcfgc diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedgesettings.kcfg b/src/kcms/screenedges/kwinscreenedgesettings.kcfg similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedgesettings.kcfg rename to src/kcms/screenedges/kwinscreenedgesettings.kcfg diff --git a/src/kcmkwin/kwinscreenedges/kwinscreenedgesettings.kcfgc b/src/kcms/screenedges/kwinscreenedgesettings.kcfgc similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwinscreenedgesettings.kcfgc rename to src/kcms/screenedges/kwinscreenedgesettings.kcfgc diff --git a/src/kcmkwin/kwinscreenedges/kwintouchscreenedgeconfigform.cpp b/src/kcms/screenedges/kwintouchscreenedgeconfigform.cpp similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwintouchscreenedgeconfigform.cpp rename to src/kcms/screenedges/kwintouchscreenedgeconfigform.cpp diff --git a/src/kcmkwin/kwinscreenedges/kwintouchscreenedgeconfigform.h b/src/kcms/screenedges/kwintouchscreenedgeconfigform.h similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwintouchscreenedgeconfigform.h rename to src/kcms/screenedges/kwintouchscreenedgeconfigform.h diff --git a/src/kcmkwin/kwinscreenedges/kwintouchscreenedgeeffectsettings.kcfg b/src/kcms/screenedges/kwintouchscreenedgeeffectsettings.kcfg similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwintouchscreenedgeeffectsettings.kcfg rename to src/kcms/screenedges/kwintouchscreenedgeeffectsettings.kcfg diff --git a/src/kcmkwin/kwinscreenedges/kwintouchscreenedgeeffectsettings.kcfgc b/src/kcms/screenedges/kwintouchscreenedgeeffectsettings.kcfgc similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwintouchscreenedgeeffectsettings.kcfgc rename to src/kcms/screenedges/kwintouchscreenedgeeffectsettings.kcfgc diff --git a/src/kcmkwin/kwinscreenedges/kwintouchscreenscriptsettings.kcfg b/src/kcms/screenedges/kwintouchscreenscriptsettings.kcfg similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwintouchscreenscriptsettings.kcfg rename to src/kcms/screenedges/kwintouchscreenscriptsettings.kcfg diff --git a/src/kcmkwin/kwinscreenedges/kwintouchscreenscriptsettings.kcfgc b/src/kcms/screenedges/kwintouchscreenscriptsettings.kcfgc similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwintouchscreenscriptsettings.kcfgc rename to src/kcms/screenedges/kwintouchscreenscriptsettings.kcfgc diff --git a/src/kcmkwin/kwinscreenedges/kwintouchscreensettings.kcfg b/src/kcms/screenedges/kwintouchscreensettings.kcfg similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwintouchscreensettings.kcfg rename to src/kcms/screenedges/kwintouchscreensettings.kcfg diff --git a/src/kcmkwin/kwinscreenedges/kwintouchscreensettings.kcfgc b/src/kcms/screenedges/kwintouchscreensettings.kcfgc similarity index 100% rename from src/kcmkwin/kwinscreenedges/kwintouchscreensettings.kcfgc rename to src/kcms/screenedges/kwintouchscreensettings.kcfgc diff --git a/src/kcmkwin/kwinscreenedges/main.cpp b/src/kcms/screenedges/main.cpp similarity index 100% rename from src/kcmkwin/kwinscreenedges/main.cpp rename to src/kcms/screenedges/main.cpp diff --git a/src/kcmkwin/kwinscreenedges/main.h b/src/kcms/screenedges/main.h similarity index 100% rename from src/kcmkwin/kwinscreenedges/main.h rename to src/kcms/screenedges/main.h diff --git a/src/kcmkwin/kwinscreenedges/main.ui b/src/kcms/screenedges/main.ui similarity index 100% rename from src/kcmkwin/kwinscreenedges/main.ui rename to src/kcms/screenedges/main.ui diff --git a/src/kcmkwin/kwinscreenedges/monitor.cpp b/src/kcms/screenedges/monitor.cpp similarity index 100% rename from src/kcmkwin/kwinscreenedges/monitor.cpp rename to src/kcms/screenedges/monitor.cpp diff --git a/src/kcmkwin/kwinscreenedges/monitor.h b/src/kcms/screenedges/monitor.h similarity index 100% rename from src/kcmkwin/kwinscreenedges/monitor.h rename to src/kcms/screenedges/monitor.h diff --git a/src/kcmkwin/kwinscreenedges/screenpreviewwidget.cpp b/src/kcms/screenedges/screenpreviewwidget.cpp similarity index 100% rename from src/kcmkwin/kwinscreenedges/screenpreviewwidget.cpp rename to src/kcms/screenedges/screenpreviewwidget.cpp diff --git a/src/kcmkwin/kwinscreenedges/screenpreviewwidget.h b/src/kcms/screenedges/screenpreviewwidget.h similarity index 100% rename from src/kcmkwin/kwinscreenedges/screenpreviewwidget.h rename to src/kcms/screenedges/screenpreviewwidget.h diff --git a/src/kcmkwin/kwinscreenedges/touch.cpp b/src/kcms/screenedges/touch.cpp similarity index 100% rename from src/kcmkwin/kwinscreenedges/touch.cpp rename to src/kcms/screenedges/touch.cpp diff --git a/src/kcmkwin/kwinscreenedges/touch.h b/src/kcms/screenedges/touch.h similarity index 100% rename from src/kcmkwin/kwinscreenedges/touch.h rename to src/kcms/screenedges/touch.h diff --git a/src/kcmkwin/kwinscreenedges/touch.ui b/src/kcms/screenedges/touch.ui similarity index 100% rename from src/kcmkwin/kwinscreenedges/touch.ui rename to src/kcms/screenedges/touch.ui diff --git a/src/kcmkwin/kwinscripts/CMakeLists.txt b/src/kcms/scripts/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwinscripts/CMakeLists.txt rename to src/kcms/scripts/CMakeLists.txt diff --git a/src/kcmkwin/kwinscripts/Messages.sh b/src/kcms/scripts/Messages.sh similarity index 100% rename from src/kcmkwin/kwinscripts/Messages.sh rename to src/kcms/scripts/Messages.sh diff --git a/src/kcmkwin/kwinscripts/kcm_kwin_scripts.json b/src/kcms/scripts/kcm_kwin_scripts.json similarity index 100% rename from src/kcmkwin/kwinscripts/kcm_kwin_scripts.json rename to src/kcms/scripts/kcm_kwin_scripts.json diff --git a/src/kcmkwin/kwinscripts/kwinscripts.knsrc b/src/kcms/scripts/kwinscripts.knsrc similarity index 100% rename from src/kcmkwin/kwinscripts/kwinscripts.knsrc rename to src/kcms/scripts/kwinscripts.knsrc diff --git a/src/kcmkwin/kwinscripts/kwinscriptsdata.cpp b/src/kcms/scripts/kwinscriptsdata.cpp similarity index 100% rename from src/kcmkwin/kwinscripts/kwinscriptsdata.cpp rename to src/kcms/scripts/kwinscriptsdata.cpp diff --git a/src/kcmkwin/kwinscripts/kwinscriptsdata.h b/src/kcms/scripts/kwinscriptsdata.h similarity index 100% rename from src/kcmkwin/kwinscripts/kwinscriptsdata.h rename to src/kcms/scripts/kwinscriptsdata.h diff --git a/src/kcmkwin/kwinscripts/module.cpp b/src/kcms/scripts/module.cpp similarity index 100% rename from src/kcmkwin/kwinscripts/module.cpp rename to src/kcms/scripts/module.cpp diff --git a/src/kcmkwin/kwinscripts/module.h b/src/kcms/scripts/module.h similarity index 100% rename from src/kcmkwin/kwinscripts/module.h rename to src/kcms/scripts/module.h diff --git a/src/kcmkwin/kwinscripts/package/contents/ui/main.qml b/src/kcms/scripts/package/contents/ui/main.qml similarity index 100% rename from src/kcmkwin/kwinscripts/package/contents/ui/main.qml rename to src/kcms/scripts/package/contents/ui/main.qml diff --git a/src/kcmkwin/kwintabbox/CMakeLists.txt b/src/kcms/tabbox/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwintabbox/CMakeLists.txt rename to src/kcms/tabbox/CMakeLists.txt diff --git a/src/kcmkwin/kwintabbox/Messages.sh b/src/kcms/tabbox/Messages.sh similarity index 100% rename from src/kcmkwin/kwintabbox/Messages.sh rename to src/kcms/tabbox/Messages.sh diff --git a/src/kcmkwin/kwintabbox/kcm_kwintabbox.json b/src/kcms/tabbox/kcm_kwintabbox.json similarity index 100% rename from src/kcmkwin/kwintabbox/kcm_kwintabbox.json rename to src/kcms/tabbox/kcm_kwintabbox.json diff --git a/src/kcmkwin/kwintabbox/kwinpluginssettings.kcfg b/src/kcms/tabbox/kwinpluginssettings.kcfg similarity index 100% rename from src/kcmkwin/kwintabbox/kwinpluginssettings.kcfg rename to src/kcms/tabbox/kwinpluginssettings.kcfg diff --git a/src/kcmkwin/kwintabbox/kwinpluginssettings.kcfgc b/src/kcms/tabbox/kwinpluginssettings.kcfgc similarity index 100% rename from src/kcmkwin/kwintabbox/kwinpluginssettings.kcfgc rename to src/kcms/tabbox/kwinpluginssettings.kcfgc diff --git a/src/kcmkwin/kwintabbox/kwinswitcheffectsettings.kcfg b/src/kcms/tabbox/kwinswitcheffectsettings.kcfg similarity index 100% rename from src/kcmkwin/kwintabbox/kwinswitcheffectsettings.kcfg rename to src/kcms/tabbox/kwinswitcheffectsettings.kcfg diff --git a/src/kcmkwin/kwintabbox/kwinswitcheffectsettings.kcfgc b/src/kcms/tabbox/kwinswitcheffectsettings.kcfgc similarity index 100% rename from src/kcmkwin/kwintabbox/kwinswitcheffectsettings.kcfgc rename to src/kcms/tabbox/kwinswitcheffectsettings.kcfgc diff --git a/src/kcmkwin/kwintabbox/kwinswitcher.knsrc b/src/kcms/tabbox/kwinswitcher.knsrc similarity index 100% rename from src/kcmkwin/kwintabbox/kwinswitcher.knsrc rename to src/kcms/tabbox/kwinswitcher.knsrc diff --git a/src/kcmkwin/kwintabbox/kwintabboxconfigform.cpp b/src/kcms/tabbox/kwintabboxconfigform.cpp similarity index 100% rename from src/kcmkwin/kwintabbox/kwintabboxconfigform.cpp rename to src/kcms/tabbox/kwintabboxconfigform.cpp diff --git a/src/kcmkwin/kwintabbox/kwintabboxconfigform.h b/src/kcms/tabbox/kwintabboxconfigform.h similarity index 100% rename from src/kcmkwin/kwintabbox/kwintabboxconfigform.h rename to src/kcms/tabbox/kwintabboxconfigform.h diff --git a/src/kcmkwin/kwintabbox/kwintabboxdata.cpp b/src/kcms/tabbox/kwintabboxdata.cpp similarity index 100% rename from src/kcmkwin/kwintabbox/kwintabboxdata.cpp rename to src/kcms/tabbox/kwintabboxdata.cpp diff --git a/src/kcmkwin/kwintabbox/kwintabboxdata.h b/src/kcms/tabbox/kwintabboxdata.h similarity index 100% rename from src/kcmkwin/kwintabbox/kwintabboxdata.h rename to src/kcms/tabbox/kwintabboxdata.h diff --git a/src/kcmkwin/kwintabbox/kwintabboxsettings.kcfg b/src/kcms/tabbox/kwintabboxsettings.kcfg similarity index 100% rename from src/kcmkwin/kwintabbox/kwintabboxsettings.kcfg rename to src/kcms/tabbox/kwintabboxsettings.kcfg diff --git a/src/kcmkwin/kwintabbox/kwintabboxsettings.kcfgc b/src/kcms/tabbox/kwintabboxsettings.kcfgc similarity index 100% rename from src/kcmkwin/kwintabbox/kwintabboxsettings.kcfgc rename to src/kcms/tabbox/kwintabboxsettings.kcfgc diff --git a/src/kcmkwin/kwintabbox/layoutpreview.cpp b/src/kcms/tabbox/layoutpreview.cpp similarity index 100% rename from src/kcmkwin/kwintabbox/layoutpreview.cpp rename to src/kcms/tabbox/layoutpreview.cpp diff --git a/src/kcmkwin/kwintabbox/layoutpreview.h b/src/kcms/tabbox/layoutpreview.h similarity index 100% rename from src/kcmkwin/kwintabbox/layoutpreview.h rename to src/kcms/tabbox/layoutpreview.h diff --git a/src/kcmkwin/kwintabbox/main.cpp b/src/kcms/tabbox/main.cpp similarity index 100% rename from src/kcmkwin/kwintabbox/main.cpp rename to src/kcms/tabbox/main.cpp diff --git a/src/kcmkwin/kwintabbox/main.h b/src/kcms/tabbox/main.h similarity index 100% rename from src/kcmkwin/kwintabbox/main.h rename to src/kcms/tabbox/main.h diff --git a/src/kcmkwin/kwintabbox/main.ui b/src/kcms/tabbox/main.ui similarity index 100% rename from src/kcmkwin/kwintabbox/main.ui rename to src/kcms/tabbox/main.ui diff --git a/src/kcmkwin/kwintabbox/thumbnailitem.cpp b/src/kcms/tabbox/thumbnailitem.cpp similarity index 100% rename from src/kcmkwin/kwintabbox/thumbnailitem.cpp rename to src/kcms/tabbox/thumbnailitem.cpp diff --git a/src/kcmkwin/kwintabbox/thumbnailitem.h b/src/kcms/tabbox/thumbnailitem.h similarity index 100% rename from src/kcmkwin/kwintabbox/thumbnailitem.h rename to src/kcms/tabbox/thumbnailitem.h diff --git a/src/kcmkwin/kwintabbox/thumbnails/desktop.png b/src/kcms/tabbox/thumbnails/desktop.png similarity index 100% rename from src/kcmkwin/kwintabbox/thumbnails/desktop.png rename to src/kcms/tabbox/thumbnails/desktop.png diff --git a/src/kcmkwin/kwintabbox/thumbnails/dolphin.png b/src/kcms/tabbox/thumbnails/dolphin.png similarity index 100% rename from src/kcmkwin/kwintabbox/thumbnails/dolphin.png rename to src/kcms/tabbox/thumbnails/dolphin.png diff --git a/src/kcmkwin/kwintabbox/thumbnails/kmail.png b/src/kcms/tabbox/thumbnails/kmail.png similarity index 100% rename from src/kcmkwin/kwintabbox/thumbnails/kmail.png rename to src/kcms/tabbox/thumbnails/kmail.png diff --git a/src/kcmkwin/kwintabbox/thumbnails/konqueror.png b/src/kcms/tabbox/thumbnails/konqueror.png similarity index 100% rename from src/kcmkwin/kwintabbox/thumbnails/konqueror.png rename to src/kcms/tabbox/thumbnails/konqueror.png diff --git a/src/kcmkwin/kwintabbox/thumbnails/systemsettings.png b/src/kcms/tabbox/thumbnails/systemsettings.png similarity index 100% rename from src/kcmkwin/kwintabbox/thumbnails/systemsettings.png rename to src/kcms/tabbox/thumbnails/systemsettings.png diff --git a/src/kcmkwin/kwinvirtualkeyboard/CMakeLists.txt b/src/kcms/virtualkeyboard/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwinvirtualkeyboard/CMakeLists.txt rename to src/kcms/virtualkeyboard/CMakeLists.txt diff --git a/src/kcmkwin/kwinvirtualkeyboard/Messages.sh b/src/kcms/virtualkeyboard/Messages.sh similarity index 100% rename from src/kcmkwin/kwinvirtualkeyboard/Messages.sh rename to src/kcms/virtualkeyboard/Messages.sh diff --git a/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.json b/src/kcms/virtualkeyboard/kcm_virtualkeyboard.json similarity index 100% rename from src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.json rename to src/kcms/virtualkeyboard/kcm_virtualkeyboard.json diff --git a/src/kcmkwin/kwinvirtualkeyboard/kcmvirtualkeyboard.cpp b/src/kcms/virtualkeyboard/kcmvirtualkeyboard.cpp similarity index 100% rename from src/kcmkwin/kwinvirtualkeyboard/kcmvirtualkeyboard.cpp rename to src/kcms/virtualkeyboard/kcmvirtualkeyboard.cpp diff --git a/src/kcmkwin/kwinvirtualkeyboard/kcmvirtualkeyboard.h b/src/kcms/virtualkeyboard/kcmvirtualkeyboard.h similarity index 100% rename from src/kcmkwin/kwinvirtualkeyboard/kcmvirtualkeyboard.h rename to src/kcms/virtualkeyboard/kcmvirtualkeyboard.h diff --git a/src/kcmkwin/kwinvirtualkeyboard/package/contents/ui/main.qml b/src/kcms/virtualkeyboard/package/contents/ui/main.qml similarity index 100% rename from src/kcmkwin/kwinvirtualkeyboard/package/contents/ui/main.qml rename to src/kcms/virtualkeyboard/package/contents/ui/main.qml diff --git a/src/kcmkwin/kwinvirtualkeyboard/virtualkeyboardsettings.kcfg b/src/kcms/virtualkeyboard/virtualkeyboardsettings.kcfg similarity index 100% rename from src/kcmkwin/kwinvirtualkeyboard/virtualkeyboardsettings.kcfg rename to src/kcms/virtualkeyboard/virtualkeyboardsettings.kcfg diff --git a/src/kcmkwin/kwinvirtualkeyboard/virtualkeyboardsettings.kcfgc b/src/kcms/virtualkeyboard/virtualkeyboardsettings.kcfgc similarity index 100% rename from src/kcmkwin/kwinvirtualkeyboard/virtualkeyboardsettings.kcfgc rename to src/kcms/virtualkeyboard/virtualkeyboardsettings.kcfgc diff --git a/src/kcmkwin/kwinxwayland/CMakeLists.txt b/src/kcms/xwayland/CMakeLists.txt similarity index 100% rename from src/kcmkwin/kwinxwayland/CMakeLists.txt rename to src/kcms/xwayland/CMakeLists.txt diff --git a/src/kcmkwin/kwinxwayland/Messages.sh b/src/kcms/xwayland/Messages.sh similarity index 100% rename from src/kcmkwin/kwinxwayland/Messages.sh rename to src/kcms/xwayland/Messages.sh diff --git a/src/kcmkwin/kwinxwayland/kcm_kwinxwayland.json b/src/kcms/xwayland/kcm_kwinxwayland.json similarity index 100% rename from src/kcmkwin/kwinxwayland/kcm_kwinxwayland.json rename to src/kcms/xwayland/kcm_kwinxwayland.json diff --git a/src/kcmkwin/kwinxwayland/kcmkwinxwayland.cpp b/src/kcms/xwayland/kcmkwinxwayland.cpp similarity index 100% rename from src/kcmkwin/kwinxwayland/kcmkwinxwayland.cpp rename to src/kcms/xwayland/kcmkwinxwayland.cpp diff --git a/src/kcmkwin/kwinxwayland/kcmkwinxwayland.h b/src/kcms/xwayland/kcmkwinxwayland.h similarity index 100% rename from src/kcmkwin/kwinxwayland/kcmkwinxwayland.h rename to src/kcms/xwayland/kcmkwinxwayland.h diff --git a/src/kcmkwin/kwinxwayland/kwinxwaylandsettings.kcfg b/src/kcms/xwayland/kwinxwaylandsettings.kcfg similarity index 100% rename from src/kcmkwin/kwinxwayland/kwinxwaylandsettings.kcfg rename to src/kcms/xwayland/kwinxwaylandsettings.kcfg diff --git a/src/kcmkwin/kwinxwayland/kwinxwaylandsettings.kcfgc b/src/kcms/xwayland/kwinxwaylandsettings.kcfgc similarity index 100% rename from src/kcmkwin/kwinxwayland/kwinxwaylandsettings.kcfgc rename to src/kcms/xwayland/kwinxwaylandsettings.kcfgc diff --git a/src/kcmkwin/kwinxwayland/package/contents/ui/main.qml b/src/kcms/xwayland/package/contents/ui/main.qml similarity index 100% rename from src/kcmkwin/kwinxwayland/package/contents/ui/main.qml rename to src/kcms/xwayland/package/contents/ui/main.qml