From 4e49f593335c6f5743e3cef7faa64c97a9293a2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= Date: Thu, 17 Jul 2014 14:26:40 +0200 Subject: [PATCH] Turn PartitionCoreModule::refreshPartitionModel() into refresh() and make it public --- src/modules/partition/PartitionCoreModule.cpp | 13 +++++-------- src/modules/partition/PartitionCoreModule.h | 3 ++- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/modules/partition/PartitionCoreModule.cpp b/src/modules/partition/PartitionCoreModule.cpp index 9d6b8e734..55cc6f805 100644 --- a/src/modules/partition/PartitionCoreModule.cpp +++ b/src/modules/partition/PartitionCoreModule.cpp @@ -192,8 +192,7 @@ PartitionCoreModule::createPartitionTable( Device* device, PartitionTable::Table job->updatePreview(); info->jobs << Calamares::job_ptr( job ); - refreshPartitionModel( device ); - updateHasRootMountPoint(); + refresh( device ); } void @@ -205,11 +204,9 @@ PartitionCoreModule::createPartition( Device* device, Partition* partition ) CreatePartitionJob* job = new CreatePartitionJob( device, partition ); job->updatePreview(); - refreshPartitionModel( device ); - deviceInfo->jobs << Calamares::job_ptr( job ); - updateHasRootMountPoint(); + refresh( device ); } void @@ -265,8 +262,7 @@ PartitionCoreModule::deletePartition( Device* device, Partition* partition ) jobs << Calamares::job_ptr( job ); } - refreshPartitionModel( device ); - updateHasRootMountPoint(); + refresh( device ); } QList< Calamares::job_ptr > @@ -293,11 +289,12 @@ PartitionCoreModule::dumpQueue() const } void -PartitionCoreModule::refreshPartitionModel( Device* device ) +PartitionCoreModule::refresh( Device* device ) { auto model = partitionModelForDevice( device ); Q_ASSERT( model ); model->reload(); + updateHasRootMountPoint(); } void PartitionCoreModule::updateHasRootMountPoint() diff --git a/src/modules/partition/PartitionCoreModule.h b/src/modules/partition/PartitionCoreModule.h index 7bf25e4a2..55410b007 100644 --- a/src/modules/partition/PartitionCoreModule.h +++ b/src/modules/partition/PartitionCoreModule.h @@ -62,6 +62,8 @@ public: return m_hasRootMountPoint; } + void refresh( Device* device ); + Q_SIGNALS: void hasRootMountPointChanged( bool value ); @@ -88,7 +90,6 @@ private: void listDevices(); void updateHasRootMountPoint(); - void refreshPartitionModel( Device* device ); void dumpQueue() const;