[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`
This commit is contained in:
parent
8e9bf1c2a9
commit
fbab554dfa
@ -160,8 +160,7 @@ struct PythonJob::Private
|
|||||||
bp::object m_prettyStatusMessage;
|
bp::object m_prettyStatusMessage;
|
||||||
};
|
};
|
||||||
|
|
||||||
PythonJob::PythonJob( const ModuleSystem::InstanceKey& instance,
|
PythonJob::PythonJob( const QString& scriptFile,
|
||||||
const QString& scriptFile,
|
|
||||||
const QString& workingPath,
|
const QString& workingPath,
|
||||||
const QVariantMap& moduleConfiguration,
|
const QVariantMap& moduleConfiguration,
|
||||||
QObject* parent )
|
QObject* parent )
|
||||||
|
@ -31,12 +31,11 @@ class PythonJob : public Job
|
|||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
explicit PythonJob( const ModuleSystem::InstanceKey& instance,
|
explicit PythonJob( const QString& scriptFile,
|
||||||
const QString& scriptFile,
|
|
||||||
const QString& workingPath,
|
const QString& workingPath,
|
||||||
const QVariantMap& moduleConfiguration = QVariantMap(),
|
const QVariantMap& moduleConfiguration = QVariantMap(),
|
||||||
QObject* parent = nullptr );
|
QObject* parent = nullptr );
|
||||||
virtual ~PythonJob() override;
|
~PythonJob() override;
|
||||||
|
|
||||||
QString prettyName() const override;
|
QString prettyName() const override;
|
||||||
QString prettyStatusMessage() const override;
|
QString prettyStatusMessage() const override;
|
||||||
|
@ -40,7 +40,7 @@ PythonJobModule::loadSelf()
|
|||||||
return;
|
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;
|
m_loaded = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user