From a10c8d3aaad0fd0535d584cb8aa7a27ce1956e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Mon, 8 Aug 2016 18:37:21 +0100 Subject: [PATCH] Convert to C++11 for loop where it is safe (avoid detaching Qt objects). --- src/core/devicescanner.cpp | 8 +++--- src/core/lvmdevice.cpp | 32 +++++++++++------------ src/core/lvmdevice.h | 14 +++++----- src/core/operationrunner.cpp | 2 +- src/core/operationstack.cpp | 8 +++--- src/core/partition.cpp | 14 +++++----- src/core/partitionnode.cpp | 24 ++++++++--------- src/core/partitiontable.cpp | 34 ++++++++++++++----------- src/core/partitiontable.h | 2 +- src/core/volumemanagerdevice.cpp | 2 +- src/core/volumemanagerdevice.h | 2 +- src/fs/filesystemfactory.cpp | 2 +- src/fs/lvm2_pv.cpp | 12 ++++----- src/gui/partwidget.cpp | 2 +- src/gui/partwidgetbase.cpp | 6 ++--- src/jobs/createvolumegroupjob.cpp | 2 +- src/jobs/deactivatelogicalvolumejob.cpp | 8 +++--- src/jobs/deactivatelogicalvolumejob.h | 9 +++---- src/jobs/deactivatevolumegroupjob.cpp | 2 -- src/jobs/movephysicalvolumejob.cpp | 8 +++--- src/jobs/removevolumegroupjob.cpp | 2 -- src/jobs/resizevolumegroupjob.cpp | 6 ++--- src/jobs/setpartflagsjob.cpp | 2 +- src/ops/createvolumegroupoperation.cpp | 2 +- src/ops/createvolumegroupoperation.h | 2 +- src/ops/operation.cpp | 2 +- src/ops/resizevolumegroupoperation.cpp | 10 ++++---- src/util/report.cpp | 4 +-- 28 files changed, 107 insertions(+), 116 deletions(-) diff --git a/src/core/devicescanner.cpp b/src/core/devicescanner.cpp index d4b4f7b..4bb8d49 100644 --- a/src/core/devicescanner.cpp +++ b/src/core/devicescanner.cpp @@ -62,13 +62,13 @@ void DeviceScanner::scan() clear(); - QList deviceList = CoreBackendManager::self()->backend()->scanDevices(); - QList lvmList = LvmDevice::scanSystemLVM(); + const QList deviceList = CoreBackendManager::self()->backend()->scanDevices(); + const QList lvmList = LvmDevice::scanSystemLVM(); - foreach(Device * d, deviceList) + for (Device * d : deviceList) operationStack().addDevice(d); - foreach(Device * d, lvmList) + for (Device * d : lvmList) operationStack().addDevice(d); operationStack().sortDevices(); diff --git a/src/core/lvmdevice.cpp b/src/core/lvmdevice.cpp index a2d968a..b8b18ff 100644 --- a/src/core/lvmdevice.cpp +++ b/src/core/lvmdevice.cpp @@ -71,7 +71,7 @@ void LvmDevice::initPartitions() qint64 lastusable = totalPE() - 1; PartitionTable* pTable = new PartitionTable(PartitionTable::vmd, firstUsable, lastusable); - foreach (Partition* p, scanPartitions(pTable)) { + for (Partition* p : scanPartitions(pTable)) { LVSizeMap()->insert(p->partitionPath(), p->length()); pTable->append(p); } @@ -84,10 +84,10 @@ void LvmDevice::initPartitions() /** * @return sorted Partition(LV) Array */ -QList LvmDevice::scanPartitions(PartitionTable* pTable) const +const QList LvmDevice::scanPartitions(PartitionTable* pTable) const { QList pList; - foreach (QString lvPath, lvPathList()) { + for (QString lvPath : lvPathList()) { pList.append(scanPartition(lvPath, pTable)); } return pList; @@ -184,7 +184,7 @@ Partition* LvmDevice::scanPartition(const QString& lvpath, PartitionTable* pTabl QList LvmDevice::scanSystemLVM() { QList lvmList; - foreach (QString vgname, getVGs()) { + for (QString vgname : getVGs()) { lvmList.append(new LvmDevice(vgname)); } return lvmList; @@ -205,23 +205,23 @@ qint64 LvmDevice::mappedSector(const QString& lvpath, qint64 sector) const return mSector; } -QStringList LvmDevice::deviceNodeList() const +const QStringList LvmDevice::deviceNodeList() const { return *PVPathList(); } -QStringList LvmDevice::lvPathList() const +const QStringList LvmDevice::lvPathList() const { return *LVPathList(); } -QStringList LvmDevice::getVGs() +const QStringList LvmDevice::getVGs() { QStringList vgList; QString output = getField(QStringLiteral("vg_name")); if (!output.isEmpty()) { - QStringList vgnameList = output.split(QStringLiteral("\n"), QString::SkipEmptyParts); - foreach(QString vgname, vgnameList) { + const QStringList vgnameList = output.split(QStringLiteral("\n"), QString::SkipEmptyParts); + for (QString vgname : vgnameList) { vgList.append(vgname.trimmed()); } } @@ -234,8 +234,8 @@ QStringList LvmDevice::getPVs(const QString& vgname) QString cmdOutput = getField(QStringLiteral("pv_name"), vgname); if (cmdOutput.size()) { - QStringList tempPathList = cmdOutput.split(QStringLiteral("\n"), QString::SkipEmptyParts); - foreach(QString devPath, tempPathList) { + const QStringList tempPathList = cmdOutput.split(QStringLiteral("\n"), QString::SkipEmptyParts); + for (QString devPath : tempPathList) { devPathList.append(devPath.trimmed()); } } @@ -248,8 +248,8 @@ QStringList LvmDevice::getLVs(const QString& vgname) QString cmdOutput = getField(QStringLiteral("lv_path"), vgname); if (cmdOutput.size()) { - QStringList tempPathList = cmdOutput.split(QStringLiteral("\n"), QString::SkipEmptyParts); - foreach(QString lvPath, tempPathList) { + const QStringList tempPathList = cmdOutput.split(QStringLiteral("\n"), QString::SkipEmptyParts); + for (QString lvPath : tempPathList) { lvPathList.append(lvPath.trimmed()); } } @@ -424,7 +424,7 @@ bool LvmDevice::movePV(Report& report, LvmDevice& dev, const QString& pvPath, co args << QStringLiteral("pvmove"); args << pvPath; if (!destinations.isEmpty()) { - foreach (QString destPath, destinations) { + for (QString destPath : destinations) { args << destPath.trimmed(); } } @@ -438,7 +438,7 @@ bool LvmDevice::createVG(Report& report, const QString vgname, const QStringList QStringList args = QStringList(); args << QStringLiteral("vgcreate") << QStringLiteral("--physicalextentsize") << QString::number(peSize); args << vgname; - foreach (QString pvnode, pvlist) { + for (QString pvnode : pvlist) { args << pvnode.trimmed(); } ExternalCommand cmd(report, QStringLiteral("lvm"), args); @@ -464,7 +464,7 @@ bool LvmDevice::deactivateVG(Report& report, const LvmDevice& dev) return deactivate.run(-1) && deactivate.exitCode() == 0; } -bool LvmDevice::deactivateLV(Report& report, LvmDevice& dev, Partition& part) +bool LvmDevice::deactivateLV(Report& report, const LvmDevice& dev, const Partition& part) { Q_UNUSED(dev); ExternalCommand deactivate(report, QStringLiteral("lvm"), diff --git a/src/core/lvmdevice.h b/src/core/lvmdevice.h index b3ab188..0319e9e 100644 --- a/src/core/lvmdevice.h +++ b/src/core/lvmdevice.h @@ -49,10 +49,10 @@ public: ~LvmDevice(); public: - QList scanPartitions(PartitionTable* pTable) const; + const QList scanPartitions(PartitionTable* pTable) const; Partition* scanPartition(const QString& lvPath, PartitionTable* pTable) const; - QStringList deviceNodeList() const override; - QStringList lvPathList() const; + const QStringList deviceNodeList() const override; + const QStringList lvPathList() const; static QStringList s_DirtyPVs; public: @@ -69,13 +69,13 @@ public: static QStringList getPVs(const QString& vgname); static QStringList getLVs(const QString& vgname); - static QStringList getVGs(); + static const QStringList getVGs(); static bool removeLV(Report& report, LvmDevice& dev, Partition& part); static bool createLV(Report& report, LvmDevice& dev, Partition& part, const QString& lvname); static bool createLVSnapshot(Report& report, LvmDevice& dev, Partition& lvpart, const QString& name, const qint64 extents = 0); static bool resizeLV(Report& report, LvmDevice& dev, Partition& part); - static bool deactivateLV(Report& report, LvmDevice& dev, Partition& part); + static bool deactivateLV(Report& report, const LvmDevice& dev, const Partition& part); static bool activateLV(Report& report, LvmDevice& dev, Partition& part); static bool removePV(Report& report, LvmDevice& dev, const QString& pvPath); @@ -88,7 +88,7 @@ public: static bool activateVG(Report& report, const LvmDevice& dev); protected: - void initPartitions(); + void initPartitions() override; qint64 mappedSector(const QString& lvpath, qint64 sector) const override; public: @@ -108,7 +108,7 @@ public: return m_UUID; } - QStringList* LVPathList() const { + const QStringList* LVPathList() const { return m_LVPathList; } diff --git a/src/core/operationrunner.cpp b/src/core/operationrunner.cpp index c08672f..68d537a 100644 --- a/src/core/operationrunner.cpp +++ b/src/core/operationrunner.cpp @@ -96,7 +96,7 @@ qint32 OperationRunner::numJobs() const { qint32 result = 0; - foreach(const Operation * op, operationStack().operations()) + for (const Operation * op : operationStack().operations()) result += op->jobs().size(); return result; diff --git a/src/core/operationstack.cpp b/src/core/operationstack.cpp index 4f4d2c9..d7c06bf 100644 --- a/src/core/operationstack.cpp +++ b/src/core/operationstack.cpp @@ -457,7 +457,7 @@ bool OperationStack::contains(const Partition* p) const { Q_ASSERT(p); - foreach(Operation * o, operations()) { + for (Operation * o : operations()) { if (o->targets(*p)) return true; @@ -511,9 +511,9 @@ Device* OperationStack::findDeviceForPartition(const Partition* p) if (part == p) return d; - foreach(const Partition * child, part->children()) - if (child == p) - return d; + for (const Partition * child : part->children()) + if (child == p) + return d; } } diff --git a/src/core/partition.cpp b/src/core/partition.cpp index 2240663..78284fa 100644 --- a/src/core/partition.cpp +++ b/src/core/partition.cpp @@ -106,7 +106,7 @@ Partition::Partition(const Partition& other) : m_State(other.m_State) { setPartitionPath(other.m_PartitionPath); - foreach(const Partition * child, other.children()) { + for (const Partition * child : other.children()) { Partition* p = new Partition(*child); p->setParent(this); m_Children.append(p); @@ -121,7 +121,7 @@ Partition& Partition::operator=(const Partition& other) clearChildren(); - foreach(const Partition * child, other.children()) { + for (const Partition * child : other.children()) { Partition* p = new Partition(*child); p->setParent(this); m_Children.append(p); @@ -179,7 +179,7 @@ qint64 Partition::sectorsUsed() const return fileSystem().sectorsUsed(); qint64 result = 0; - foreach(const Partition * p, children()) + for (const Partition * p : children()) if (!p->roles().has(PartitionRole::Unallocated)) result += p->length(); @@ -230,7 +230,7 @@ qint64 Partition::maxFirstSector() const { qint64 rval = -1; - foreach(const Partition * child, children()) + for (const Partition * child : children()) if (!child->roles().has(PartitionRole::Unallocated) && (child->firstSector() < rval || rval == -1)) rval = child->firstSector(); @@ -242,7 +242,7 @@ qint64 Partition::minLastSector() const { qint64 rval = -1; - foreach(const Partition * child, children()) + for (const Partition * child : children()) if (!child->roles().has(PartitionRole::Unallocated) && child->lastSector() > rval) rval = child->lastSector(); @@ -252,7 +252,7 @@ qint64 Partition::minLastSector() const /** @return true if the Partition has children */ bool Partition::hasChildren() const { - foreach(const Partition * child, children()) + for (const Partition * child : children()) if (!child->roles().has(PartitionRole::Unallocated)) return true; @@ -365,7 +365,7 @@ QTextStream& operator<<(QTextStream& stream, const Partition& p) { QStringList flagList; - foreach(const PartitionTable::Flag & f, PartitionTable::flagList()) { + for (const PartitionTable::Flag & f : PartitionTable::flagList()) { if (p.activeFlags() & f) flagList.append(PartitionTable::flagName(f)); } diff --git a/src/core/partitionnode.cpp b/src/core/partitionnode.cpp index 7e56072..b9245f6 100644 --- a/src/core/partitionnode.cpp +++ b/src/core/partitionnode.cpp @@ -142,8 +142,8 @@ Partition* PartitionNode::findPartitionBySector(qint64 s, const PartitionRole& r foreach(Partition * p, children()) { // (women and) children first. ;-) foreach(Partition * child, p->children()) - if ((child->roles().roles() & role.roles()) && s >= child->firstSector() && s <= child->lastSector()) - return child; + if ((child->roles().roles() & role.roles()) && s >= child->firstSector() && s <= child->lastSector()) + return child; if ((p->roles().roles() & role.roles()) && s >= p->firstSector() && s <= p->lastSector()) return p; @@ -157,10 +157,10 @@ Partition* PartitionNode::findPartitionBySector(qint64 s, const PartitionRole& r */ const Partition* PartitionNode::findPartitionBySector(qint64 s, const PartitionRole& role) const { - foreach(const Partition * p, children()) { - foreach(const Partition * child, p->children()) - if ((child->roles().roles() & role.roles()) && s >= child->firstSector() && s <= child->lastSector()) - return child; + for (const Partition * p : children()) { + for (const Partition * child : p->children()) + if ((child->roles().roles() & role.roles()) && s >= child->firstSector() && s <= child->lastSector()) + return child; if ((p->roles().roles() & role.roles()) && s >= p->firstSector() && s <= p->lastSector()) return p; @@ -190,9 +190,9 @@ qint32 PartitionNode::highestMountedChild() const { qint32 result = -1; - foreach(const Partition * p, children()) - if (p->number() > result && p->isMounted()) - result = p->number(); + for (const Partition * p : children()) + if (p->number() > result && p->isMounted()) + result = p->number(); return result; } @@ -200,9 +200,9 @@ qint32 PartitionNode::highestMountedChild() const /** @return true if any of the partition's children are mounted */ bool PartitionNode::isChildMounted() const { - foreach(const Partition * child, children()) - if (child->isMounted() || (child->hasChildren() && child->isChildMounted())) - return true; + for (const Partition * child : children()) + if (child->isMounted() || (child->hasChildren() && child->isChildMounted())) + return true; return false; } diff --git a/src/core/partitiontable.cpp b/src/core/partitiontable.cpp index ba02b1a..47c6a03 100644 --- a/src/core/partitiontable.cpp +++ b/src/core/partitiontable.cpp @@ -92,9 +92,10 @@ qint64 PartitionTable::freeSectorsAfter(const Partition& p) const qint64 PartitionTable::freeSectors() const { qint64 sectors = 0; - foreach(const Partition * p, children()) - if (p->roles().has(PartitionRole::Unallocated)) { - sectors += p->length(); + for (const Partition * p : children()) { + if (p->roles().has(PartitionRole::Unallocated)) { + sectors += p->length(); + } } return sectors; @@ -141,7 +142,7 @@ int PartitionTable::numPrimaries() const { int result = 0; - foreach(const Partition * p, children()) + for (const Partition * p : children()) if (p->roles().has(PartitionRole::Primary) || p->roles().has(PartitionRole::Extended)) result++; @@ -206,7 +207,7 @@ QString PartitionTable::flagName(Flag f) } /** @return list of all flags */ -QList PartitionTable::flagList() +const QList PartitionTable::flagList() { QList rval; @@ -359,7 +360,7 @@ void PartitionTable::insertUnallocated(const Device& d, PartitionNode* p, qint64 if (d.type() == Device::LVM_Device && !p->children().isEmpty()) { // rearranging all the partitions sector to keep all the unallocated space at the end lastEnd = 0; - foreach (Partition* child, children()) { + for (Partition* child : children()) { qint64 totalSector = child->length(); child->setFirstSector(lastEnd); child->setLastSector(lastEnd + totalSector - 1); @@ -505,11 +506,12 @@ bool PartitionTable::isSectorBased(const Device& d) const // see if we have more cylinder aligned partitions than sector // aligned ones. - foreach(const Partition * p, children()) - if (p->firstSector() % PartitionAlignment::sectorAlignment(diskDevice) == 0) - numSectorAligned++; - else if (p->firstSector() % diskDevice.cylinderSize() == 0) - numCylinderAligned++; + for (const Partition * p : children()) { + if (p->firstSector() % PartitionAlignment::sectorAlignment(diskDevice) == 0) + numSectorAligned++; + else if (p->firstSector() % diskDevice.cylinderSize() == 0) + numCylinderAligned++; + } return numSectorAligned >= numCylinderAligned; } @@ -542,15 +544,17 @@ QTextStream& operator<<(QTextStream& stream, const PartitionTable& ptable) QList partitions; - foreach(const Partition * p, ptable.children()) + for (const Partition * p : ptable.children()) { if (!p->roles().has(PartitionRole::Unallocated)) { partitions.append(p); if (p->roles().has(PartitionRole::Extended)) - foreach(const Partition * child, p->children()) - if (!child->roles().has(PartitionRole::Unallocated)) - partitions.append(child); + for (const Partition * child : p->children()) { + if (!child->roles().has(PartitionRole::Unallocated)) + partitions.append(child); + } } + } qSort(partitions.begin(), partitions.end(), isPartitionLessThan); diff --git a/src/core/partitiontable.h b/src/core/partitiontable.h index 938f7bf..e38189d 100644 --- a/src/core/partitiontable.h +++ b/src/core/partitiontable.h @@ -164,7 +164,7 @@ public: bool isSectorBased(const Device& d) const; - static QList flagList(); + static const QList flagList(); static QString flagName(Flag f); static QStringList flagNames(Flags f); diff --git a/src/core/volumemanagerdevice.cpp b/src/core/volumemanagerdevice.cpp index d110708..41678c4 100644 --- a/src/core/volumemanagerdevice.cpp +++ b/src/core/volumemanagerdevice.cpp @@ -37,7 +37,7 @@ VolumeManagerDevice::VolumeManagerDevice(const QString& name, QString VolumeManagerDevice::prettyDeviceNodeList() const { QString rval; - foreach (QString devNode, deviceNodeList()) { + for (QString devNode : deviceNodeList()) { rval += devNode + QStringLiteral(","); } diff --git a/src/core/volumemanagerdevice.h b/src/core/volumemanagerdevice.h index 1b5f354..4b7867a 100644 --- a/src/core/volumemanagerdevice.h +++ b/src/core/volumemanagerdevice.h @@ -48,7 +48,7 @@ class LIBKPMCORE_EXPORT VolumeManagerDevice : public Device public: VolumeManagerDevice(const QString& name, const QString& devicenode, const qint32 logicalSize, const qint64 totalLogical, const QString& iconname = QString(), Device::Type type = Device::Unknown_Device); virtual void initPartitions() = 0; - virtual QStringList deviceNodeList() const = 0; /** Return list of physical device or partitions that makes up volumeManagerDevice */ + virtual const QStringList deviceNodeList() const = 0; /** Return list of physical device or partitions that makes up volumeManagerDevice */ virtual qint64 mappedSector(const QString& devNode, qint64 sector) const = 0; public: diff --git a/src/fs/filesystemfactory.cpp b/src/fs/filesystemfactory.cpp index 53caace..312b07b 100644 --- a/src/fs/filesystemfactory.cpp +++ b/src/fs/filesystemfactory.cpp @@ -84,7 +84,7 @@ void FileSystemFactory::init() m_FileSystems.insert(FileSystem::Xfs, new FS::xfs(-1, -1, -1, QString())); m_FileSystems.insert(FileSystem::Zfs, new FS::zfs(-1, -1, -1, QString())); - foreach(FileSystem * fs, FileSystemFactory::map()) { + for (FileSystem * fs : FileSystemFactory::map()) { fs->init(); } diff --git a/src/fs/lvm2_pv.cpp b/src/fs/lvm2_pv.cpp index 66a4e26..5aa3010 100644 --- a/src/fs/lvm2_pv.cpp +++ b/src/fs/lvm2_pv.cpp @@ -205,7 +205,7 @@ qint64 lvm2_pv::getTotalPE(const QString& deviceNode) qint64 lvm2_pv::getTotalPE(const QStringList& deviceNodeList) { qint64 sum = 0; - foreach (QString deviceNode, deviceNodeList) { + for (QString deviceNode : deviceNodeList) { qint64 totalPE = getTotalPE(deviceNode); if (totalPE < 0) { sum = -1; @@ -224,7 +224,7 @@ qint64 lvm2_pv::getFreePE(const QString& deviceNode) qint64 lvm2_pv::getFreePE(const QStringList& deviceNodeList) { qint64 sum = 0; - foreach (QString deviceNode, deviceNodeList) { + for (QString deviceNode :deviceNodeList) { qint64 freePE = getFreePE(deviceNode); if (freePE < 0) { sum = -1; @@ -244,7 +244,7 @@ qint64 lvm2_pv::getAllocatedPE(const QString& deviceNode) qint64 lvm2_pv::getAllocatedPE(const QStringList& deviceNodeList) { qint64 sum = 0; - foreach (QString deviceNode, deviceNodeList) { + for (QString deviceNode : deviceNodeList) { qint64 allocatedPE = getAllocatedPE(deviceNode); if (allocatedPE < 0) { sum = -1; @@ -264,7 +264,7 @@ qint64 lvm2_pv::getPVSize(const QString& deviceNode) qint64 lvm2_pv::getPVSize(const QStringList& deviceNodeList) { qint64 sum = 0; - foreach (QString deviceNode, deviceNodeList) { + for (QString deviceNode : deviceNodeList) { qint64 pvsize = getPVSize(deviceNode); if (pvsize < 0) { sum = -1; @@ -312,8 +312,8 @@ QStringList lvm2_pv::getFreePV() QStringList rlist; QString output = getpvField(QStringLiteral("pv_name")); - QStringList pvList = output.split(QStringLiteral("\n"), QString::SkipEmptyParts); - foreach (QString pvnode, pvList) { + const QStringList pvList = output.split(QStringLiteral("\n"), QString::SkipEmptyParts); + for (QString pvnode : pvList) { if (!isUsed(pvnode.trimmed())) { rlist.append(pvnode.trimmed()); } diff --git a/src/gui/partwidget.cpp b/src/gui/partwidget.cpp index b87688b..f0a3667 100644 --- a/src/gui/partwidget.cpp +++ b/src/gui/partwidget.cpp @@ -62,7 +62,7 @@ void PartWidget::updateChildren() w->setParent(nullptr); } - foreach(const Partition * child, partition()->children()) { + for (const Partition * child : partition()->children()) { QWidget* w = new PartWidget(this, child); w->setVisible(true); } diff --git a/src/gui/partwidgetbase.cpp b/src/gui/partwidgetbase.cpp index 88ba884..575325a 100644 --- a/src/gui/partwidgetbase.cpp +++ b/src/gui/partwidgetbase.cpp @@ -31,7 +31,7 @@ template T sum(const QList& list) { T rval = 0; - foreach(const T & val, list) + for (const T & val : list) rval += val; return rval; } @@ -107,7 +107,7 @@ void PartWidgetBase::positionChildren(const QWidget* destWidget, const Partition return; qint64 totalLength = 0; - foreach(const Partition * p, partitions) + for (const Partition * p : partitions) totalLength += p->length(); if (totalLength < 1) @@ -146,7 +146,7 @@ QList PartWidgetBase::childWidgets() { QList rval; - foreach(QObject * o, children()) + for (QObject * o : children()) if (PartWidget* w = qobject_cast(o)) rval.append(w); diff --git a/src/jobs/createvolumegroupjob.cpp b/src/jobs/createvolumegroupjob.cpp index da1d28e..485034a 100644 --- a/src/jobs/createvolumegroupjob.cpp +++ b/src/jobs/createvolumegroupjob.cpp @@ -51,7 +51,7 @@ bool CreateVolumeGroupJob::run(Report& parent) QString CreateVolumeGroupJob::description() const { QString tmp = QString(); - foreach(QString name, pvList()) { + for (const QString name : pvList()) { tmp += QStringLiteral("\n") + name; } return xi18nc("@info/plain", "Create new Volume Group: %1 with PV: %2", vgName(), tmp); diff --git a/src/jobs/deactivatelogicalvolumejob.cpp b/src/jobs/deactivatelogicalvolumejob.cpp index ddc52c1..5b1f774 100644 --- a/src/jobs/deactivatelogicalvolumejob.cpp +++ b/src/jobs/deactivatelogicalvolumejob.cpp @@ -26,10 +26,8 @@ #include /** Creates a new DeactivateLogicalVolumeJob - @param vgname - @parem pvList */ -DeactivateLogicalVolumeJob::DeactivateLogicalVolumeJob(VolumeManagerDevice& dev, QStringList lvPaths) : +DeactivateLogicalVolumeJob::DeactivateLogicalVolumeJob(const VolumeManagerDevice& dev, const QStringList lvPaths) : Job(), m_Device(dev), m_LVList(lvPaths) @@ -43,9 +41,9 @@ bool DeactivateLogicalVolumeJob::run(Report& parent) Report* report = jobStarted(parent); if (device().type() == Device::LVM_Device) { - foreach (Partition* part, device().partitionTable()->children()) { + for (const Partition* part : device().partitionTable()->children()) { if (!part->roles().has(PartitionRole::Unallocated)) { - if (!LvmDevice::deactivateLV(*report, dynamic_cast(device()), *part)) { + if (!LvmDevice::deactivateLV(*report, dynamic_cast(device()), *part)) { rval = false; } } diff --git a/src/jobs/deactivatelogicalvolumejob.h b/src/jobs/deactivatelogicalvolumejob.h index 2224f58..ac2a246 100644 --- a/src/jobs/deactivatelogicalvolumejob.h +++ b/src/jobs/deactivatelogicalvolumejob.h @@ -30,16 +30,13 @@ class QString; class DeactivateLogicalVolumeJob : public Job { public: - DeactivateLogicalVolumeJob(VolumeManagerDevice& dev, QStringList lvPaths = {}); + DeactivateLogicalVolumeJob(const VolumeManagerDevice& dev, const QStringList lvPaths = {}); public: bool run(Report& parent) override; QString description() const override; protected: - VolumeManagerDevice& device() { - return m_Device; - } const VolumeManagerDevice& device() const { return m_Device; } @@ -49,8 +46,8 @@ protected: } private: - VolumeManagerDevice& m_Device; - QStringList m_LVList; + const VolumeManagerDevice& m_Device; + const QStringList m_LVList; }; #endif diff --git a/src/jobs/deactivatevolumegroupjob.cpp b/src/jobs/deactivatevolumegroupjob.cpp index fe5b907..1f8694b 100644 --- a/src/jobs/deactivatevolumegroupjob.cpp +++ b/src/jobs/deactivatevolumegroupjob.cpp @@ -24,8 +24,6 @@ #include /** Deactivate LVM Volume Group - @param vgname - @parem pvList */ DeactivateVolumeGroupJob::DeactivateVolumeGroupJob(VolumeManagerDevice& dev) : Job(), diff --git a/src/jobs/movephysicalvolumejob.cpp b/src/jobs/movephysicalvolumejob.cpp index ff4f220..f2f37e7 100644 --- a/src/jobs/movephysicalvolumejob.cpp +++ b/src/jobs/movephysicalvolumejob.cpp @@ -24,8 +24,6 @@ #include /** Creates a new MovePhysicalVolumeJob - @param vgname - @parem pvList */ MovePhysicalVolumeJob::MovePhysicalVolumeJob(LvmDevice& dev, const QStringList partlist) : Job(), @@ -41,13 +39,13 @@ bool MovePhysicalVolumeJob::run(Report& parent) Report* report = jobStarted(parent); QStringList destinations = LvmDevice::getPVs(device().name()); - foreach (QString partPath, partList()) { + for (const QString partPath : partList()) { if (destinations.contains(partPath)) { destinations.removeAll(partPath); } } - foreach (QString partPath, partList()) { + for (const QString partPath : partList()) { rval = LvmDevice::movePV(*report, device(), partPath, destinations); if (rval == false) { break; @@ -62,7 +60,7 @@ bool MovePhysicalVolumeJob::run(Report& parent) QString MovePhysicalVolumeJob::description() const { QString tmp = QString(); - foreach (QString path, partList()) { + for (const QString path : partList()) { tmp += path + QStringLiteral(","); } return xi18nc("@info/plain", "Move used PE in %1 on %2 to other available Physical Volumes", tmp, device().name()); diff --git a/src/jobs/removevolumegroupjob.cpp b/src/jobs/removevolumegroupjob.cpp index 516aa77..9c29614 100644 --- a/src/jobs/removevolumegroupjob.cpp +++ b/src/jobs/removevolumegroupjob.cpp @@ -24,8 +24,6 @@ #include /** Creates a new RemoveVolumeGroupJob - @param vgname - @parem pvList */ RemoveVolumeGroupJob::RemoveVolumeGroupJob(VolumeManagerDevice& dev) : Job(), diff --git a/src/jobs/resizevolumegroupjob.cpp b/src/jobs/resizevolumegroupjob.cpp index d361bea..7212c7c 100644 --- a/src/jobs/resizevolumegroupjob.cpp +++ b/src/jobs/resizevolumegroupjob.cpp @@ -24,8 +24,6 @@ #include /** Creates a new ResizeVolumeGroupJob - @param vgname - @parem pvList */ ResizeVolumeGroupJob::ResizeVolumeGroupJob(LvmDevice& dev, const QStringList partlist, const Type type) : Job(), @@ -41,7 +39,7 @@ bool ResizeVolumeGroupJob::run(Report& parent) Report* report = jobStarted(parent); - foreach (QString pvpath, partList()) { + for (const QString pvpath : partList()) { if (type() == ResizeVolumeGroupJob::Grow) { rval = LvmDevice::insertPV(*report, device(), pvpath); } else if (type() == ResizeVolumeGroupJob::Shrink) { @@ -60,7 +58,7 @@ bool ResizeVolumeGroupJob::run(Report& parent) QString ResizeVolumeGroupJob::description() const { QString tmp = QString(); - foreach (QString path, partList()) { + for (const QString path : partList()) { tmp += path + QStringLiteral(","); } if (type() == ResizeVolumeGroupJob::Grow) { diff --git a/src/jobs/setpartflagsjob.cpp b/src/jobs/setpartflagsjob.cpp index 6e9f7ee..004581c 100644 --- a/src/jobs/setpartflagsjob.cpp +++ b/src/jobs/setpartflagsjob.cpp @@ -70,7 +70,7 @@ bool SetPartFlagsJob::run(Report& parent) if (backendPartition) { quint32 count = 0; - foreach(const PartitionTable::Flag & f, PartitionTable::flagList()) { + for (const PartitionTable::Flag & f : PartitionTable::flagList()) { emit progress(++count); const bool state = (flags() & f) ? true : false; diff --git a/src/ops/createvolumegroupoperation.cpp b/src/ops/createvolumegroupoperation.cpp index 80764c5..9182ebd 100644 --- a/src/ops/createvolumegroupoperation.cpp +++ b/src/ops/createvolumegroupoperation.cpp @@ -56,7 +56,7 @@ void CreateVolumeGroupOperation::preview() void CreateVolumeGroupOperation::undo() { - foreach(QString pvpath, PVList()) { + for(QString pvpath : PVList()) { if (LvmDevice::s_DirtyPVs.contains(pvpath)) { LvmDevice::s_DirtyPVs.removeAll(pvpath); } diff --git a/src/ops/createvolumegroupoperation.h b/src/ops/createvolumegroupoperation.h index 97f4331..8f49fc5 100644 --- a/src/ops/createvolumegroupoperation.h +++ b/src/ops/createvolumegroupoperation.h @@ -61,7 +61,7 @@ protected: return m_CreateVolumeGroupJob; } - QStringList PVList() { + const QStringList PVList() { return m_PVList; } diff --git a/src/ops/operation.cpp b/src/ops/operation.cpp index e5db5e2..ab05b97 100644 --- a/src/ops/operation.cpp +++ b/src/ops/operation.cpp @@ -146,7 +146,7 @@ qint32 Operation::totalProgress() const { qint32 result = 0; - foreach(const Job * job, jobs()) + for (const Job * job : jobs()) result += job->numSteps(); return result; diff --git a/src/ops/resizevolumegroupoperation.cpp b/src/ops/resizevolumegroupoperation.cpp index 0140b93..19cc1a9 100644 --- a/src/ops/resizevolumegroupoperation.cpp +++ b/src/ops/resizevolumegroupoperation.cpp @@ -46,14 +46,14 @@ ResizeVolumeGroupOperation::ResizeVolumeGroupOperation(LvmDevice& dev, const QSt m_CurrentSize = FS::lvm2_pv::getPVSize(currentList()); QStringList toRemoveList = clist; - foreach (QString path, partlist) { + for (QString path : partlist) { if (toRemoveList.contains(path)) { toRemoveList.removeAll(path); } } QStringList toInsertList = partlist; - foreach (QString path, clist) { + for (QString path : clist) { if (toInsertList.contains(path)) { toInsertList.removeAll(path); } @@ -84,12 +84,12 @@ ResizeVolumeGroupOperation::ResizeVolumeGroupOperation(LvmDevice& dev, const QSt QString ResizeVolumeGroupOperation::description() const { QString tlist = QString(); - foreach (QString path, targetList()) { + for (QString path : targetList()) { tlist += path + QStringLiteral(","); } tlist.chop(1); QString clist = QString(); - foreach (QString path, currentList()) { + for (QString path : currentList()) { clist += path + QStringLiteral(","); } clist.chop(1); @@ -103,7 +103,7 @@ bool ResizeVolumeGroupOperation::targets(const Device& d) const bool ResizeVolumeGroupOperation::targets(const Partition& part) const { - foreach (QString partPath, targetList()) { + for (QString partPath : targetList()) { if (partPath == part.partitionPath()) { return true; } diff --git a/src/util/report.cpp b/src/util/report.cpp index 5a1b5bc..08adfc9 100644 --- a/src/util/report.cpp +++ b/src/util/report.cpp @@ -80,7 +80,7 @@ QString Report::toHtml() const if (children().size() == 0) s += QStringLiteral("
\n"); else - foreach(Report * child, children()) + for (Report * child : children()) s += child->toHtml(); if (!status().isEmpty()) @@ -109,7 +109,7 @@ QString Report::toText() const if (!output().isEmpty()) s += output() + QStringLiteral("\n"); - foreach(Report * child, children()) + for (const Report * child : children()) s += child->toText(); return s;