From 783881edaaebe931953b203eaefad52d960c3f55 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 27 Aug 2024 14:53:48 +0200 Subject: [PATCH] [keyboard] Rename confusing overloaded function --- src/modules/keyboard/Config.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp index f3b9a4595..d1d480f83 100644 --- a/src/modules/keyboard/Config.cpp +++ b/src/modules/keyboard/Config.cpp @@ -57,9 +57,9 @@ xkbmap_layout_args( const QString& layout, const QString& variant ) } static QStringList -xkbmap_layout_args( const QStringList& layouts, - const QStringList& variants, - const QString& switchOption = "grp:alt_shift_toggle" ) +xkbmap_layout_args_with_group_switch( const QStringList& layouts, + const QStringList& variants, + const QString& switchOption ) { if ( layouts.size() != variants.size() ) { @@ -302,10 +302,11 @@ Config::xkbApply() m_additionalLayoutInfo.groupSwitcher = "grp:alt_shift_toggle"; } - QProcess::execute( "setxkbmap", - xkbmap_layout_args( { m_additionalLayoutInfo.additionalLayout, m_selectedLayout }, - { m_additionalLayoutInfo.additionalVariant, m_selectedVariant }, - m_additionalLayoutInfo.groupSwitcher ) ); + QProcess::execute( + "setxkbmap", + xkbmap_layout_args_with_group_switch( { m_additionalLayoutInfo.additionalLayout, m_selectedLayout }, + { m_additionalLayoutInfo.additionalVariant, m_selectedVariant }, + m_additionalLayoutInfo.groupSwitcher ) ); cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant << "(added " << m_additionalLayoutInfo.additionalLayout << "-" << m_additionalLayoutInfo.additionalVariant