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

[keyboard] Don't use useless rvalue-ref

Browse Source 
- Weird && usage here made redundant through RVO, just return
   something normally instead.
This commit is contained in:
Adriaan de Groot 2019-04-18 11:40:47 +02:00
parent 123c774a47
commit a1e08d2236
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/keyboard/KeyboardPage.cpp
View File

@ -446,9 +446,9 @@ KeyboardPage::onListLayoutCurrentItemChanged( const QModelIndex& current,
/* Returns stringlist with suitable setxkbmap command-line arguments /* Returns stringlist with suitable setxkbmap command-line arguments
* to set the given @p layout and @p variant. * to set the given @p layout and @p variant.
*/ */
static inline QStringList xkbmap_args( QStringList&& r, const QString& layout, const QString& variant ) static inline QStringList xkbmap_args( const QString& layout, const QString& variant )
{ {
r << "-layout" << layout; QStringList r{ "-layout", layout };
if ( !variant.isEmpty() ) if ( !variant.isEmpty() )
r << "-variant" << variant; r << "-variant" << variant;
return r; return r;
@ -483,7 +483,7 @@ KeyboardPage::onListVariantCurrentItemChanged( QListWidgetItem* current, QListWi
connect( &m_setxkbmapTimer, &QTimer::timeout, connect( &m_setxkbmapTimer, &QTimer::timeout,
this, [=] this, [=]
{ {
QProcess::execute( "setxkbmap", xkbmap_args( QStringList(), layout, variant ) ); QProcess::execute( "setxkbmap", xkbmap_args( layout, variant ) );
cDebug() << "xkbmap selection changed to: " << layout << '-' << variant; cDebug() << "xkbmap selection changed to: " << layout << '-' << variant;
m_setxkbmapTimer.disconnect( this ); m_setxkbmapTimer.disconnect( this );
} ); } );