napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[plasmalnf] Simplify code

Browse Source 
- Look-and-Feel job has no status to speak of
- Coding style
This commit is contained in:
Adriaan de Groot 2020-11-11 12:45:19 +01:00
parent 3069f4133f
commit 8f590848bd
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/plasmalnf/PlasmaLnfJob.cpp
View File

@ -20,30 +20,19 @@ PlasmaLnfJob::PlasmaLnfJob( const QString& lnfPath, const QString& id )
{ {
} }
PlasmaLnfJob::~PlasmaLnfJob() {} PlasmaLnfJob::~PlasmaLnfJob() {}
QString QString
PlasmaLnfJob::prettyName() const PlasmaLnfJob::prettyName() const
{ {
return tr( "Plasma Look-and-Feel Job" ); return tr( "Plasma Look-and-Feel Job" );
} }
QString
PlasmaLnfJob::prettyStatusMessage() const
{
return prettyName();
}
Calamares::JobResult Calamares::JobResult
PlasmaLnfJob::exec() PlasmaLnfJob::exec()
{ {
cDebug() << "Plasma Look-and-Feel Job"; auto* system = CalamaresUtils::System::instance();
auto* gs = Calamares::JobQueue::instance()->globalStorage();
auto system = CalamaresUtils::System::instance();
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
QStringList command( { "sudo", QStringList command( { "sudo",
"-E", "-E",
@ -59,8 +48,10 @@ PlasmaLnfJob::exec()
int r = system->targetEnvCall( command ); int r = system->targetEnvCall( command );
if ( r ) if ( r )
{
return Calamares::JobResult::error( tr( "Could not select KDE Plasma Look-and-Feel package" ), return Calamares::JobResult::error( tr( "Could not select KDE Plasma Look-and-Feel package" ),
tr( "Could not select KDE Plasma Look-and-Feel package" ) ); tr( "Could not select KDE Plasma Look-and-Feel package" ) );
}
return Calamares::JobResult::ok(); return Calamares::JobResult::ok();
} }

1
src/modules/plasmalnf/PlasmaLnfJob.h
View File

@ -24,7 +24,6 @@ public:
~PlasmaLnfJob() override; ~PlasmaLnfJob() override;
QString prettyName() const override; QString prettyName() const override;
QString prettyStatusMessage() const override;
Calamares::JobResult exec() override; Calamares::JobResult exec() override;