From 6667ea834feba460b2adceabc435dc09e55644d3 Mon Sep 17 00:00:00 2001 From: Artem Grinev Date: Tue, 27 Oct 2020 20:42:49 +0300 Subject: [PATCH] [keyboard] Adjusted indents --- src/modules/keyboard/Config.cpp | 10 +++++----- src/modules/keyboard/SetKeyboardLayoutJob.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp index 03a774ef6..1e46e7f6d 100644 --- a/src/modules/keyboard/Config.cpp +++ b/src/modules/keyboard/Config.cpp @@ -91,12 +91,12 @@ xkbmap_query_grp_option() } while( setxkbmapQuery.canReadLine() && !outputLine.startsWith("options:") ); - if( !outputLine.startsWith("options:") ) + if( !outputLine.startsWith( "options:" ) ) { return QString(); } - int index = outputLine.indexOf("grp:"); + int index = outputLine.indexOf( "grp:" ); if( index == -1 ) { @@ -104,7 +104,7 @@ xkbmap_query_grp_option() } //it's either in the end of line or before the other option so \s or , - int lastIndex = outputLine.indexOf( QRegExp("[\\s,]"), index ); + int lastIndex = outputLine.indexOf( QRegExp( "[\\s,]" ), index ); return outputLine.mid( index, lastIndex-1 ); } @@ -178,14 +178,14 @@ Config::Config( QObject* parent ) connect( &m_setxkbmapTimer, &QTimer::timeout, this, [=] { m_selectedLayoutsAdditionalLayoutInfo = getAdditionalLayoutInfo( m_selectedLayout ); - if(!m_selectedLayoutsAdditionalLayoutInfo.additionalLayout.isEmpty()) + if( !m_selectedLayoutsAdditionalLayoutInfo.additionalLayout.isEmpty() ) { m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher = xkbmap_query_grp_option(); QProcess::execute( "setxkbmap", xkbmap_layout_args( { m_selectedLayoutsAdditionalLayoutInfo.additionalLayout, m_selectedLayout }, { m_selectedLayoutsAdditionalLayoutInfo.additionalVariant, m_selectedVariant }, - m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher.isEmpty()?"grp:alt_shift_toggle":QString() ) + m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher.isEmpty() ? "grp:alt_shift_toggle" : QString() ) ); if( m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher.isEmpty() ) diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.cpp b/src/modules/keyboard/SetKeyboardLayoutJob.cpp index e733c18ed..766044179 100644 --- a/src/modules/keyboard/SetKeyboardLayoutJob.cpp +++ b/src/modules/keyboard/SetKeyboardLayoutJob.cpp @@ -33,7 +33,7 @@ SetKeyboardLayoutJob::SetKeyboardLayoutJob(const QString& model, const QString& layout, const QString& variant, - const AdditionalLayoutInfo &additionalLayoutInfo, + const AdditionalLayoutInfo& additionalLayoutInfo, const QString& xOrgConfFileName, const QString& convertedKeymapPath, bool writeEtcDefaultKeyboard )