napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[keyboard] Adjusted indents

Browse Source
This commit is contained in:
Artem Grinev 2020-10-27 20:42:49 +03:00
parent 996c82160e
commit 6667ea834f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/keyboard/Config.cpp
View File

@ -91,12 +91,12 @@ xkbmap_query_grp_option()
} }
while( setxkbmapQuery.canReadLine() && !outputLine.startsWith("options:") ); while( setxkbmapQuery.canReadLine() && !outputLine.startsWith("options:") );
if( !outputLine.startsWith("options:") ) if( !outputLine.startsWith( "options:" ) )
{ {
return QString(); return QString();
} }
int index = outputLine.indexOf("grp:"); int index = outputLine.indexOf( "grp:" );
if( index == -1 ) 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 , //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 ); return outputLine.mid( index, lastIndex-1 );
} }
@ -178,14 +178,14 @@ Config::Config( QObject* parent )
connect( &m_setxkbmapTimer, &QTimer::timeout, this, [=] { connect( &m_setxkbmapTimer, &QTimer::timeout, this, [=] {
m_selectedLayoutsAdditionalLayoutInfo = getAdditionalLayoutInfo( m_selectedLayout ); m_selectedLayoutsAdditionalLayoutInfo = getAdditionalLayoutInfo( m_selectedLayout );
if(!m_selectedLayoutsAdditionalLayoutInfo.additionalLayout.isEmpty()) if( !m_selectedLayoutsAdditionalLayoutInfo.additionalLayout.isEmpty() )
{ {
m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher = xkbmap_query_grp_option(); m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher = xkbmap_query_grp_option();
QProcess::execute( "setxkbmap", xkbmap_layout_args( QProcess::execute( "setxkbmap", xkbmap_layout_args(
{ m_selectedLayoutsAdditionalLayoutInfo.additionalLayout, m_selectedLayout }, { m_selectedLayoutsAdditionalLayoutInfo.additionalLayout, m_selectedLayout },
{ m_selectedLayoutsAdditionalLayoutInfo.additionalVariant, m_selectedVariant }, { 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() ) if( m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher.isEmpty() )

2
src/modules/keyboard/SetKeyboardLayoutJob.cpp
View File

@ -33,7 +33,7 @@
SetKeyboardLayoutJob::SetKeyboardLayoutJob(const QString& model, SetKeyboardLayoutJob::SetKeyboardLayoutJob(const QString& model,
const QString& layout, const QString& layout,
const QString& variant, const QString& variant,
const AdditionalLayoutInfo &additionalLayoutInfo, const AdditionalLayoutInfo& additionalLayoutInfo,
const QString& xOrgConfFileName, const QString& xOrgConfFileName,
const QString& convertedKeymapPath, const QString& convertedKeymapPath,
bool writeEtcDefaultKeyboard ) bool writeEtcDefaultKeyboard )