From aef8ba8d1a127ba93e77746321e021ea03c8d38b Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Tue, 22 Feb 2022 16:47:43 +0100 Subject: [PATCH] Port KComboBox to QComboBox None of the features it adds ontop of `QComboBox` are used. Allows to drop the dependency on KCompletion. Signed-off-by: Eike Hein --- CMakeLists.txt | 1 - src/effects/desktopgrid/CMakeLists.txt | 1 - .../desktopgrid/desktopgrid_config.cpp | 4 +-- src/effects/desktopgrid/desktopgrid_config.ui | 9 ++---- src/effects/presentwindows/CMakeLists.txt | 1 - .../presentwindows/presentwindows_config.ui | 19 +++++------- src/effects/showfps/CMakeLists.txt | 1 - src/effects/showfps/showfps_config.ui | 7 +---- src/kcmkwin/kwinoptions/CMakeLists.txt | 2 +- src/kcmkwin/kwinoptions/actions.ui | 25 ++++++---------- src/kcmkwin/kwinoptions/advanced.ui | 9 +----- src/kcmkwin/kwinoptions/focus.ui | 9 +----- src/kcmkwin/kwinoptions/mouse.ui | 29 +++++++------------ src/kcmkwin/kwinoptions/windows.cpp | 1 - src/kcmkwin/kwinoptions/windows.h | 1 - src/kcmkwin/kwinscreenedges/CMakeLists.txt | 1 - src/kcmkwin/kwinscreenedges/main.ui | 7 +---- src/kcmkwin/kwintabbox/CMakeLists.txt | 1 - src/kcmkwin/kwintabbox/main.ui | 7 +---- 19 files changed, 37 insertions(+), 98 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b2bb7572f0..f667844443 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS ) # required frameworks by config modules find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - Completion Declarative KCMUtils NewStuff diff --git a/src/effects/desktopgrid/CMakeLists.txt b/src/effects/desktopgrid/CMakeLists.txt index e23b022cce..ca0d1a5c18 100644 --- a/src/effects/desktopgrid/CMakeLists.txt +++ b/src/effects/desktopgrid/CMakeLists.txt @@ -31,7 +31,6 @@ kconfig_add_kcfg_files(kwin_desktopgrid_config_SRCS desktopgridconfig.kcfgc) kwin_add_effect_config(kwin_desktopgrid_config ${kwin_desktopgrid_config_SRCS}) target_link_libraries(kwin_desktopgrid_config - KF5::Completion KF5::ConfigWidgets KF5::CoreAddons KF5::GlobalAccel diff --git a/src/effects/desktopgrid/desktopgrid_config.cpp b/src/effects/desktopgrid/desktopgrid_config.cpp index 43f1c291d6..d292b0a42a 100644 --- a/src/effects/desktopgrid/desktopgrid_config.cpp +++ b/src/effects/desktopgrid/desktopgrid_config.cpp @@ -75,8 +75,8 @@ DesktopGridEffectConfig::DesktopGridEffectConfig(QWidget* parent, const QVariant DesktopGridConfig::instance(KWIN_CONFIG); addConfig(DesktopGridConfig::self(), m_ui); - connect(m_ui->kcfg_LayoutMode, qOverload(&KComboBox::currentIndexChanged), this, &DesktopGridEffectConfig::layoutSelectionChanged); - connect(m_ui->desktopNameAlignmentCombo, qOverload(&KComboBox::currentIndexChanged), this, &DesktopGridEffectConfig::markAsChanged); + connect(m_ui->kcfg_LayoutMode, qOverload(&QComboBox::currentIndexChanged), this, &DesktopGridEffectConfig::layoutSelectionChanged); + connect(m_ui->desktopNameAlignmentCombo, qOverload(&QComboBox::currentIndexChanged), this, &DesktopGridEffectConfig::markAsChanged); connect(m_ui->clickBehaviorButtonGroup, qOverload(&QButtonGroup::buttonClicked), this, &DesktopGridEffectConfig::markAsChanged); connect(m_ui->shortcutEditor, &KShortcutsEditor::keyChange, this, &DesktopGridEffectConfig::markAsChanged); diff --git a/src/effects/desktopgrid/desktopgrid_config.ui b/src/effects/desktopgrid/desktopgrid_config.ui index 67d1c94b4a..d632c31005 100644 --- a/src/effects/desktopgrid/desktopgrid_config.ui +++ b/src/effects/desktopgrid/desktopgrid_config.ui @@ -92,7 +92,7 @@ - + 0 @@ -115,7 +115,7 @@ - + 0 @@ -255,11 +255,6 @@ - - KComboBox - QComboBox -
kcombobox.h
- KShortcutsEditor QWidget diff --git a/src/effects/presentwindows/CMakeLists.txt b/src/effects/presentwindows/CMakeLists.txt index a6ca650990..bfb7700482 100644 --- a/src/effects/presentwindows/CMakeLists.txt +++ b/src/effects/presentwindows/CMakeLists.txt @@ -34,7 +34,6 @@ kconfig_add_kcfg_files(kwin_presentwindows_config_SRCS presentwindowsconfig.kcfg kwin_add_effect_config(kwin_presentwindows_config ${kwin_presentwindows_config_SRCS}) target_link_libraries(kwin_presentwindows_config - KF5::Completion KF5::ConfigWidgets KF5::CoreAddons KF5::GlobalAccel diff --git a/src/effects/presentwindows/presentwindows_config.ui b/src/effects/presentwindows/presentwindows_config.ui index acd8730370..ceb4f9928c 100644 --- a/src/effects/presentwindows/presentwindows_config.ui +++ b/src/effects/presentwindows/presentwindows_config.ui @@ -133,7 +133,7 @@ - + No action @@ -177,7 +177,7 @@ - + No action @@ -226,7 +226,7 @@ - + No action @@ -287,7 +287,7 @@ - + No action @@ -321,7 +321,7 @@ - + No action @@ -355,7 +355,7 @@ - + No action @@ -429,7 +429,7 @@ - + 0 @@ -466,11 +466,6 @@ - - KComboBox - QComboBox -
kcombobox.h
- KShortcutsEditor QWidget diff --git a/src/effects/showfps/CMakeLists.txt b/src/effects/showfps/CMakeLists.txt index ecae36e2af..cb34889f81 100644 --- a/src/effects/showfps/CMakeLists.txt +++ b/src/effects/showfps/CMakeLists.txt @@ -28,7 +28,6 @@ kconfig_add_kcfg_files(kwin_showfps_config_SRCS showfpsconfig.kcfgc) kwin_add_effect_config(kwin_showfps_config ${kwin_showfps_config_SRCS}) target_link_libraries(kwin_showfps_config - KF5::Completion KF5::ConfigWidgets KF5::CoreAddons KF5::I18n diff --git a/src/effects/showfps/showfps_config.ui b/src/effects/showfps/showfps_config.ui index 0a5eb31305..8fbd5f79df 100644 --- a/src/effects/showfps/showfps_config.ui +++ b/src/effects/showfps/showfps_config.ui @@ -31,7 +31,7 @@ - + 0 @@ -164,11 +164,6 @@ QWidget
kfontrequester.h
- - KComboBox - QComboBox -
kcombobox.h
- diff --git a/src/kcmkwin/kwinoptions/CMakeLists.txt b/src/kcmkwin/kwinoptions/CMakeLists.txt index 24c69dce78..677080f120 100644 --- a/src/kcmkwin/kwinoptions/CMakeLists.txt +++ b/src/kcmkwin/kwinoptions/CMakeLists.txt @@ -29,7 +29,7 @@ kconfig_add_kcfg_files(kcm_kwinoptions_PART_SRCS kwinoptions_kdeglobals_settings qt_add_dbus_interface(kcm_kwinoptions_PART_SRCS ${KWin_SOURCE_DIR}/src/org.kde.kwin.Effects.xml kwin_effects_interface) add_library(kcm_kwinoptions MODULE ${kcm_kwinoptions_PART_SRCS}) -target_link_libraries(kcm_kwinoptions kwin Qt::DBus KF5::KCMUtils KF5::Completion KF5::I18n KF5::ConfigWidgets KF5::Service KF5::WindowSystem) +target_link_libraries(kcm_kwinoptions kwin Qt::DBus KF5::KCMUtils KF5::I18n KF5::ConfigWidgets KF5::Service KF5::WindowSystem) install(TARGETS kcm_kwinoptions DESTINATION ${KDE_INSTALL_PLUGINDIR}) ########### install files ############### diff --git a/src/kcmkwin/kwinoptions/actions.ui b/src/kcmkwin/kwinoptions/actions.ui index 7614c51289..7f84a587b0 100644 --- a/src/kcmkwin/kwinoptions/actions.ui +++ b/src/kcmkwin/kwinoptions/actions.ui @@ -34,7 +34,7 @@ - + In this row you can customize left click behavior when clicking into an inactive inner window ('inner' means: not titlebar, not frame). @@ -74,7 +74,7 @@ - + In this row you can customize middle click behavior when clicking into an inactive inner window ('inner' means: not titlebar, not frame). @@ -114,7 +114,7 @@ - + In this row you can customize right click behavior when clicking into an inactive inner window ('inner' means: not titlebar, not frame). @@ -154,7 +154,7 @@ - + In this row you can customize behavior when scrolling into an inactive inner window ('inner' means: not titlebar, not frame). @@ -200,7 +200,7 @@ - + Here you select whether holding the Meta key or Alt key will allow you to perform the following actions. @@ -256,7 +256,7 @@ - + In this row you can customize left click behavior when clicking into the titlebar or the frame. @@ -326,7 +326,7 @@ - + In this row you can customize middle click behavior when clicking into the titlebar or the frame. @@ -396,7 +396,7 @@ - + In this row you can customize right click behavior when clicking into the titlebar or the frame. @@ -466,7 +466,7 @@ - + Here you can customize KDE's behavior when scrolling with the mouse wheel in a window while pressing the modifier key. @@ -527,13 +527,6 @@ - - - KComboBox - QComboBox -
kcombobox.h
- - diff --git a/src/kcmkwin/kwinoptions/advanced.ui b/src/kcmkwin/kwinoptions/advanced.ui index 2d7e21931c..ae519802a9 100644 --- a/src/kcmkwin/kwinoptions/advanced.ui +++ b/src/kcmkwin/kwinoptions/advanced.ui @@ -71,7 +71,7 @@ - + <html><head/><body><p>The placement policy determines where a new window will appear on the desktop.</p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Smart</span> will try to achieve a minimum overlap of windows</li><li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Maximizing</span> will try to maximize every window to fill the whole screen. It might be useful to selectively affect placement of some windows using the window-specific settings.</li><li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Cascade</span> will cascade the windows</li><li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Random</span> will use a random position</li><li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Centered</span> will place the window centered</li><li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Zero-cornered</span> will place the window in the top-left corner</li><li style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Under mouse</span> will place the window under the pointer</li></ul></body></html> @@ -144,13 +144,6 @@ - - - KComboBox - QComboBox -
kcombobox.h
- - diff --git a/src/kcmkwin/kwinoptions/focus.ui b/src/kcmkwin/kwinoptions/focus.ui index b1a8b8c04e..eaef6270af 100644 --- a/src/kcmkwin/kwinoptions/focus.ui +++ b/src/kcmkwin/kwinoptions/focus.ui @@ -109,7 +109,7 @@ - + <html><head/><body><p>This option specifies how much KWin will try to prevent unwanted focus stealing caused by unexpected activation of new windows. (Note: This feature does not work with the <span style=" font-style:italic;">Focus under mouse</span> or <span style=" font-style:italic;">Focus strictly under mouse</span> focus policies.) </p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">None:</span> Prevention is turned off and new windows always become activated.</li><li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Low:</span> Prevention is enabled; when some window does not have support for the underlying mechanism and KWin cannot reliably decide whether to activate the window or not, it will be activated. This setting may have both worse and better results than the medium level, depending on the applications.</li><li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Medium:</span> Prevention is enabled.</li><li style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">High:</span> New windows get activated only if no window is currently active or if they belong to the currently active application. This setting is probably not really usable when not using mouse focus policy.</li><li style=" margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Extreme:</span> All windows must be explicitly activated by the user.</li></ul><p>Windows that are prevented from stealing focus are marked as demanding attention, which by default means their taskbar entry will be highlighted. This can be changed in the Notifications control module.</p></body></html> @@ -253,13 +253,6 @@ - - - KComboBox - QComboBox -
kcombobox.h
- - diff --git a/src/kcmkwin/kwinoptions/mouse.ui b/src/kcmkwin/kwinoptions/mouse.ui index 6fed1c1a28..1f55328808 100644 --- a/src/kcmkwin/kwinoptions/mouse.ui +++ b/src/kcmkwin/kwinoptions/mouse.ui @@ -31,7 +31,7 @@ - + Behavior on <em>double</em> click into the titlebar. @@ -93,7 +93,7 @@ - + Behavior on <em>mouse wheel</em> scroll over the titlebar. @@ -221,7 +221,7 @@ - + 0 @@ -274,7 +274,7 @@ - + Behavior on <em>left</em> click into the titlebar or frame of an <em>inactive</em> window. @@ -336,7 +336,7 @@ - + 0 @@ -389,7 +389,7 @@ - + Behavior on <em>left</em> click into the titlebar or frame of an <em>inactive</em> window. @@ -451,7 +451,7 @@ - + 0 @@ -504,7 +504,7 @@ - + Behavior on <em>left</em> click into the titlebar or frame of an <em>inactive</em> window. @@ -606,7 +606,7 @@ - + Behavior on <em>left</em> click onto the maximize button. @@ -641,7 +641,7 @@ - + Behavior on <em>middle</em> click onto the maximize button. @@ -676,7 +676,7 @@ - + Behavior on <em>right</em> click onto the maximize button. @@ -715,13 +715,6 @@ - - - KComboBox - QComboBox -
kcombobox.h
- - kcfg_TitlebarDoubleClickCommand kcfg_CommandTitlebarWheel diff --git a/src/kcmkwin/kwinoptions/windows.cpp b/src/kcmkwin/kwinoptions/windows.cpp index e051a01244..e169e88036 100644 --- a/src/kcmkwin/kwinoptions/windows.cpp +++ b/src/kcmkwin/kwinoptions/windows.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff --git a/src/kcmkwin/kwinoptions/windows.h b/src/kcmkwin/kwinoptions/windows.h index 1e890757a3..a39716aeb4 100644 --- a/src/kcmkwin/kwinoptions/windows.h +++ b/src/kcmkwin/kwinoptions/windows.h @@ -20,7 +20,6 @@ class QRadioButton; class QCheckBox; class QPushButton; -class KComboBox; class QGroupBox; class QLabel; class QSlider; diff --git a/src/kcmkwin/kwinscreenedges/CMakeLists.txt b/src/kcmkwin/kwinscreenedges/CMakeLists.txt index f3706407ea..77de9abc0f 100644 --- a/src/kcmkwin/kwinscreenedges/CMakeLists.txt +++ b/src/kcmkwin/kwinscreenedges/CMakeLists.txt @@ -28,7 +28,6 @@ add_library(kcm_kwinscreenedges MODULE ${kcm_kwinscreenedges_PART_SRCS}) set(kcm_screenedges_LIBS Qt::DBus - KF5::Completion KF5::ConfigCore KF5::ConfigWidgets KF5::KCMUtils diff --git a/src/kcmkwin/kwinscreenedges/main.ui b/src/kcmkwin/kwinscreenedges/main.ui index 3a08189510..bd5700687c 100644 --- a/src/kcmkwin/kwinscreenedges/main.ui +++ b/src/kcmkwin/kwinscreenedges/main.ui @@ -152,7 +152,7 @@ - + Disabled @@ -265,11 +265,6 @@ - - KComboBox - QComboBox -
kcombobox.h
- KWin::Monitor QWidget diff --git a/src/kcmkwin/kwintabbox/CMakeLists.txt b/src/kcmkwin/kwintabbox/CMakeLists.txt index d45fba736c..fbf102ec66 100644 --- a/src/kcmkwin/kwintabbox/CMakeLists.txt +++ b/src/kcmkwin/kwintabbox/CMakeLists.txt @@ -23,7 +23,6 @@ add_library(kcm_kwintabbox MODULE ${kcm_kwintabbox_PART_SRCS}) target_link_libraries(kcm_kwintabbox Qt::Quick - KF5::Completion KF5::GlobalAccel KF5::I18n KF5::KCMUtils diff --git a/src/kcmkwin/kwintabbox/main.ui b/src/kcmkwin/kwintabbox/main.ui index e702e358be..84c4a90bbe 100644 --- a/src/kcmkwin/kwintabbox/main.ui +++ b/src/kcmkwin/kwintabbox/main.ui @@ -43,7 +43,7 @@ - + 0 @@ -586,11 +586,6 @@ QWidget
kkeysequencewidget.h
- - KComboBox - QComboBox -
kcombobox.h
- kcfg_HighlightWindows