From f09cb6435ec8ec6175d098b6bb5cb5bfb5871f54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sun, 3 Dec 2017 12:40:57 +0000 Subject: [PATCH] Fix conversion to/from QByteArray in sfdisk backend. CCBUG: 384321 --- src/plugins/sfdisk/sfdiskbackend.cpp | 6 +++--- src/plugins/sfdisk/sfdiskdevice.cpp | 2 +- src/plugins/sfdisk/sfdiskpartitiontable.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/plugins/sfdisk/sfdiskbackend.cpp b/src/plugins/sfdisk/sfdiskbackend.cpp index 1989fdf..bd99ecf 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().toUtf8()); + const QJsonDocument jsonDocument = QJsonDocument::fromJson(cmd.output().toLocal8Bit()); 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().toUtf8()).object(); + const QJsonObject jsonObject = QJsonDocument::fromJson(jsonCommand.output().toLocal8Bit()).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().toUtf8()).object()[QLatin1String("blockdevices")].toArray(); + const QJsonArray partitionArray = QJsonDocument::fromJson(lsblkCommand.output().toLocal8Bit()).object()[QLatin1String("blockdevices")].toArray(); for (const auto &partition : partitionArray) { QJsonObject partitionObject = partition.toObject(); diff --git a/src/plugins/sfdisk/sfdiskdevice.cpp b/src/plugins/sfdisk/sfdiskdevice.cpp index 6f80850..c8d816e 100644 --- a/src/plugins/sfdisk/sfdiskdevice.cpp +++ b/src/plugins/sfdisk/sfdiskdevice.cpp @@ -71,7 +71,7 @@ bool SfdiskDevice::createPartitionTable(Report& report, const PartitionTable& pt if (ptable.type() == PartitionTable::msdos || ptable.type() == PartitionTable::msdos_sectorbased) tableType = QByteArrayLiteral("dos"); else - tableType = ptable.typeName().toLatin1(); + tableType = ptable.typeName().toLocal8Bit(); ExternalCommand createCommand(report, QStringLiteral("sfdisk"), { m_deviceNode } ); if ( createCommand.start(-1) && createCommand.write(QByteArrayLiteral("label: ") + tableType + diff --git a/src/plugins/sfdisk/sfdiskpartitiontable.cpp b/src/plugins/sfdisk/sfdiskpartitiontable.cpp index c6544c0..87caed3 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().toUtf8()).object()[QLatin1String("partitiontable")].toObject()[QLatin1String("partitions")].toArray(); + const QJsonArray partitionTable = QJsonDocument::fromJson(jsonCommand.output().toLocal8Bit()).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();