From d27455b6f08e42470f375de679b1751a4972d73b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Mon, 4 Dec 2017 21:18:37 +0000 Subject: [PATCH] Avoid unnecessary QString encoding/decoding. CCBUG: 384321 --- src/fs/luks.cpp | 2 +- src/plugins/libparted/libpartedbackend.cpp | 2 +- src/plugins/sfdisk/sfdiskbackend.cpp | 6 +++--- src/plugins/sfdisk/sfdiskpartitiontable.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/fs/luks.cpp b/src/fs/luks.cpp index 86dbaea..91402c2 100644 --- a/src/fs/luks.cpp +++ b/src/fs/luks.cpp @@ -572,7 +572,7 @@ void luks::getMapperName(const QString& deviceNode) m_MapperName = QString(); if (cmd.run(-1) && cmd.exitCode() == 0) { - const QJsonDocument jsonDocument = QJsonDocument::fromJson(cmd.output().toLocal8Bit()); + const QJsonDocument jsonDocument = QJsonDocument::fromJson(cmd.rawOutput()); QJsonObject jsonObject = jsonDocument.object(); const QJsonArray jsonArray = jsonObject[QLatin1String("blockdevices")].toArray(); for (const auto &deviceLine : jsonArray) { diff --git a/src/plugins/libparted/libpartedbackend.cpp b/src/plugins/libparted/libpartedbackend.cpp index 8a06bb4..71aa1b8 100644 --- a/src/plugins/libparted/libpartedbackend.cpp +++ b/src/plugins/libparted/libpartedbackend.cpp @@ -426,7 +426,7 @@ QList LibPartedBackend::scanDevices(bool excludeReadOnly) QStringLiteral("type,name") }); if (cmd.run(-1) && cmd.exitCode() == 0) { - const QJsonDocument jsonDocument = QJsonDocument::fromJson(cmd.output().toLocal8Bit()); + const QJsonDocument jsonDocument = QJsonDocument::fromJson(cmd.rawOutput()); QJsonObject jsonObject = jsonDocument.object(); const QJsonArray jsonArray = jsonObject[QLatin1String("blockdevices")].toArray(); for (const auto &deviceLine : jsonArray) { diff --git a/src/plugins/sfdisk/sfdiskbackend.cpp b/src/plugins/sfdisk/sfdiskbackend.cpp index bd99ecf..68f0c15 100644 --- a/src/plugins/sfdisk/sfdiskbackend.cpp +++ b/src/plugins/sfdisk/sfdiskbackend.cpp @@ -72,7 +72,7 @@ QList SfdiskBackend::scanDevices(bool excludeReadOnly) QStringLiteral("type,name") }); if (cmd.run(-1) && cmd.exitCode() == 0) { - const QJsonDocument jsonDocument = QJsonDocument::fromJson(cmd.output().toLocal8Bit()); + const QJsonDocument jsonDocument = QJsonDocument::fromJson(cmd.rawOutput()); const QJsonObject jsonObject = jsonDocument.object(); const QJsonArray jsonArray = jsonObject[QLatin1String("blockdevices")].toArray(); for (const auto &deviceLine : jsonArray) { @@ -140,7 +140,7 @@ Device* SfdiskBackend::scanDevice(const QString& deviceNode) if (jsonCommand.exitCode() != 0) return d; - const QJsonObject jsonObject = QJsonDocument::fromJson(jsonCommand.output().toLocal8Bit()).object(); + const QJsonObject jsonObject = QJsonDocument::fromJson(jsonCommand.rawOutput()).object(); const QJsonObject partitionTable = jsonObject[QLatin1String("partitiontable")].toObject(); QString tableType = partitionTable[QLatin1String("label")].toString(); @@ -298,7 +298,7 @@ FileSystem::Type SfdiskBackend::detectFileSystem(const QString& partitionPath) partitionPath }); if (lsblkCommand.run(-1) && lsblkCommand.exitCode() == 0) { - const QJsonArray partitionArray = QJsonDocument::fromJson(lsblkCommand.output().toLocal8Bit()).object()[QLatin1String("blockdevices")].toArray(); + const QJsonArray partitionArray = QJsonDocument::fromJson(lsblkCommand.rawOutput()).object()[QLatin1String("blockdevices")].toArray(); for (const auto &partition : partitionArray) { QJsonObject partitionObject = partition.toObject(); diff --git a/src/plugins/sfdisk/sfdiskpartitiontable.cpp b/src/plugins/sfdisk/sfdiskpartitiontable.cpp index 87caed3..e2ceeaf 100644 --- a/src/plugins/sfdisk/sfdiskpartitiontable.cpp +++ b/src/plugins/sfdisk/sfdiskpartitiontable.cpp @@ -139,7 +139,7 @@ FileSystem::Type SfdiskPartitionTable::detectFileSystemBySector(Report& report, ExternalCommand jsonCommand(QStringLiteral("sfdisk"), { QStringLiteral("--json"), device.deviceNode() } ); if (jsonCommand.run(-1) && jsonCommand.exitCode() == 0) { - const QJsonArray partitionTable = QJsonDocument::fromJson(jsonCommand.output().toLocal8Bit()).object()[QLatin1String("partitiontable")].toObject()[QLatin1String("partitions")].toArray(); + const QJsonArray partitionTable = QJsonDocument::fromJson(jsonCommand.rawOutput()).object()[QLatin1String("partitiontable")].toObject()[QLatin1String("partitions")].toArray(); for (const auto &partition : partitionTable) { const QJsonObject partitionObject = partition.toObject(); const qint64 start = partitionObject[QLatin1String("start")].toVariant().toLongLong();