diff --git a/src/gui/createvolumegroupdialog.cpp b/src/gui/createvolumegroupdialog.cpp index ab69740..e9b5294 100644 --- a/src/gui/createvolumegroupdialog.cpp +++ b/src/gui/createvolumegroupdialog.cpp @@ -30,7 +30,7 @@ #include #include -CreateVolumeGroupDialog::CreateVolumeGroupDialog(QWidget* parent, QString& vgName, QList& partList, qint32& peSize, QList devices) +CreateVolumeGroupDialog::CreateVolumeGroupDialog(QWidget* parent, QString& vgName, std::vector& partList, qint32& peSize, QList devices) : VolumeGroupDialog(parent, vgName, partList) , m_PESize(peSize) , m_Devices(devices) @@ -66,7 +66,7 @@ void CreateVolumeGroupDialog::accept() QString& tname = targetName(); tname = dialogWidget().vgName().text(); - targetPVList() << dialogWidget().listPV().checkedItems(); + targetPVList().insert(targetPVList().end(), dialogWidget().listPV().checkedItems().begin(), dialogWidget().listPV().checkedItems().end()); qint32& pesize = peSize(); pesize = dialogWidget().spinPESize().value(); diff --git a/src/gui/createvolumegroupdialog.h b/src/gui/createvolumegroupdialog.h index d6065b1..495aac0 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& pvList, qint32& peSize, QList devices); + CreateVolumeGroupDialog(QWidget* parent, QString& vgName, std::vector& pvList, qint32& peSize, QList devices); protected: void accept() override; diff --git a/src/gui/listphysicalvolumes.cpp b/src/gui/listphysicalvolumes.cpp index 89f151c..57a6e61 100644 --- a/src/gui/listphysicalvolumes.cpp +++ b/src/gui/listphysicalvolumes.cpp @@ -22,8 +22,6 @@ #include #include - - ListPhysicalVolumes::ListPhysicalVolumes(QWidget* parent) : QWidget(parent), Ui::ListPhysicalVolumesBase() @@ -37,13 +35,13 @@ void ListPhysicalVolumes::addPartition(const Partition& p, bool checked) listPhysicalVolumes().addItem(item); } -QList ListPhysicalVolumes::checkedItems() +std::vector ListPhysicalVolumes::checkedItems() { - QList partitionList; + std::vector partitionList; for (int i = 0; i < listPhysicalVolumes().count(); i++) { ListPhysicalVolumeWidgetItem* item = dynamic_cast(listPhysicalVolumes().item(i)); if(item && item->checkState() == Qt::Checked) - partitionList.append(item->partition()); + partitionList.push_back(item->partition()); } return partitionList; } diff --git a/src/gui/listphysicalvolumes.h b/src/gui/listphysicalvolumes.h index ea33b51..96c6905 100644 --- a/src/gui/listphysicalvolumes.h +++ b/src/gui/listphysicalvolumes.h @@ -23,6 +23,8 @@ #include +#include + #include class Device; @@ -48,7 +50,7 @@ public: void addPartition(const Partition& p, bool checked); - QList checkedItems(); + std::vector checkedItems(); QListWidget& listPhysicalVolumes() { Q_ASSERT(m_ListPhysicalVolumes); diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 92ae123..8336c98 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -1101,12 +1101,12 @@ void MainWindow::onExportPartitionTable() void MainWindow::onCreateNewVolumeGroup() { QString vgName; - QList pvList; + std::vector pvList; qint32 peSize = 4; // *NOTE*: vgName & pvList will be modified and validated by the dialog QPointer dlg = new CreateVolumeGroupDialog(this, vgName, pvList, peSize, operationStack().previewDevices()); if (dlg->exec() == QDialog::Accepted) - operationStack().push(new CreateVolumeGroupOperation(vgName, pvList, peSize)); + operationStack().push(new CreateVolumeGroupOperation(vgName, QList::fromVector(QVector::fromStdVector(pvList)), peSize)); delete dlg; } @@ -1116,12 +1116,12 @@ void MainWindow::onResizeVolumeGroup() if (pmWidget().selectedDevice()->type() == Device::LVM_Device) { LvmDevice* d = dynamic_cast(pmWidget().selectedDevice()); - QList pvList; + std::vector pvList; // *NOTE*: pvList will be modified and validated by the dialog QPointer dlg = new ResizeVolumeGroupDialog(this, d, pvList); if (dlg->exec() == QDialog::Accepted) - operationStack().push(new ResizeVolumeGroupOperation(*d, pvList)); + operationStack().push(new ResizeVolumeGroupOperation(*d, QList::fromVector(QVector::fromStdVector(pvList)))); delete dlg; } diff --git a/src/gui/resizevolumegroupdialog.cpp b/src/gui/resizevolumegroupdialog.cpp index e87647e..1f6662b 100644 --- a/src/gui/resizevolumegroupdialog.cpp +++ b/src/gui/resizevolumegroupdialog.cpp @@ -35,7 +35,7 @@ @param parent pointer to the parent widget @param d the Device to show properties for */ -ResizeVolumeGroupDialog::ResizeVolumeGroupDialog(QWidget* parent, VolumeManagerDevice* d, QList& partList) +ResizeVolumeGroupDialog::ResizeVolumeGroupDialog(QWidget* parent, VolumeManagerDevice* d, std::vector& partList) : VolumeGroupDialog(parent, d->name(), partList) , m_Device(d) { @@ -83,6 +83,6 @@ void ResizeVolumeGroupDialog::setupConstraints() void ResizeVolumeGroupDialog::accept() { - targetPVList() << dialogWidget().listPV().checkedItems(); + targetPVList().insert(targetPVList().end(), dialogWidget().listPV().checkedItems().begin(), dialogWidget().listPV().checkedItems().end()); QDialog::accept(); } diff --git a/src/gui/resizevolumegroupdialog.h b/src/gui/resizevolumegroupdialog.h index 4541443..cb01ba7 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& partList); + ResizeVolumeGroupDialog(QWidget* parent, VolumeManagerDevice *d, std::vector& partList); protected: void accept() override; diff --git a/src/gui/treelog.cpp b/src/gui/treelog.cpp index 70ab555..765d5d6 100644 --- a/src/gui/treelog.cpp +++ b/src/gui/treelog.cpp @@ -17,8 +17,8 @@ *************************************************************************/ #include "gui/treelog.h" - #include "gui/partitionmanagerwidget.h" +#include "config.h" #include #include @@ -38,8 +38,6 @@ #include #include -#include - /** Creates a new TreeLog instance. @param parent the parent widget */ diff --git a/src/gui/volumegroupdialog.cpp b/src/gui/volumegroupdialog.cpp index cc57fa5..7f8d72b 100644 --- a/src/gui/volumegroupdialog.cpp +++ b/src/gui/volumegroupdialog.cpp @@ -37,7 +37,7 @@ @param vgName Volume Group name @param pvList List of LVM Physical Volumes used to create Volume Group */ -VolumeGroupDialog::VolumeGroupDialog(QWidget* parent, QString& vgName, QList& pvList) : +VolumeGroupDialog::VolumeGroupDialog(QWidget* parent, QString& vgName, std::vector& pvList) : QDialog(parent), m_DialogWidget(new VolumeGroupWidget(this)), m_TargetName(vgName), @@ -131,7 +131,7 @@ void VolumeGroupDialog::updateSectorInfos() void VolumeGroupDialog::updateSizeInfos() { - const QList checkedPartitions = dialogWidget().listPV().checkedItems(); + const std::vector checkedPartitions = dialogWidget().listPV().checkedItems(); m_TotalSize = 0; for (const auto &p : checkedPartitions) m_TotalSize += p->capacity() - p->capacity() % (dialogWidget().spinPESize().value() * Capacity::unitFactor(Capacity::Byte, Capacity::MiB)); // subtract space which is too small to hold PE diff --git a/src/gui/volumegroupdialog.h b/src/gui/volumegroupdialog.h index 05c2c28..7431175 100644 --- a/src/gui/volumegroupdialog.h +++ b/src/gui/volumegroupdialog.h @@ -20,6 +20,8 @@ #define VOLUMEGROUPDIALOG__H +#include + #include #include #include @@ -33,7 +35,7 @@ class VolumeGroupDialog : public QDialog Q_DISABLE_COPY(VolumeGroupDialog) public: - VolumeGroupDialog(QWidget* parent, QString& vgName, QList& pvList); + VolumeGroupDialog(QWidget* parent, QString& vgName, std::vector& pvList); ~VolumeGroupDialog(); protected: @@ -65,11 +67,11 @@ protected: return m_TargetName; } - QList& targetPVList() { + std::vector& targetPVList() { return m_TargetPVList; } - const QList& targetPVList() const { + const std::vector& targetPVList() const { return m_TargetPVList; } @@ -87,7 +89,7 @@ protected: protected: VolumeGroupWidget* m_DialogWidget; QString& m_TargetName; - QList& m_TargetPVList; + std::vector& m_TargetPVList; bool m_IsValidSize; bool m_IsValidName;