From afd3ed86d97728822653bf2c7df5c942fccc9b66 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 17 Apr 2024 10:55:18 +0200 Subject: [PATCH] [keyboard] Apply newer clang-formatting --- src/modules/keyboard/Config.cpp | 8 +++++--- src/modules/keyboard/SetKeyboardLayoutJob.cpp | 15 ++++++++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp index d8b1e8e86..ad6bee6f7 100644 --- a/src/modules/keyboard/Config.cpp +++ b/src/modules/keyboard/Config.cpp @@ -502,14 +502,16 @@ QString Config::prettyStatus() const { QString status; - status += tr( "Keyboard model has been set to %1
.", "@label, %1 is keyboard model, as in Apple Magic Keyboard" ) - .arg( m_keyboardModelsModel->label( m_keyboardModelsModel->currentIndex() ) ); + status + += tr( "Keyboard model has been set to %1
.", "@label, %1 is keyboard model, as in Apple Magic Keyboard" ) + .arg( m_keyboardModelsModel->label( m_keyboardModelsModel->currentIndex() ) ); QString layout = m_keyboardLayoutsModel->item( m_keyboardLayoutsModel->currentIndex() ).second.description; QString variant = m_keyboardVariantsModel->currentIndex() >= 0 ? m_keyboardVariantsModel->label( m_keyboardVariantsModel->currentIndex() ) : QString( "" ); - status += tr( "Keyboard layout has been set to %1/%2.", "@label, %1 is layout, %2 is layout variant" ).arg( layout, variant ); + status += tr( "Keyboard layout has been set to %1/%2.", "@label, %1 is layout, %2 is layout variant" ) + .arg( layout, variant ); return status; } diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.cpp b/src/modules/keyboard/SetKeyboardLayoutJob.cpp index be2adbb77..beb5780a2 100644 --- a/src/modules/keyboard/SetKeyboardLayoutJob.cpp +++ b/src/modules/keyboard/SetKeyboardLayoutJob.cpp @@ -64,7 +64,9 @@ QString SetKeyboardLayoutJob::prettyName() const { return tr( "Setting keyboard model to %1, layout as %2-%3…", "@status, %1 model, %2 layout, %3 variant" ) - .arg( m_model ).arg( m_layout ).arg( m_variant ); + .arg( m_model ) + .arg( m_layout ) + .arg( m_variant ); } @@ -365,8 +367,10 @@ SetKeyboardLayoutJob::exec() if ( !writeVConsoleData( vconsoleConfPath, convertedKeymapPath ) ) { - return Calamares::JobResult::error( tr( "Failed to write keyboard configuration for the virtual console.", "@error" ), - tr( "Failed to write to %1", "@error, %1 is virtual console configuration path" ).arg( vconsoleConfPath ) ); + return Calamares::JobResult::error( + tr( "Failed to write keyboard configuration for the virtual console.", "@error" ), + tr( "Failed to write to %1", "@error, %1 is virtual console configuration path" ) + .arg( vconsoleConfPath ) ); } // Get the path to the destination's /etc/X11/xorg.conf.d/00-keyboard.conf @@ -391,8 +395,9 @@ SetKeyboardLayoutJob::exec() if ( !writeX11Data( keyboardConfPath ) ) { - return Calamares::JobResult::error( tr( "Failed to write keyboard configuration for X11.", "@error" ), - tr( "Failed to write to %1", "@error, %1 is keyboard configuration path" ).arg( keyboardConfPath ) ); + return Calamares::JobResult::error( + tr( "Failed to write keyboard configuration for X11.", "@error" ), + tr( "Failed to write to %1", "@error, %1 is keyboard configuration path" ).arg( keyboardConfPath ) ); } }