From dfca46250e5ea5261d66e44223500cf1b94bdcb6 Mon Sep 17 00:00:00 2001 From: Caio Carvalho Date: Wed, 9 May 2018 04:15:28 -0300 Subject: [PATCH] - Passing list of pending operations as argument to ResizeOperation::canGrow. - Access LVM::pvList through static list attribute. --- src/gui/createvolumegroupdialog.cpp | 2 +- src/gui/mainwindow.cpp | 2 +- src/gui/resizevolumegroupdialog.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/createvolumegroupdialog.cpp b/src/gui/createvolumegroupdialog.cpp index 1021676..b601d07 100644 --- a/src/gui/createvolumegroupdialog.cpp +++ b/src/gui/createvolumegroupdialog.cpp @@ -58,7 +58,7 @@ CreateVolumeGroupDialog::CreateVolumeGroupDialog(QWidget* parent, QString& vgNam void CreateVolumeGroupDialog::setupDialog() { - for (const auto &p : qAsConst(LVM::pvList)) { + for (const auto &p : qAsConst(LVM::pvList::list())) { bool toBeDeleted = false; // Ignore partitions that are going to be deleted diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 7a8eeaa..a1a7ac0 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -535,7 +535,7 @@ void MainWindow::enableActions() actionCollection()->action(QStringLiteral("newPartition")) ->setEnabled(!readOnly && NewOperation::canCreateNew(part)); - const bool canResize = ResizeOperation::canGrow(part) || + const bool canResize = ResizeOperation::canGrow(part, m_OperationStack->operations()) || ResizeOperation::canShrink(part, m_OperationStack->operations()) || ResizeOperation::canMove(part, m_OperationStack->operations()); actionCollection()->action(QStringLiteral("resizePartition")) diff --git a/src/gui/resizevolumegroupdialog.cpp b/src/gui/resizevolumegroupdialog.cpp index 7326c13..35ec4ab 100644 --- a/src/gui/resizevolumegroupdialog.cpp +++ b/src/gui/resizevolumegroupdialog.cpp @@ -51,7 +51,7 @@ ResizeVolumeGroupDialog::ResizeVolumeGroupDialog(QWidget* parent, VolumeManagerD void ResizeVolumeGroupDialog::setupDialog() { if (dialogWidget().volumeType().currentText() == QStringLiteral("LVM")) { - for (const auto &p : qAsConst(LVM::pvList)) { + for (const auto &p : qAsConst(LVM::pvList::list())) { if (p.isLuks()) continue; if (p.vgName() == device()->name())