From f6e6774f92b95caa3c25d5fd6f94fedeab468436 Mon Sep 17 00:00:00 2001
From: demmm <anke62@gmail.com>
Date: Sun, 25 Oct 2020 18:35:03 +0100
Subject: [PATCH] [keyboardq] fix build

---
 src/modules/keyboardq/KeyboardQmlViewStep.cpp | 41 ++-----------------
 src/modules/keyboardq/KeyboardQmlViewStep.h   |  6 +--
 2 files changed, 5 insertions(+), 42 deletions(-)

diff --git a/src/modules/keyboardq/KeyboardQmlViewStep.cpp b/src/modules/keyboardq/KeyboardQmlViewStep.cpp
index 08b72b3f4..8e4663ee8 100644
--- a/src/modules/keyboardq/KeyboardQmlViewStep.cpp
+++ b/src/modules/keyboardq/KeyboardQmlViewStep.cpp
@@ -2,6 +2,7 @@
  *
  *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
  *   SPDX-FileCopyrightText: 2020 Camilo Higuita <milo.h@aol.com>
+ *   SPDX-FileCopyrightText: 2020 Anke Boersma <demm@kaosx.us>
  *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is Free Software: see the License-Identifier above.
@@ -10,9 +11,10 @@
 
 #include "KeyboardQmlViewStep.h"
 
+#include "Config.h"
+
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/Variant.h"
 
 CALAMARES_PLUGIN_FACTORY_DEFINITION( KeyboardQmlViewStepFactory, registerPlugin< KeyboardQmlViewStep >(); )
 
@@ -20,7 +22,6 @@ KeyboardQmlViewStep::KeyboardQmlViewStep( QObject* parent )
     : Calamares::QmlViewStep( parent )
     , m_config( new Config( this ) )
     , m_nextEnabled( false )
-    , m_writeEtcDefaultKeyboard( true )
 {
     m_config->init();
     m_nextEnabled = true;
@@ -66,7 +67,7 @@ KeyboardQmlViewStep::isAtEnd() const
 Calamares::JobList
 KeyboardQmlViewStep::jobs() const
 {
-    return m_jobs;
+    return m_config->createJobs();
 }
 
 void
@@ -79,7 +80,6 @@ void
 KeyboardQmlViewStep::onLeave()
 {
     m_config->finalize();
-    // m_jobs = m_config->createJobs( m_xOrgConfFileName, m_convertedKeymapPath, m_writeEtcDefaultKeyboard );
     m_prettyStatus = m_config->prettyStatus();
 }
 
@@ -92,39 +92,6 @@ KeyboardQmlViewStep::getConfig()
 void
 KeyboardQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
-    using namespace CalamaresUtils;
-
-    if ( configurationMap.contains( "xOrgConfFileName" )
-         && configurationMap.value( "xOrgConfFileName" ).type() == QVariant::String
-         && !getString( configurationMap, "xOrgConfFileName" ).isEmpty() )
-    {
-        m_xOrgConfFileName = getString( configurationMap, "xOrgConfFileName" );
-    }
-    else
-    {
-        m_xOrgConfFileName = "00-keyboard.conf";
-    }
-
-    if ( configurationMap.contains( "convertedKeymapPath" )
-         && configurationMap.value( "convertedKeymapPath" ).type() == QVariant::String
-         && !getString( configurationMap, "convertedKeymapPath" ).isEmpty() )
-    {
-        m_convertedKeymapPath = getString( configurationMap, "convertedKeymapPath" );
-    }
-    else
-    {
-        m_convertedKeymapPath = QString();
-    }
-
-    if ( configurationMap.contains( "writeEtcDefaultKeyboard" )
-         && configurationMap.value( "writeEtcDefaultKeyboard" ).type() == QVariant::Bool )
-    {
-        m_writeEtcDefaultKeyboard = getBool( configurationMap, "writeEtcDefaultKeyboard", true );
-    }
-    else
-    {
-        m_writeEtcDefaultKeyboard = true;
-    }
 
     Calamares::QmlViewStep::setConfigurationMap( configurationMap );
 }
diff --git a/src/modules/keyboardq/KeyboardQmlViewStep.h b/src/modules/keyboardq/KeyboardQmlViewStep.h
index 4571a9a60..09390d8d9 100644
--- a/src/modules/keyboardq/KeyboardQmlViewStep.h
+++ b/src/modules/keyboardq/KeyboardQmlViewStep.h
@@ -19,6 +19,7 @@
 
 #include <QObject>
 
+class Config;
 class KeyboardPage;
 
 class PLUGINDLLEXPORT KeyboardQmlViewStep : public Calamares::QmlViewStep
@@ -50,11 +51,6 @@ private:
     bool m_nextEnabled;
     QString m_prettyStatus;
 
-    QString m_xOrgConfFileName;
-    QString m_convertedKeymapPath;
-    bool m_writeEtcDefaultKeyboard;
-
-    Calamares::JobList m_jobs;
 };
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( KeyboardQmlViewStepFactory )