andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

std::vector->QVector.

This commit is contained in:
Andrius Štikonas 2017-08-31 10:34:58 +01:00
parent 58281d6855
commit 482c1f63a3
9 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/createvolumegroupdialog.cpp
View File

@ -30,7 +30,7 @@
#include <KLocalizedString> #include <KLocalizedString>
#include <KSharedConfig> #include <KSharedConfig>
CreateVolumeGroupDialog::CreateVolumeGroupDialog(QWidget* parent, QString& vgName, std::vector<const Partition*>& partList, qint32& peSize, QList<Device*> devices) CreateVolumeGroupDialog::CreateVolumeGroupDialog(QWidget* parent, QString& vgName, QVector<const Partition*>& partList, qint32& peSize, QList<Device*> devices)
: VolumeGroupDialog(parent, vgName, partList) : VolumeGroupDialog(parent, vgName, partList)
, m_PESize(peSize) , m_PESize(peSize)
, m_Devices(devices) , m_Devices(devices)
@ -66,7 +66,7 @@ void CreateVolumeGroupDialog::accept()
QString& tname = targetName(); QString& tname = targetName();
tname = dialogWidget().vgName().text(); tname = dialogWidget().vgName().text();
targetPVList().insert(targetPVList().end(), dialogWidget().listPV().checkedItems().begin(), dialogWidget().listPV().checkedItems().end()); targetPVList().append(dialogWidget().listPV().checkedItems());
qint32& pesize = peSize(); qint32& pesize = peSize();
pesize = dialogWidget().spinPESize().value(); pesize = dialogWidget().spinPESize().value();

2
src/gui/createvolumegroupdialog.h
View File

@ -31,7 +31,7 @@ class CreateVolumeGroupDialog : public VolumeGroupDialog
Q_DISABLE_COPY(CreateVolumeGroupDialog) Q_DISABLE_COPY(CreateVolumeGroupDialog)
public: public:
CreateVolumeGroupDialog(QWidget* parent, QString& vgName, std::vector<const Partition*>& pvList, qint32& peSize, QList<Device*> devices); CreateVolumeGroupDialog(QWidget* parent, QString& vgName, QVector<const Partition*>& pvList, qint32& peSize, QList<Device*> devices);
protected: protected:
void accept() override; void accept() override;

4
src/gui/listphysicalvolumes.cpp
View File

@ -35,9 +35,9 @@ void ListPhysicalVolumes::addPartition(const Partition& p, bool checked)
listPhysicalVolumes().addItem(item); listPhysicalVolumes().addItem(item);
} }
std::vector<const Partition *> ListPhysicalVolumes::checkedItems() QVector<const Partition *> ListPhysicalVolumes::checkedItems()
{ {
std::vector<const Partition *> partitionList; QVector<const Partition *> partitionList;
for (int i = 0; i < listPhysicalVolumes().count(); i++) { for (int i = 0; i < listPhysicalVolumes().count(); i++) {
ListPhysicalVolumeWidgetItem* item = dynamic_cast<ListPhysicalVolumeWidgetItem*>(listPhysicalVolumes().item(i)); ListPhysicalVolumeWidgetItem* item = dynamic_cast<ListPhysicalVolumeWidgetItem*>(listPhysicalVolumes().item(i));
if(item && item->checkState() == Qt::Checked) if(item && item->checkState() == Qt::Checked)

4
src/gui/listphysicalvolumes.h
View File

@ -23,7 +23,7 @@
#include <core/partition.h> #include <core/partition.h>
#include <vector> #include <QVector>
#include <QWidget> #include <QWidget>
@ -50,7 +50,7 @@ public:
void addPartition(const Partition& p, bool checked); void addPartition(const Partition& p, bool checked);
std::vector<const Partition *> checkedItems(); QVector<const Partition *> checkedItems();
QListWidget& listPhysicalVolumes() { QListWidget& listPhysicalVolumes() {
Q_ASSERT(m_ListPhysicalVolumes); Q_ASSERT(m_ListPhysicalVolumes);

8
src/gui/mainwindow.cpp
View File

@ -1101,12 +1101,12 @@ void MainWindow::onExportPartitionTable()
void MainWindow::onCreateNewVolumeGroup() void MainWindow::onCreateNewVolumeGroup()
{ {
QString vgName; QString vgName;
std::vector<const Partition*> pvList; QVector<const Partition*> pvList;
qint32 peSize = 4; qint32 peSize = 4;
// *NOTE*: vgName & pvList will be modified and validated by the dialog // *NOTE*: vgName & pvList will be modified and validated by the dialog
QPointer<CreateVolumeGroupDialog> dlg = new CreateVolumeGroupDialog(this, vgName, pvList, peSize, operationStack().previewDevices()); QPointer<CreateVolumeGroupDialog> dlg = new CreateVolumeGroupDialog(this, vgName, pvList, peSize, operationStack().previewDevices());
if (dlg->exec() == QDialog::Accepted) if (dlg->exec() == QDialog::Accepted)
operationStack().push(new CreateVolumeGroupOperation(vgName, QList<const Partition*>::fromVector(QVector<const Partition*>::fromStdVector(pvList)), peSize)); operationStack().push(new CreateVolumeGroupOperation(vgName, QList<const Partition*>::fromVector(pvList), peSize));
delete dlg; delete dlg;
} }
@ -1116,12 +1116,12 @@ void MainWindow::onResizeVolumeGroup()
if (pmWidget().selectedDevice()->type() == Device::LVM_Device) { if (pmWidget().selectedDevice()->type() == Device::LVM_Device) {
LvmDevice* d = dynamic_cast<LvmDevice*>(pmWidget().selectedDevice()); LvmDevice* d = dynamic_cast<LvmDevice*>(pmWidget().selectedDevice());
std::vector<const Partition*> pvList; QVector<const Partition*> pvList;
// *NOTE*: pvList will be modified and validated by the dialog // *NOTE*: pvList will be modified and validated by the dialog
QPointer<ResizeVolumeGroupDialog> dlg = new ResizeVolumeGroupDialog(this, d, pvList); QPointer<ResizeVolumeGroupDialog> dlg = new ResizeVolumeGroupDialog(this, d, pvList);
if (dlg->exec() == QDialog::Accepted) if (dlg->exec() == QDialog::Accepted)
operationStack().push(new ResizeVolumeGroupOperation(*d, QList<const Partition*>::fromVector(QVector<const Partition*>::fromStdVector(pvList)))); operationStack().push(new ResizeVolumeGroupOperation(*d, QList<const Partition*>::fromVector(pvList)));
delete dlg; delete dlg;
} }

4
src/gui/resizevolumegroupdialog.cpp
View File

@ -35,7 +35,7 @@
@param parent pointer to the parent widget @param parent pointer to the parent widget
@param d the Device to show properties for @param d the Device to show properties for
*/ */
ResizeVolumeGroupDialog::ResizeVolumeGroupDialog(QWidget* parent, VolumeManagerDevice* d, std::vector<const Partition*>& partList) ResizeVolumeGroupDialog::ResizeVolumeGroupDialog(QWidget* parent, VolumeManagerDevice* d, QVector<const Partition*>& partList)
: VolumeGroupDialog(parent, d->name(), partList) : VolumeGroupDialog(parent, d->name(), partList)
, m_Device(d) , m_Device(d)
{ {
@ -83,6 +83,6 @@ void ResizeVolumeGroupDialog::setupConstraints()
void ResizeVolumeGroupDialog::accept() void ResizeVolumeGroupDialog::accept()
{ {
targetPVList().insert(targetPVList().end(), dialogWidget().listPV().checkedItems().begin(), dialogWidget().listPV().checkedItems().end()); targetPVList().append(dialogWidget().listPV().checkedItems());
QDialog::accept(); QDialog::accept();
} }

2
src/gui/resizevolumegroupdialog.h
View File

@ -31,7 +31,7 @@ class ResizeVolumeGroupDialog : public VolumeGroupDialog
Q_DISABLE_COPY(ResizeVolumeGroupDialog) Q_DISABLE_COPY(ResizeVolumeGroupDialog)
public: public:
ResizeVolumeGroupDialog(QWidget* parent, VolumeManagerDevice *d, std::vector<const Partition*>& partList); ResizeVolumeGroupDialog(QWidget* parent, VolumeManagerDevice *d, QVector<const Partition*>& partList);
protected: protected:
void accept() override; void accept() override;

4
src/gui/volumegroupdialog.cpp
View File

@ -37,7 +37,7 @@
@param vgName Volume Group name @param vgName Volume Group name
@param pvList List of LVM Physical Volumes used to create Volume Group @param pvList List of LVM Physical Volumes used to create Volume Group
*/ */
VolumeGroupDialog::VolumeGroupDialog(QWidget* parent, QString& vgName, std::vector<const Partition*>& pvList) : VolumeGroupDialog::VolumeGroupDialog(QWidget* parent, QString& vgName, QVector<const Partition*>& pvList) :
QDialog(parent), QDialog(parent),
m_DialogWidget(new VolumeGroupWidget(this)), m_DialogWidget(new VolumeGroupWidget(this)),
m_TargetName(vgName), m_TargetName(vgName),
@ -131,7 +131,7 @@ void VolumeGroupDialog::updateSectorInfos()
void VolumeGroupDialog::updateSizeInfos() void VolumeGroupDialog::updateSizeInfos()
{ {
const std::vector<const Partition *> checkedPartitions = dialogWidget().listPV().checkedItems(); const QVector<const Partition *> checkedPartitions = dialogWidget().listPV().checkedItems();
m_TotalSize = 0; m_TotalSize = 0;
for (const auto &p : checkedPartitions) 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 m_TotalSize += p->capacity() - p->capacity() % (dialogWidget().spinPESize().value() * Capacity::unitFactor(Capacity::Byte, Capacity::MiB)); // subtract space which is too small to hold PE

10
src/gui/volumegroupdialog.h
View File

@ -20,7 +20,7 @@
#define VOLUMEGROUPDIALOG__H #define VOLUMEGROUPDIALOG__H
#include <vector> #include <QVector>
#include <QDialog> #include <QDialog>
#include <QDialogButtonBox> #include <QDialogButtonBox>
@ -35,7 +35,7 @@ class VolumeGroupDialog : public QDialog
Q_DISABLE_COPY(VolumeGroupDialog) Q_DISABLE_COPY(VolumeGroupDialog)
public: public:
VolumeGroupDialog(QWidget* parent, QString& vgName, std::vector<const Partition*>& pvList); VolumeGroupDialog(QWidget* parent, QString& vgName, QVector<const Partition*>& pvList);
~VolumeGroupDialog(); ~VolumeGroupDialog();
protected: protected:
@ -67,11 +67,11 @@ protected:
return m_TargetName; return m_TargetName;
} }
std::vector<const Partition*>& targetPVList() { QVector<const Partition*>& targetPVList() {
return m_TargetPVList; return m_TargetPVList;
} }
const std::vector<const Partition*>& targetPVList() const { const QVector<const Partition*>& targetPVList() const {
return m_TargetPVList; return m_TargetPVList;
} }
@ -89,7 +89,7 @@ protected:
protected: protected:
VolumeGroupWidget* m_DialogWidget; VolumeGroupWidget* m_DialogWidget;
QString& m_TargetName; QString& m_TargetName;
std::vector<const Partition*>& m_TargetPVList; QVector<const Partition*>& m_TargetPVList;
bool m_IsValidSize; bool m_IsValidSize;
bool m_IsValidName; bool m_IsValidName;