[plasmalnf] Simplify code, reduce copies of lnftool setting

src/modules/plasmalnf/CMakeLists.txt

@@ -9,7 +9,6 @@ calamares_add_plugin( plasmalnf
         PlasmaLnfViewStep.cpp
         PlasmaLnfPage.cpp
         PlasmaLnfJob.cpp
-        PlasmaLnfInfo.cpp
     UI
         page_plasmalnf.ui
     LINK_PRIVATE_LIBRARIES

src/modules/plasmalnf/PlasmaLnfInfo.cpp

@@ -1,58 +0,0 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
- *
- *   Copyright 2017, Adriaan de Groot <groot@kde.org>
- *
- *   Calamares is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   Calamares is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "PlasmaLnfInfo.h"
-
-#include <QDateTime>
-#include <QDir>
-#include <QProcess>
-#include <QStandardPaths>
-#include <QThread>
-
-#include <KService>
-#include <KServiceTypeTrader>
-#include <KPluginLoader>  // Future
-
-#include <Plasma/PluginLoader>  // TODO: port to KPluginLoader
-#include <KPackage/Package>
-#include <KPackage/PackageLoader>
-
-#include "utils/Logger.h"
-
-
-namespace Calamares
-{
-
-static QString *p_lnfPath = nullptr;
-
-QString lnftool()
-{
-    if ( !p_lnfPath )
-        p_lnfPath = new QString("/usr/bin/lookandfeeltool");
-
-    return *p_lnfPath;
-}
-
-void set_lnftool( const QString& lnfPath )
-{
-    if (p_lnfPath)
-        delete p_lnfPath;
-    p_lnfPath = new QString( lnfPath );
-}
-
-}  // namespace Calamares

src/modules/plasmalnf/PlasmaLnfInfo.h

@@ -1,31 +0,0 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
- *
- *   Copyright 2017, Adriaan de Groot <groot@kde.org>
- *
- *   Calamares is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   Calamares is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef PLASMALNFINFO_H
-#define PLASMALNFINFO_H
-
-#include <QString>
-#include <QStringList>
-
-namespace Calamares
-{
-QString lnftool();
-void set_lnftool( const QString& );
-}
-
-#endif // PLASMALNFINFO_H

src/modules/plasmalnf/PlasmaLnfPage.cpp

@@ -17,7 +17,6 @@
  */
 
 #include "PlasmaLnfPage.h"
-#include "PlasmaLnfInfo.h"
 
 #include "ui_page_plasmalnf.h"
 
@@ -74,7 +73,7 @@ PlasmaLnfPage::activated(const QString& name)
     cDebug() << "Changed to" << name;
 
     QProcess lnftool;
-    lnftool.start( Calamares::lnftool(), {"--resetLayout", "--apply", name} );
+    lnftool.start( m_lnfPath, {"--resetLayout", "--apply", name} );
 
     if ( lnftool.waitForStarted(1000) && lnftool.waitForFinished( 1000 ) && (lnftool.exitCode() == 0) && (lnftool.exitStatus() == QProcess::NormalExit ) )
         ; // OK
@@ -84,3 +83,9 @@ PlasmaLnfPage::activated(const QString& name)
 
     emit plasmaThemeSelected( name );
 }
+
+void
+PlasmaLnfPage::setLnfPath(const QString& path)
+{
+    m_lnfPath = path;
+}

src/modules/plasmalnf/PlasmaLnfPage.h

@@ -33,6 +33,8 @@ class PlasmaLnfPage : public QWidget
 public:
     explicit PlasmaLnfPage( QWidget* parent = nullptr );
 
+    void setLnfPath( const QString& path );
+
 public slots:
     void activated(const QString& name);
 
@@ -41,6 +43,7 @@ signals:
 
 private:
     Ui::PlasmaLnfPage* ui;
+    QString m_lnfPath;
 };
 
 #endif //PLASMALNFPAGE_H

src/modules/plasmalnf/PlasmaLnfViewStep.cpp

@@ -22,7 +22,6 @@
 #include "utils/CalamaresUtils.h"
 #include "utils/CalamaresUtilsSystem.h"
 
-#include "PlasmaLnfInfo.h"
 #include "PlasmaLnfJob.h"
 #include "PlasmaLnfPage.h"
 #include "PlasmaLnfViewStep.h"
@@ -128,7 +127,7 @@ PlasmaLnfViewStep::setConfigurationMap( const QVariantMap& configurationMap )
     if ( configurationMap.contains( "lnftool" ) && configurationMap.value( "lnftool" ).type() == QVariant::String )
         lnfPath = configurationMap.value( "lnftool" ).toString();
     m_lnfPath = lnfPath;
-    Calamares::set_lnftool( m_lnfPath );
+    m_widget->setLnfPath( m_lnfPath );
 
     if (m_lnfPath.isEmpty())
         cDebug() << "WARNING: no lnftool given for plasmalnf module.";