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

Merge branch 'kpmcore-3.2' of https://github.com/calamares/calamares into development

Browse Source
This commit is contained in:
Philip 2017-12-23 07:26:03 -05:00
commit d9348971a7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/partition/jobs/PartitionJob.cpp
View File

@ -22,7 +22,7 @@ PartitionJob::PartitionJob( Partition* partition )
: m_partition( partition )
{}
void PartitionJob::progress(int percent)
void PartitionJob::iprogress(int percent)
{
if ( percent < 0 )
percent = 0;

2
src/modules/partition/jobs/PartitionJob.h
View File

@ -43,7 +43,7 @@ public slots:
* KPMCore presents progress as an integer percent from 0 .. 100,
* while Calamares uses a qreal from 0 .. 1.00 .
*/
void progress( int percent );
void iprogress( int percent );
protected:
Partition* m_partition;

2
src/modules/partition/jobs/ResizePartitionJob.cpp
View File

@ -80,7 +80,7 @@ ResizePartitionJob::exec()
m_partition->setLastSector( m_oldLastSector );
ResizeOperation op(*m_device, *m_partition, m_newFirstSector, m_newLastSector);
op.setStatus(Operation::StatusRunning);
connect(&op, &Operation::progress, this, &ResizePartitionJob::progress );
connect(&op, &Operation::progress, this, &ResizePartitionJob::iprogress );
QString errorMessage = tr( "The installer failed to resize partition %1 on disk '%2'." )
.arg( m_partition->partitionPath() )