From 97aedd18060a3093a4a6ab49c0ba143c059fe3e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Wed, 2 Nov 2016 23:07:01 +0000
Subject: [PATCH] Replace complicated QPair type with custom LvmPV class.

---
 src/gui/createvolumegroupdialog.cpp |  6 +++---
 src/gui/createvolumegroupdialog.h   |  4 ++--
 src/gui/resizevolumegroupdialog.cpp | 10 +++++-----
 src/gui/resizevolumegroupdialog.h   |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/gui/createvolumegroupdialog.cpp b/src/gui/createvolumegroupdialog.cpp
index a202c26..0a7bd56 100644
--- a/src/gui/createvolumegroupdialog.cpp
+++ b/src/gui/createvolumegroupdialog.cpp
@@ -27,7 +27,7 @@
 #include <KLocalizedString>
 #include <KSharedConfig>
 
-CreateVolumeGroupDialog::CreateVolumeGroupDialog(QWidget* parent, QString& vgName, QList<const Partition*>& pvList, qint32& peSize, FS::lvm2_pv::PhysicalVolumes physicalVolumes, QList<Device*> devices)
+CreateVolumeGroupDialog::CreateVolumeGroupDialog(QWidget* parent, QString& vgName, QList<const Partition*>& pvList, qint32& peSize, QList<LvmPV> physicalVolumes, QList<Device*> devices)
     : VolumeGroupDialog(parent, vgName, pvList)
     , m_PESize(peSize)
     , m_PhysicalVolumes(physicalVolumes)
@@ -49,8 +49,8 @@ CreateVolumeGroupDialog::CreateVolumeGroupDialog(QWidget* parent, QString& vgNam
 void CreateVolumeGroupDialog::setupDialog()
 {
     for (const auto &p : m_PhysicalVolumes)
-        if (p.first == QString() && !LvmDevice::s_DirtyPVs.contains(p.second))
-            dialogWidget().listPV().addPartition(*p.second, false);
+        if (p.vgName() == QString() && !LvmDevice::s_DirtyPVs.contains(p.partition()))
+            dialogWidget().listPV().addPartition(*p.partition(), false);
 }
 
 void CreateVolumeGroupDialog::setupConnections()
diff --git a/src/gui/createvolumegroupdialog.h b/src/gui/createvolumegroupdialog.h
index 0c2a9cf..0a43058 100644
--- a/src/gui/createvolumegroupdialog.h
+++ b/src/gui/createvolumegroupdialog.h
@@ -31,7 +31,7 @@ class CreateVolumeGroupDialog : public VolumeGroupDialog
     Q_DISABLE_COPY(CreateVolumeGroupDialog)
 
 public:
-    CreateVolumeGroupDialog(QWidget* parent, QString& vgName, QList<const Partition*>& pvList, qint32& peSize, FS::lvm2_pv::PhysicalVolumes physicalVolumes, QList<Device*> devices);
+    CreateVolumeGroupDialog(QWidget* parent, QString& vgName, QList<const Partition*>& pvList, qint32& peSize, QList<LvmPV> physicalVolumes, QList<Device*> devices);
 
 protected:
     void accept() override;
@@ -49,7 +49,7 @@ protected:
     qint32& m_PESize;
 
 private:
-    const FS::lvm2_pv::PhysicalVolumes m_PhysicalVolumes; // List of all LVM Physical Volumes found on the system
+    const QList<LvmPV> m_PhysicalVolumes; // List of all LVM Physical Volumes found on the system
     const QList<Device*> m_Devices; // List of all devices found on the system
 };
 
diff --git a/src/gui/resizevolumegroupdialog.cpp b/src/gui/resizevolumegroupdialog.cpp
index f4ceea0..ce66e63 100644
--- a/src/gui/resizevolumegroupdialog.cpp
+++ b/src/gui/resizevolumegroupdialog.cpp
@@ -34,7 +34,7 @@
     @param parent pointer to the parent widget
     @param d the Device to show properties for
 */
-ResizeVolumeGroupDialog::ResizeVolumeGroupDialog(QWidget* parent, VolumeManagerDevice* d, QList<const Partition*>& partList, FS::lvm2_pv::PhysicalVolumes physicalVolumes)
+ResizeVolumeGroupDialog::ResizeVolumeGroupDialog(QWidget* parent, VolumeManagerDevice* d, QList<const Partition*>& partList, QList<LvmPV> physicalVolumes)
     : VolumeGroupDialog(parent, d->name(), partList)
     , m_Device(d)
     , m_PhysicalVolumes(physicalVolumes)
@@ -52,10 +52,10 @@ void ResizeVolumeGroupDialog::setupDialog()
 {
     if (dialogWidget().volumeType().currentText() == QStringLiteral("LVM")) {
         for (const auto &p : m_PhysicalVolumes) {
-            if (p.first == device()->name())
-                dialogWidget().listPV().addPartition(*p.second, true);
-            else if (p.first == QString() && !LvmDevice::s_DirtyPVs.contains(p.second)) // TODO: Remove LVM PVs in current VG
-                dialogWidget().listPV().addPartition(*p.second, false);
+            if (p.vgName() == device()->name())
+                dialogWidget().listPV().addPartition(*p.partition(), true);
+            else if (p.vgName() == QString() && !LvmDevice::s_DirtyPVs.contains(p.partition())) // TODO: Remove LVM PVs in current VG
+                dialogWidget().listPV().addPartition(*p.partition(), false);
         }
     }
 
diff --git a/src/gui/resizevolumegroupdialog.h b/src/gui/resizevolumegroupdialog.h
index 4f5f49b..acbb057 100644
--- a/src/gui/resizevolumegroupdialog.h
+++ b/src/gui/resizevolumegroupdialog.h
@@ -31,7 +31,7 @@ class ResizeVolumeGroupDialog : public VolumeGroupDialog
     Q_DISABLE_COPY(ResizeVolumeGroupDialog)
 
 public:
-    ResizeVolumeGroupDialog(QWidget* parent, VolumeManagerDevice *d, QList<const Partition*>& partList, FS::lvm2_pv::PhysicalVolumes physicalVolumes);
+    ResizeVolumeGroupDialog(QWidget* parent, VolumeManagerDevice *d, QList<const Partition*>& partList, QList<LvmPV> physicalVolumes);
 
 protected:
     void accept() override;
@@ -44,7 +44,7 @@ protected:
 
 private:
     VolumeManagerDevice* m_Device;
-    const FS::lvm2_pv::PhysicalVolumes m_PhysicalVolumes; // List of all devices found on the system
+    const QList<LvmPV> m_PhysicalVolumes; // List of all devices found on the system
 };
 
 #endif