diff --git a/src/core/partition.cpp b/src/core/partition.cpp index 8dbd58e..2cf590c 100644 --- a/src/core/partition.cpp +++ b/src/core/partition.cpp @@ -28,7 +28,6 @@ #include "util/report.h" #include -#include #include #include @@ -215,7 +214,7 @@ void Partition::adjustLogicalNumbers(qint32 deletedNumber, qint32 insertedNumber foreach(Partition * p, children()) { QString path = p->partitionPath(); - path.remove(QRegularExpression(QStringLiteral("(\\d+$)"))); + path.remove(QRegExp(QStringLiteral("([0-9]+$)"))); if (deletedNumber > 4 && p->number() > deletedNumber) p->setPartitionPath(path + QString::number(p->number() - 1)); else if (insertedNumber > 4 && p->number() >= insertedNumber) diff --git a/src/fs/btrfs.cpp b/src/fs/btrfs.cpp index 7bd3907..cbf2de6 100644 --- a/src/fs/btrfs.cpp +++ b/src/fs/btrfs.cpp @@ -22,8 +22,8 @@ #include "util/capacity.h" #include "util/report.h" -#include #include +#include #include #include @@ -109,12 +109,11 @@ qint64 btrfs::readUsedCapacity(const QString& deviceNode) const ExternalCommand cmd(QStringLiteral("btrfs"), { QStringLiteral("filesystem"), QStringLiteral("show"), QStringLiteral("--raw"), deviceNode }); - if (cmd.run(-1) && cmd.exitCode() == 0) { - QRegularExpression re(QStringLiteral(" used (\\d+) path ") + deviceNode); - QRegularExpressionMatch reBytesUsed = re.match(cmd.output()); + if (cmd.run()) { + QRegExp rxBytesUsed(QStringLiteral(" used (\\d+) path ") + deviceNode); - if (reBytesUsed.hasMatch()) - return reBytesUsed.captured(1).toLongLong(); + if (rxBytesUsed.indexIn(cmd.output()) != -1) + return rxBytesUsed.cap(1).toLongLong(); } return -1; diff --git a/src/fs/exfat.cpp b/src/fs/exfat.cpp index 5322da4..6406051 100644 --- a/src/fs/exfat.cpp +++ b/src/fs/exfat.cpp @@ -22,6 +22,7 @@ #include "util/capacity.h" #include +#include namespace FS { diff --git a/src/fs/ext2.cpp b/src/fs/ext2.cpp index 94fd990..78f95af 100644 --- a/src/fs/ext2.cpp +++ b/src/fs/ext2.cpp @@ -21,8 +21,8 @@ #include "util/externalcommand.h" #include "util/capacity.h" -#include #include +#include namespace FS { @@ -98,25 +98,22 @@ qint64 ext2::readUsedCapacity(const QString& deviceNode) const if (cmd.run()) { qint64 blockCount = -1; - QRegularExpression re(QStringLiteral("Block count:\\s+(\\w+)")); - QRegularExpressionMatch reBlockCount = re.match(cmd.output()); + QRegExp rxBlockCount(QStringLiteral("Block count:\\s*(\\d+)")); - if (reBlockCount.hasMatch()) - blockCount = reBlockCount.captured(1).toLongLong(); + if (rxBlockCount.indexIn(cmd.output()) != -1) + blockCount = rxBlockCount.cap(1).toLongLong(); qint64 freeBlocks = -1; - re.setPattern(QStringLiteral("Free blocks:\\s+(\\d+)")); - QRegularExpressionMatch reFreeBlocks = re.match(cmd.output()); + QRegExp rxFreeBlocks(QStringLiteral("Free blocks:\\s*(\\d+)")); - if (reFreeBlocks.hasMatch()) - freeBlocks = reFreeBlocks.captured(1).toLongLong(); + if (rxFreeBlocks.indexIn(cmd.output()) != -1) + freeBlocks = rxFreeBlocks.cap(1).toLongLong(); qint64 blockSize = -1; - re.setPattern(QStringLiteral("Block size:\\s+(\\d+)")); - QRegularExpressionMatch reBlockSize = re.match(cmd.output()); + QRegExp rxBlockSize(QStringLiteral("Block size:\\s*(\\d+)")); - if (reBlockSize.hasMatch()) - blockSize = reBlockSize.captured(1).toLongLong(); + if (rxBlockSize.indexIn(cmd.output()) != -1) + blockSize = rxBlockSize.cap(1).toLongLong(); if (blockCount > -1 && freeBlocks > -1 && blockSize > -1) return (blockCount - freeBlocks) * blockSize; diff --git a/src/fs/fat16.cpp b/src/fs/fat16.cpp index 24dea32..459c75b 100644 --- a/src/fs/fat16.cpp +++ b/src/fs/fat16.cpp @@ -24,9 +24,9 @@ #include -#include #include #include +#include #include @@ -106,21 +106,19 @@ qint64 fat16::readUsedCapacity(const QString& deviceNode) const { ExternalCommand cmd(QStringLiteral("fsck.msdos"), { QStringLiteral("-n"), QStringLiteral("-v"), deviceNode }); - if (cmd.run(-1) && cmd.exitCode() == 0) { + if (cmd.run()) { qint64 usedClusters = -1; - QRegularExpression re(QStringLiteral("files, (\\d+)/\\d+ ")); - QRegularExpressionMatch reClusters = re.match(cmd.output()); + QRegExp rxClusters(QStringLiteral("files, (\\d+)/\\d+ ")); - if (reClusters.hasMatch()) - usedClusters = reClusters.captured(1).toLongLong(); + if (rxClusters.indexIn(cmd.output()) != -1) + usedClusters = rxClusters.cap(1).toLongLong(); qint64 clusterSize = -1; - re.setPattern(QStringLiteral("(\\d+) bytes per cluster")); - QRegularExpressionMatch reClusterSize = re.match(cmd.output()); + QRegExp rxClusterSize(QStringLiteral("(\\d+) bytes per cluster")); - if (reClusterSize.hasMatch()) - clusterSize = reClusterSize.captured(1).toLongLong(); + if (rxClusterSize.indexIn(cmd.output()) != -1) + clusterSize = rxClusterSize.cap(1).toLongLong(); if (usedClusters > -1 && clusterSize > -1) return usedClusters * clusterSize; diff --git a/src/fs/hfs.cpp b/src/fs/hfs.cpp index 9b531f9..715738d 100644 --- a/src/fs/hfs.cpp +++ b/src/fs/hfs.cpp @@ -22,6 +22,7 @@ #include "util/capacity.h" #include +#include namespace FS { diff --git a/src/fs/jfs.cpp b/src/fs/jfs.cpp index bd1c0ed..0e664d1 100644 --- a/src/fs/jfs.cpp +++ b/src/fs/jfs.cpp @@ -21,8 +21,8 @@ #include "util/report.h" #include "util/capacity.h" -#include #include +#include #include #include @@ -100,29 +100,26 @@ qint64 jfs::readUsedCapacity(const QString& deviceNode) const if (cmd.start() && cmd.write("dm") == 2 && cmd.waitFor()) { qint64 blockSize = -1; - QRegularExpression re(QStringLiteral("Block Size: (\\d+)")); - QRegularExpressionMatch reBlockSize = re.match(cmd.output()); + QRegExp rxBlockSize(QStringLiteral("Block Size: (\\d+)")); - if (reBlockSize.hasMatch()) - blockSize = reBlockSize.captured(1).toLongLong(); + if (rxBlockSize.indexIn(cmd.output()) != -1) + blockSize = rxBlockSize.cap(1).toLongLong(); qint64 nBlocks = -1; - re.setPattern(QStringLiteral("dn_mapsize:\\s+0x(\\x+)")); - QRegularExpressionMatch renBlocks = re.match(cmd.output()); + QRegExp rxnBlocks(QStringLiteral("dn_mapsize:\\s+0x([0-9a-f]+)")); bool ok = false; - if (renBlocks.hasMatch()) { - nBlocks = renBlocks.captured(1).toLongLong(&ok, 16); + if (rxnBlocks.indexIn(cmd.output()) != -1) { + nBlocks = rxnBlocks.cap(1).toLongLong(&ok, 16); if (!ok) nBlocks = -1; } qint64 nFree = -1; - re.setPattern(QStringLiteral("dn_nfree:\\s+0x(\\x+)")); - QRegularExpressionMatch renFree = re.match(cmd.output()); + QRegExp rxnFree(QStringLiteral("dn_nfree:\\s+0x([0-9a-f]+)")); - if (renFree.hasMatch()) { - nFree = renFree.captured(1).toLongLong(&ok, 16); + if (rxnFree.indexIn(cmd.output()) != -1) { + nFree = rxnFree.cap(1).toLongLong(&ok, 16); if (!ok) nFree = -1; } diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp index aac6bb3..45ed0aa 100644 --- a/src/fs/luks.cpp +++ b/src/fs/luks.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -495,7 +494,7 @@ bool luks::resize(Report& report, const QString& deviceNode, qint64 newLength) c else if (m_innerFs->resize(report, mapperNode, payloadLength)) { ExternalCommand cryptResizeCmd(report, QStringLiteral("cryptsetup"), { QStringLiteral("--size"), QString::number(payloadLength / m_logicalSectorSize), QStringLiteral("resize"), mapperNode }); - report.line() << xi18nc("@info/plain", "Resize encrypted file system on partition %1.", deviceNode); + report.line() << xi18nc("@info/plain", "Resizing encrypted file system on partition %1.", deviceNode); if (cryptResizeCmd.run(-1) && cryptResizeCmd.exitCode() == 0) { return true; @@ -523,7 +522,7 @@ QString luks::readOuterUUID(const QString &deviceNode) const bool luks::updateUUID(Report& report, const QString& deviceNode) const { - const QString uuid = QUuid::createUuid().toString().remove(QRegularExpression(QStringLiteral("\\{|\\}"))); + const QString uuid = QUuid::createUuid().toString().remove(QRegExp(QStringLiteral("\\{|\\}"))); ExternalCommand cmd(report, QStringLiteral("cryptsetup"), @@ -555,11 +554,10 @@ QString luks::getCipherName(const QString& deviceNode) { ExternalCommand cmd(QStringLiteral("cryptsetup"), { QStringLiteral("luksDump"), deviceNode }); - if (cmd.run(-1) && cmd.exitCode() == 0) { - QRegularExpression re(QStringLiteral("Cipher name:\\s+(\\w+)")); - QRegularExpressionMatch reCipherName = re.match(cmd.output()); - if (reCipherName.hasMatch()) - return reCipherName.captured(1); + if (cmd.run()) { + QRegExp rxCipherName(QStringLiteral("(?:Cipher name:\\s+)([A-Za-z0-9-]+)")); + if (rxCipherName.indexIn(cmd.output()) > -1) + return rxCipherName.cap(1); } return QStringLiteral("---"); } @@ -568,11 +566,10 @@ QString luks::getCipherMode(const QString& deviceNode) { ExternalCommand cmd(QStringLiteral("cryptsetup"), { QStringLiteral("luksDump"), deviceNode }); - if (cmd.run(-1) && cmd.exitCode() == 0) { - QRegularExpression re(QStringLiteral("Cipher mode:\\s+(\\w+)")); - QRegularExpressionMatch reCipherMode = re.match(cmd.output()); - if (reCipherMode.hasMatch()) - return reCipherMode.captured(1); + if (cmd.run()) { + QRegExp rxCipherMode(QStringLiteral("(?:Cipher mode:\\s+)([A-Za-z0-9-]+)")); + if (rxCipherMode.indexIn(cmd.output()) > -1) + return rxCipherMode.cap(1); } return QStringLiteral("---"); } @@ -581,11 +578,10 @@ QString luks::getHashName(const QString& deviceNode) { ExternalCommand cmd(QStringLiteral("cryptsetup"), { QStringLiteral("luksDump"), deviceNode }); - if (cmd.run(-1) && cmd.exitCode() == 0) { - QRegularExpression re(QStringLiteral("Hash spec:\\s+(\\w+)")); - QRegularExpressionMatch reHash = re.match(cmd.output()); - if (reHash.hasMatch()) - return reHash.captured(1); + if (cmd.run()) { + QRegExp rxHash(QStringLiteral("(?:Hash spec:\\s+)([A-Za-z0-9-]+)")); + if (rxHash.indexIn(cmd.output()) > -1) + return rxHash.cap(1); } return QStringLiteral("---"); } @@ -594,11 +590,10 @@ QString luks::getKeySize(const QString& deviceNode) { ExternalCommand cmd(QStringLiteral("cryptsetup"), { QStringLiteral("luksDump"), deviceNode }); - if (cmd.run(-1) && cmd.exitCode() == 0) { - QRegularExpression re(QStringLiteral("MK bits:\\s+(\\d+)")); - QRegularExpressionMatch reKeySize = re.match(cmd.output()); - if (reKeySize.hasMatch()) - return reKeySize.captured(1); + if (cmd.run()) { + QRegExp rxKeySize(QStringLiteral("(?:MK bits:\\s+)(\\d+)")); + if (rxKeySize.indexIn(cmd.output()) > -1) + return rxKeySize.cap(1); } return QStringLiteral("---"); } @@ -607,11 +602,10 @@ QString luks::getPayloadOffset(const QString& deviceNode) { ExternalCommand cmd(QStringLiteral("cryptsetup"), { QStringLiteral("luksDump"), deviceNode }); - if (cmd.run(-1) && cmd.exitCode() == 0) { - QRegularExpression re(QStringLiteral("Payload offset:\\s+(\\d+)")); - QRegularExpressionMatch rePayloadOffset = re.match(cmd.output()); - if (rePayloadOffset.hasMatch()) - return rePayloadOffset.captured(1); + if (cmd.run()) { + QRegExp rxPayloadOffset(QStringLiteral("(?:Payload offset:\\s+)(\\d+)")); + if (rxPayloadOffset.indexIn(cmd.output()) > -1) + return rxPayloadOffset.cap(1); } return QStringLiteral("---"); } diff --git a/src/fs/nilfs2.cpp b/src/fs/nilfs2.cpp index 6fbdecc..d100bdb 100644 --- a/src/fs/nilfs2.cpp +++ b/src/fs/nilfs2.cpp @@ -24,7 +24,6 @@ #include -#include #include #include #include @@ -125,15 +124,12 @@ qint64 nilfs2::readUsedCapacity(const QString& deviceNode) const { ExternalCommand cmd(QStringLiteral("nilfs-tune"), { QStringLiteral("-l"), deviceNode }); - if (cmd.run(-1) && cmd.exitCode() == 0) { - QRegularExpression re(QStringLiteral("Block size:\\s+(\\d+)")); - QRegularExpressionMatch reBlockSize = re.match(cmd.output()); - re.setPattern(QStringLiteral("Device size:\\s+(\\d+)")); - QRegularExpressionMatch reDeviceSize = re.match(cmd.output()); - re.setPattern(QStringLiteral("Free blocks count:\\s+(\\d+)")); - QRegularExpressionMatch reFreeBlocks = re.match(cmd.output()); - if (reBlockSize.hasMatch() && reDeviceSize.hasMatch() && reFreeBlocks.hasMatch()) - return reDeviceSize.captured(1).toLongLong() - reBlockSize.captured(1).toLongLong() * reFreeBlocks.captured(1).toLongLong(); + if (cmd.run()) { + QRegExp rxBlockSize(QStringLiteral("(?:Block size:\\s+)(\\d+)")); + QRegExp rxDeviceSize(QStringLiteral("(?:Device size:\\s+)(\\d+)")); + QRegExp rxFreeBlocks(QStringLiteral("(?:Free blocks count:\\s+)(\\d+)")); + if (rxBlockSize.indexIn(cmd.output()) != -1 && rxDeviceSize.indexIn(cmd.output()) != -1 && rxFreeBlocks.indexIn(cmd.output()) != -1) + return rxDeviceSize.cap(1).toLongLong() - rxBlockSize.cap(1).toLongLong() * rxFreeBlocks.cap(1).toLongLong(); } return -1; diff --git a/src/fs/ntfs.cpp b/src/fs/ntfs.cpp index 8d5c6ed..fd21c30 100644 --- a/src/fs/ntfs.cpp +++ b/src/fs/ntfs.cpp @@ -25,14 +25,13 @@ #include -#include #include #include #include #include -#include #include +#include namespace FS { @@ -108,13 +107,12 @@ qint64 ntfs::readUsedCapacity(const QString& deviceNode) const { ExternalCommand cmd(QStringLiteral("ntfsresize"), { QStringLiteral("--info"), QStringLiteral("--force"), QStringLiteral("--no-progress-bar"), deviceNode }); - if (cmd.run(-1) && cmd.exitCode() == 0) { + if (cmd.run()) { qint64 usedBytes = -1; - QRegularExpression re(QStringLiteral("resize at (\\d+) bytes")); - QRegularExpressionMatch reUsedBytes = re.match(cmd.output()); + QRegExp rxUsedBytes(QStringLiteral("resize at (\\d+) bytes")); - if (reUsedBytes.hasMatch()) - usedBytes = reUsedBytes.captured(1).toLongLong(); + if (rxUsedBytes.indexIn(cmd.output()) != -1) + usedBytes = rxUsedBytes.cap(1).toLongLong(); if (usedBytes > -1) return usedBytes; diff --git a/src/fs/ocfs2.cpp b/src/fs/ocfs2.cpp index 1b38664..53c25f8 100644 --- a/src/fs/ocfs2.cpp +++ b/src/fs/ocfs2.cpp @@ -21,8 +21,8 @@ #include "util/externalcommand.h" #include "util/capacity.h" -#include #include +#include namespace FS { @@ -129,12 +129,11 @@ bool ocfs2::resize(Report& report, const QString& deviceNode, qint64 length) con ExternalCommand cmdBlockSize(QStringLiteral("debugfs.ocfs2"), { QStringLiteral("--request"), QStringLiteral("stats"), deviceNode }); qint32 blockSize = -1; - if (cmdBlockSize.run(-1) && cmdBlockSize.exitCode() == 0) { - QRegularExpression re(QStringLiteral("Block Size Bits: (\\d+)")); - QRegularExpressionMatch reBlockSizeBits = re.match(cmdBlockSize.output()); + if (cmdBlockSize.run()) { + QRegExp rxBlockSizeBits(QStringLiteral("Block Size Bits: (\\d+)")); - if (reBlockSizeBits.hasMatch()) - blockSize = 1 << reBlockSizeBits.captured(1).toInt(); + if (rxBlockSizeBits.indexIn(cmdBlockSize.output()) != -1) + blockSize = 1 << rxBlockSizeBits.cap(1).toInt(); } if (blockSize == -1) diff --git a/src/fs/reiser4.cpp b/src/fs/reiser4.cpp index 5070e67..ce70981 100644 --- a/src/fs/reiser4.cpp +++ b/src/fs/reiser4.cpp @@ -21,8 +21,8 @@ #include "util/capacity.h" #include "util/externalcommand.h" -#include #include +#include namespace FS { @@ -87,27 +87,24 @@ qint64 reiser4::readUsedCapacity(const QString& deviceNode) const { ExternalCommand cmd(QStringLiteral("debugfs.reiser4"), { deviceNode }); - if (cmd.run(-1) && cmd.exitCode() == 16) { + if (cmd.run()) { qint64 blocks = -1; - QRegularExpression re(QStringLiteral("blocks:\\s+(\\d+)")); - QRegularExpressionMatch reBlocks = re.match(cmd.output()); + QRegExp rxBlocks(QStringLiteral("blocks:\\s+(\\d+)")); - if (reBlocks.hasMatch()) - blocks = reBlocks.captured(1).toLongLong(); + if (rxBlocks.indexIn(cmd.output()) != -1) + blocks = rxBlocks.cap(1).toLongLong(); qint64 blockSize = -1; - re.setPattern(QStringLiteral("blksize:\\s+(\\d+)")); - QRegularExpressionMatch reBlockSize = re.match(cmd.output()); + QRegExp rxBlockSize(QStringLiteral("blksize:\\s+(\\d+)")); - if (reBlockSize.hasMatch()) - blockSize = reBlockSize.captured(1).toLongLong(); + if (rxBlockSize.indexIn(cmd.output()) != -1) + blockSize = rxBlockSize.cap(1).toLongLong(); qint64 freeBlocks = -1; - re.setPattern(QStringLiteral("free blocks:\\s+(\\d+)")); - QRegularExpressionMatch reFreeBlocks = re.match(cmd.output()); + QRegExp rxFreeBlocks(QStringLiteral("free blocks:\\s+(\\d+)")); - if (reFreeBlocks.hasMatch()) - freeBlocks = reFreeBlocks.captured(1).toLongLong(); + if (rxFreeBlocks.indexIn(cmd.output()) != -1) + freeBlocks = rxFreeBlocks.cap(1).toLongLong(); if (blocks > - 1 && blockSize > -1 && freeBlocks > -1) return (blocks - freeBlocks) * blockSize; diff --git a/src/fs/reiserfs.cpp b/src/fs/reiserfs.cpp index 055710d..41925fb 100644 --- a/src/fs/reiserfs.cpp +++ b/src/fs/reiserfs.cpp @@ -21,9 +21,9 @@ #include "util/externalcommand.h" #include "util/capacity.h" -#include #include #include +#include #include namespace FS @@ -102,27 +102,24 @@ qint64 reiserfs::readUsedCapacity(const QString& deviceNode) const { ExternalCommand cmd(QStringLiteral("debugreiserfs"), { deviceNode }); - if (cmd.run(-1) && cmd.exitCode() == 16) { + if (cmd.run()) { qint64 blockCount = -1; - QRegularExpression re(QStringLiteral("Count of blocks[^:]+: (\\d+)")); - QRegularExpressionMatch reBlockCount = re.match(cmd.output()); + QRegExp rxBlockCount(QStringLiteral("Count of blocks[^:]+: (\\d+)")); - if (reBlockCount.hasMatch()) - blockCount = reBlockCount.captured(1).toLongLong(); + if (rxBlockCount.indexIn(cmd.output()) != -1) + blockCount = rxBlockCount.cap(1).toLongLong(); qint64 blockSize = -1; - re.setPattern(QStringLiteral("Blocksize: (\\d+)")); - QRegularExpressionMatch reBlockSize = re.match(cmd.output()); + QRegExp rxBlockSize(QStringLiteral("Blocksize: (\\d+)")); - if (reBlockSize.hasMatch()) - blockSize = reBlockSize.captured(1).toLongLong(); + if (rxBlockSize.indexIn(cmd.output()) != -1) + blockSize = rxBlockSize.cap(1).toLongLong(); qint64 freeBlocks = -1; - re.setPattern(QStringLiteral("Free blocks[^:]+: (\\d+)")); - QRegularExpressionMatch reFreeBlocks = re.match(cmd.output()); + QRegExp rxFreeBlocks(QStringLiteral("Free blocks[^:]+: (\\d+)")); - if (reFreeBlocks.hasMatch()) - freeBlocks = reFreeBlocks.captured(1).toLongLong(); + if (rxFreeBlocks.indexIn(cmd.output()) != -1) + freeBlocks = rxFreeBlocks.cap(1).toLongLong(); if (blockCount > -1 && blockSize > -1 && freeBlocks > -1) return (blockCount - freeBlocks) * blockSize; @@ -169,7 +166,7 @@ bool reiserfs::resize(Report& report, const QString& deviceNode, qint64 length) bool reiserfs::updateUUID(Report& report, const QString& deviceNode) const { - const QString uuid = QUuid::createUuid().toString().remove(QRegularExpression(QStringLiteral("\\{|\\}"))); + const QString uuid = QUuid::createUuid().toString().remove(QRegExp(QStringLiteral("\\{|\\}"))); ExternalCommand cmd(report, QStringLiteral("reiserfstune"), { QStringLiteral("--uuid"), uuid, deviceNode }); return cmd.run(-1) && cmd.exitCode() == 0; } diff --git a/src/fs/xfs.cpp b/src/fs/xfs.cpp index 2dd32e4..949d280 100644 --- a/src/fs/xfs.cpp +++ b/src/fs/xfs.cpp @@ -22,9 +22,9 @@ #include "util/capacity.h" #include "util/report.h" -#include #include #include +#include #include #include @@ -102,27 +102,24 @@ qint64 xfs::readUsedCapacity(const QString& deviceNode) const { ExternalCommand cmd(QStringLiteral("xfs_db"), { QStringLiteral("-c"), QStringLiteral("sb 0"), QStringLiteral("-c"), QStringLiteral("print"), deviceNode }); - if (cmd.run(-1) && cmd.exitCode() == 0) { + if (cmd.run()) { qint64 dBlocks = -1; - QRegularExpression re(QStringLiteral("dblocks = (\\d+)")); - QRegularExpressionMatch reDBlocks = re.match(cmd.output()); + QRegExp rxDBlocks(QStringLiteral("dblocks = (\\d+)")); - if (reDBlocks.hasMatch()) - dBlocks = reDBlocks.captured(1).toLongLong(); + if (rxDBlocks.indexIn(cmd.output()) != -1) + dBlocks = rxDBlocks.cap(1).toLongLong(); qint64 blockSize = -1; - re.setPattern(QStringLiteral("blocksize = (\\d+)")); - QRegularExpressionMatch reBlockSize = re.match(cmd.output()); + QRegExp rxBlockSize(QStringLiteral("blocksize = (\\d+)")); - if (reBlockSize.hasMatch()) - blockSize = reBlockSize.captured(1).toLongLong(); + if (rxBlockSize.indexIn(cmd.output()) != -1) + blockSize = rxBlockSize.cap(1).toLongLong(); qint64 fdBlocks = -1; - re.setPattern(QStringLiteral("fdblocks = (\\d+)")); - QRegularExpressionMatch reFdBlocks = re.match(cmd.output()); + QRegExp rxFdBlocks(QStringLiteral("fdblocks = (\\d+)")); - if (reFdBlocks.hasMatch()) - fdBlocks = reFdBlocks.captured(1).toLongLong(); + if (rxFdBlocks.indexIn(cmd.output()) != -1) + fdBlocks = rxFdBlocks.cap(1).toLongLong(); if (dBlocks > -1 && blockSize > -1 && fdBlocks > -1) return (dBlocks - fdBlocks) * blockSize;