From 6aedf4401f8a549d2b51be2b3341a16ebd46942f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 28 Oct 2020 13:41:34 +0100
Subject: [PATCH] [keyboard] Apply coding style

---
 src/modules/keyboard/AdditionalLayoutInfo.h   |  3 ++-
 src/modules/keyboard/Config.h                 |  2 +-
 src/modules/keyboard/KeyboardPage.cpp         | 12 ++++++------
 src/modules/keyboard/KeyboardViewStep.cpp     |  4 ++--
 src/modules/keyboard/SetKeyboardLayoutJob.cpp |  8 +++++---
 src/modules/keyboard/SetKeyboardLayoutJob.h   |  3 +--
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/modules/keyboard/AdditionalLayoutInfo.h b/src/modules/keyboard/AdditionalLayoutInfo.h
index 660449952..61e854d3b 100644
--- a/src/modules/keyboard/AdditionalLayoutInfo.h
+++ b/src/modules/keyboard/AdditionalLayoutInfo.h
@@ -12,7 +12,8 @@
 
 #include <QString>
 
-struct AdditionalLayoutInfo {
+struct AdditionalLayoutInfo
+{
     QString additionalLayout;
     QString additionalVariant;
 
diff --git a/src/modules/keyboard/Config.h b/src/modules/keyboard/Config.h
index fa8728975..e35193484 100644
--- a/src/modules/keyboard/Config.h
+++ b/src/modules/keyboard/Config.h
@@ -11,9 +11,9 @@
 #ifndef KEYBOARD_CONFIG_H
 #define KEYBOARD_CONFIG_H
 
+#include "AdditionalLayoutInfo.h"
 #include "Job.h"
 #include "KeyboardLayoutModel.h"
-#include "AdditionalLayoutInfo.h"
 
 #include <QAbstractListModel>
 #include <QMap>
diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index 9ce947ef6..a6b1d3a16 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -53,13 +53,13 @@ KeyboardPage::KeyboardPage( Config* config, QWidget* parent )
 
     ui->physicalModelSelector->setModel( config->keyboardModels() );
     // Connect signals and slots
-    connect( ui->variantSelector, &QListWidget::currentItemChanged, this, &KeyboardPage::onListVariantCurrentItemChanged );
-
     connect(
-        ui->buttonRestore, &QPushButton::clicked, [this] {
-            cDebug() << "Restore clicked";
-            // ui->physicalModelSelector->setCurrentIndex( m_defaultIndex );
-        } );
+        ui->variantSelector, &QListWidget::currentItemChanged, this, &KeyboardPage::onListVariantCurrentItemChanged );
+
+    connect( ui->buttonRestore, &QPushButton::clicked, [this] {
+        cDebug() << "Restore clicked";
+        // ui->physicalModelSelector->setCurrentIndex( m_defaultIndex );
+    } );
 
     connect( ui->physicalModelSelector, &QComboBox::currentTextChanged, [this]( const QString& text ) {
         cDebug() << "ComboBox changed to" << text;
diff --git a/src/modules/keyboard/KeyboardViewStep.cpp b/src/modules/keyboard/KeyboardViewStep.cpp
index 773ed1401..d1eb3eb68 100644
--- a/src/modules/keyboard/KeyboardViewStep.cpp
+++ b/src/modules/keyboard/KeyboardViewStep.cpp
@@ -19,7 +19,7 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( KeyboardViewStepFactory, registerPlugin< Ke
 
 KeyboardViewStep::KeyboardViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
-    , m_config( new Config(this) )
+    , m_config( new Config( this ) )
     , m_widget( new KeyboardPage( m_config ) )
 {
     m_config->detectCurrentKeyboardLayout();
@@ -109,5 +109,5 @@ KeyboardViewStep::onLeave()
 void
 KeyboardViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
-    m_config->setConfigurationMap(configurationMap);
+    m_config->setConfigurationMap( configurationMap );
 }
diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.cpp b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
index 766044179..419d6f3fc 100644
--- a/src/modules/keyboard/SetKeyboardLayoutJob.cpp
+++ b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
@@ -30,7 +30,7 @@
 #include <QTextStream>
 
 
-SetKeyboardLayoutJob::SetKeyboardLayoutJob(const QString& model,
+SetKeyboardLayoutJob::SetKeyboardLayoutJob( const QString& model,
                                             const QString& layout,
                                             const QString& variant,
                                             const AdditionalLayoutInfo& additionalLayoutInfo,
@@ -269,12 +269,14 @@ SetKeyboardLayoutJob::writeX11Data( const QString& keyboardConfPath ) const
     {
         if ( !m_layout.isEmpty() )
         {
-            stream << "        Option \"XkbLayout\" \"" << m_additionalLayoutInfo.additionalLayout << "," << m_layout << "\"\n";
+            stream << "        Option \"XkbLayout\" \"" << m_additionalLayoutInfo.additionalLayout << "," << m_layout
+                   << "\"\n";
         }
 
         if ( !m_variant.isEmpty() )
         {
-            stream << "        Option \"XkbVariant\" \"" << m_additionalLayoutInfo.additionalVariant << "," << m_variant << "\"\n";
+            stream << "        Option \"XkbVariant\" \"" << m_additionalLayoutInfo.additionalVariant << "," << m_variant
+                   << "\"\n";
         }
 
         stream << "        Option \"XkbOptions\" \"" << m_additionalLayoutInfo.groupSwitcher << "\"\n";
diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.h b/src/modules/keyboard/SetKeyboardLayoutJob.h
index b1ce0bb15..15fadfb52 100644
--- a/src/modules/keyboard/SetKeyboardLayoutJob.h
+++ b/src/modules/keyboard/SetKeyboardLayoutJob.h
@@ -11,9 +11,8 @@
 #ifndef SETKEYBOARDLAYOUTJOB_H
 #define SETKEYBOARDLAYOUTJOB_H
 
-#include "Job.h"
 #include "AdditionalLayoutInfo.h"
-
+#include "Job.h"
 
 
 class SetKeyboardLayoutJob : public Calamares::Job