From d797a472290141df42adf859afa39627cc5c6c3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Thu, 31 Aug 2017 10:48:10 +0100 Subject: [PATCH] QList->QVector. --- src/core/lvmdevice.cpp | 4 ++-- src/core/lvmdevice.h | 13 +++++++------ src/jobs/createvolumegroupjob.cpp | 2 +- src/jobs/createvolumegroupjob.h | 11 ++++++----- src/ops/createvolumegroupoperation.cpp | 2 +- src/ops/createvolumegroupoperation.h | 6 +++--- src/ops/resizevolumegroupoperation.cpp | 2 +- src/ops/resizevolumegroupoperation.h | 10 +++++----- 8 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/core/lvmdevice.cpp b/src/core/lvmdevice.cpp index 0a20cba..b9899ff 100644 --- a/src/core/lvmdevice.cpp +++ b/src/core/lvmdevice.cpp @@ -62,7 +62,7 @@ LvmDevice::LvmDevice(const QString& vgName, const QString& iconName) * shared list of PV's paths that will be added to any VGs. * (have been added to an operation, but not yet applied) */ -QList LvmDevice::s_DirtyPVs; +QVector LvmDevice::s_DirtyPVs; LvmDevice::~LvmDevice() { @@ -416,7 +416,7 @@ bool LvmDevice::movePV(Report& report, const QString& pvPath, const QStringList& return (cmd.run(-1) && cmd.exitCode() == 0); } -bool LvmDevice::createVG(Report& report, const QString vgName, const QList& pvList, const qint32 peSize) +bool LvmDevice::createVG(Report& report, const QString vgName, const QVector& pvList, const qint32 peSize) { QStringList args = QStringList(); args << QStringLiteral("vgcreate") << QStringLiteral("--physicalextentsize") << QString::number(peSize); diff --git a/src/core/lvmdevice.h b/src/core/lvmdevice.h index 66c00d2..87e0c98 100644 --- a/src/core/lvmdevice.h +++ b/src/core/lvmdevice.h @@ -27,8 +27,9 @@ #include #include #include -#include #include +#include +#include class PartitionTable; class Report; @@ -54,7 +55,7 @@ public: const QStringList partitionNodes() const override; qint64 partitionSize(QString& partitionPath) const override; - static QList s_DirtyPVs; + static QVector s_DirtyPVs; public: static QList scanSystemLVM(); @@ -83,7 +84,7 @@ public: static bool movePV(Report& report, const QString& pvPath, const QStringList& destinations = QStringList()); static bool removeVG(Report& report, LvmDevice& d); - static bool createVG(Report& report, const QString vgName, const QList& pvList, const qint32 peSize = 4); // peSize in megabytes + static bool createVG(Report& report, const QString vgName, const QVector& pvList, const qint32 peSize = 4); // peSize in megabytes static bool deactivateVG(Report& report, const LvmDevice& d); static bool activateVG(Report& report, const LvmDevice& d); @@ -113,10 +114,10 @@ public: QStringList* LVPathList() const { return m_LVPathList; } - QList & physicalVolumes() { + QVector & physicalVolumes() { return m_PVs; } - const QList & physicalVolumes() const { + const QVector & physicalVolumes() const { return m_PVs; } @@ -133,7 +134,7 @@ private: QString m_UUID; mutable QStringList* m_LVPathList; - QList m_PVs; + QVector m_PVs; mutable QHash* m_LVSizeMap; }; diff --git a/src/jobs/createvolumegroupjob.cpp b/src/jobs/createvolumegroupjob.cpp index b2d62df..1891bc8 100644 --- a/src/jobs/createvolumegroupjob.cpp +++ b/src/jobs/createvolumegroupjob.cpp @@ -29,7 +29,7 @@ * @param pvList List of LVM Physical Volumes used to create Volume Group * @param peSize LVM Physical Extent size in MiB */ -CreateVolumeGroupJob::CreateVolumeGroupJob(const QString& vgName, const QList& pvList, const qint32 peSize) : +CreateVolumeGroupJob::CreateVolumeGroupJob(const QString& vgName, const QVector& pvList, const qint32 peSize) : Job(), m_vgName(vgName), m_pvList(pvList), diff --git a/src/jobs/createvolumegroupjob.h b/src/jobs/createvolumegroupjob.h index 19e3df9..14dfc80 100644 --- a/src/jobs/createvolumegroupjob.h +++ b/src/jobs/createvolumegroupjob.h @@ -20,9 +20,10 @@ #define CREATEVOLUMEGROUPJOB_H #include "core/partition.h" - #include "jobs/job.h" +#include + class LvmDevice; class Report; @@ -31,7 +32,7 @@ class QString; class CreateVolumeGroupJob : public Job { public: - CreateVolumeGroupJob(const QString& vgName, const QList& pvList, const qint32 peSize); + CreateVolumeGroupJob(const QString& vgName, const QVector& pvList, const qint32 peSize); public: bool run(Report& parent) override; @@ -44,10 +45,10 @@ protected: const QString vgName() const { return m_vgName; } - QList& pvList() { + QVector& pvList() { return m_pvList; } - const QList& pvList() const { + const QVector& pvList() const { return m_pvList; } @@ -57,7 +58,7 @@ protected: private: QString m_vgName; - QList m_pvList; + QVector m_pvList; qint32 m_PESize; }; diff --git a/src/ops/createvolumegroupoperation.cpp b/src/ops/createvolumegroupoperation.cpp index 8120b73..8771bc0 100644 --- a/src/ops/createvolumegroupoperation.cpp +++ b/src/ops/createvolumegroupoperation.cpp @@ -32,7 +32,7 @@ * @param pvList List of LVM Physical Volumes used to create Volume Group * @param peSize LVM Physical Extent size in MiB */ -CreateVolumeGroupOperation::CreateVolumeGroupOperation(const QString& vgName, const QList& pvList, const qint32 peSize) : +CreateVolumeGroupOperation::CreateVolumeGroupOperation(const QString& vgName, const QVector& pvList, const qint32 peSize) : Operation(), m_CreateVolumeGroupJob(new CreateVolumeGroupJob(vgName, pvList, peSize)), m_PVList(pvList) diff --git a/src/ops/createvolumegroupoperation.h b/src/ops/createvolumegroupoperation.h index 84afb7e..4d23f02 100644 --- a/src/ops/createvolumegroupoperation.h +++ b/src/ops/createvolumegroupoperation.h @@ -38,7 +38,7 @@ class LIBKPMCORE_EXPORT CreateVolumeGroupOperation : public Operation friend class OperationStack; public: - CreateVolumeGroupOperation(const QString& vgName, const QList& pvList, const qint32 peSize = 4); + CreateVolumeGroupOperation(const QString& vgName, const QVector& pvList, const qint32 peSize = 4); public: QString iconName() const override { @@ -62,13 +62,13 @@ protected: return m_CreateVolumeGroupJob; } - const QList& PVList() { + const QVector& PVList() { return m_PVList; } private: CreateVolumeGroupJob* m_CreateVolumeGroupJob; - const QList m_PVList; + const QVector m_PVList; }; #endif diff --git a/src/ops/resizevolumegroupoperation.cpp b/src/ops/resizevolumegroupoperation.cpp index f91c905..d253746 100644 --- a/src/ops/resizevolumegroupoperation.cpp +++ b/src/ops/resizevolumegroupoperation.cpp @@ -33,7 +33,7 @@ @param d the Device to create the new PartitionTable on @param partList list of LVM Physical Volumes that should be in LVM Volume Group */ -ResizeVolumeGroupOperation::ResizeVolumeGroupOperation(LvmDevice& d, const QList& partList) +ResizeVolumeGroupOperation::ResizeVolumeGroupOperation(LvmDevice& d, const QVector& partList) : Operation() , m_Device(d) , m_TargetList(partList) diff --git a/src/ops/resizevolumegroupoperation.h b/src/ops/resizevolumegroupoperation.h index 8c0acf7..1f612ec 100644 --- a/src/ops/resizevolumegroupoperation.h +++ b/src/ops/resizevolumegroupoperation.h @@ -40,7 +40,7 @@ class LIBKPMCORE_EXPORT ResizeVolumeGroupOperation : public Operation friend class OperationStack; public: - ResizeVolumeGroupOperation(LvmDevice& dev, const QList& partlist); + ResizeVolumeGroupOperation(LvmDevice& dev, const QVector& partlist); public: QString iconName() const override { @@ -65,11 +65,11 @@ protected: const LvmDevice& device() const { return m_Device; } - const QList& targetList() const { + const QVector& targetList() const { return m_TargetList; } - const QList& currentList() const { + const QVector& currentList() const { return m_CurrentList; } @@ -96,8 +96,8 @@ protected: private: LvmDevice& m_Device; - QList m_TargetList; - QList m_CurrentList; + QVector m_TargetList; + QVector m_CurrentList; qint64 m_TargetSize; qint64 m_CurrentSize;