From 4948f634edfef3c7484033a563e0aae4d7dbd998 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 6 Sep 2021 12:06:11 +0200
Subject: [PATCH] [keyboard] Code tidy

- complain just once (globally) if ckbcomp is not found, rather than
  at every update to the layout.
- tighten up QStringList constructor.
---
 .../keyboard/keyboardwidget/keyboardpreview.cpp    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp b/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp
index 572965de5..0bb1add87 100644
--- a/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp
+++ b/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp
@@ -124,10 +124,7 @@ KeyBoardPreview::loadCodes()
         return false;
     }
 
-    QStringList param;
-    param << "-model"
-          << "pc106"
-          << "-layout" << layout << "-compact";
+    QStringList param { "-model", "pc106", "-layout", layout, "-compact" };
     if ( !variant.isEmpty() )
     {
         param << "-variant" << variant;
@@ -140,13 +137,18 @@ KeyBoardPreview::loadCodes()
     process.start( "ckbcomp", param );
     if ( !process.waitForStarted() )
     {
-        cWarning() << "ckbcomp not found , keyboard preview disabled";
+        static bool need_warning = true;
+        if ( need_warning )
+        {
+            cWarning() << "ckbcomp not found , keyboard preview disabled";
+            need_warning = false;
+        }
         return false;
     }
 
     if ( !process.waitForFinished() )
     {
-        cWarning() << "ckbcomp failed, keyboard preview disabled";
+        cWarning() << "ckbcomp failed, keyboard preview skipped for" << layout << variant;
         return false;
     }