From 8a50685c75ce463f2f3fb83929548787c8c50468 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Tue, 16 Sep 2014 18:11:19 +0200 Subject: [PATCH] Add clearJobs to PCM --- src/modules/partition/core/PartitionCoreModule.cpp | 12 ++++++++++++ src/modules/partition/core/PartitionCoreModule.h | 7 +++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index 76c2373aa..d8921899f 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Aurélien Gâteau + * Copyright 2014, Teo Mrnjavac * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -384,6 +385,17 @@ PartitionCoreModule::revert() } +void +PartitionCoreModule::clearJobs() +{ + foreach ( DeviceInfo* deviceInfo, m_deviceInfos ) + { + deviceInfo->forgetChanges(); + } + updateIsDirty(); +} + + bool PartitionCoreModule::isDirty() { diff --git a/src/modules/partition/core/PartitionCoreModule.h b/src/modules/partition/core/PartitionCoreModule.h index 0ebc7b0ed..67e446add 100644 --- a/src/modules/partition/core/PartitionCoreModule.h +++ b/src/modules/partition/core/PartitionCoreModule.h @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2014, Aurélien Gâteau + * Copyright 2014, Teo Mrnjavac * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -86,6 +87,8 @@ public: void revert(); + void clearJobs(); + bool isDirty(); /** @@ -101,6 +104,8 @@ public: */ QList< SummaryInfo > createSummaryInfo() const; + void dumpQueue() const; + Q_SIGNALS: void hasRootMountPointChanged( bool value ); void isDirtyChanged( bool value ); @@ -134,8 +139,6 @@ private: void updateHasRootMountPoint(); void updateIsDirty(); - void dumpQueue() const; - DeviceInfo* infoForDevice( Device* ) const; Partition* findPartitionByMountPoint( const QString& mountPoint ) const;