From fbab554dfa4e5295e7783f98c4e1f9ee23cd2b22 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 22 Sep 2020 21:54:10 +0200 Subject: [PATCH] [libcalamares] Remove unused parameter for PythonJob - parameter instanceKey was left over from previous work that special-cased the weight of Python modules. - while here, consistently do `~T() override` --- src/libcalamares/PythonJob.cpp | 3 +-- src/libcalamares/PythonJob.h | 5 ++--- src/libcalamaresui/modulesystem/PythonJobModule.cpp | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/libcalamares/PythonJob.cpp b/src/libcalamares/PythonJob.cpp index 1f4680017..cd066b8bd 100644 --- a/src/libcalamares/PythonJob.cpp +++ b/src/libcalamares/PythonJob.cpp @@ -160,8 +160,7 @@ struct PythonJob::Private bp::object m_prettyStatusMessage; }; -PythonJob::PythonJob( const ModuleSystem::InstanceKey& instance, - const QString& scriptFile, +PythonJob::PythonJob( const QString& scriptFile, const QString& workingPath, const QVariantMap& moduleConfiguration, QObject* parent ) diff --git a/src/libcalamares/PythonJob.h b/src/libcalamares/PythonJob.h index 5b5cfb7cc..04a0645ea 100644 --- a/src/libcalamares/PythonJob.h +++ b/src/libcalamares/PythonJob.h @@ -31,12 +31,11 @@ class PythonJob : public Job { Q_OBJECT public: - explicit PythonJob( const ModuleSystem::InstanceKey& instance, - const QString& scriptFile, + explicit PythonJob( const QString& scriptFile, const QString& workingPath, const QVariantMap& moduleConfiguration = QVariantMap(), QObject* parent = nullptr ); - virtual ~PythonJob() override; + ~PythonJob() override; QString prettyName() const override; QString prettyStatusMessage() const override; diff --git a/src/libcalamaresui/modulesystem/PythonJobModule.cpp b/src/libcalamaresui/modulesystem/PythonJobModule.cpp index 20f8215d2..42acc0c69 100644 --- a/src/libcalamaresui/modulesystem/PythonJobModule.cpp +++ b/src/libcalamaresui/modulesystem/PythonJobModule.cpp @@ -40,7 +40,7 @@ PythonJobModule::loadSelf() return; } - m_job = Calamares::job_ptr( new PythonJob( instanceKey(), m_scriptFileName, m_workingPath, m_configurationMap ) ); + m_job = Calamares::job_ptr( new PythonJob( m_scriptFileName, m_workingPath, m_configurationMap ) ); m_loaded = true; }