From 551654de0dd087a729e6bf7721bd7b9cd640e744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sun, 29 Nov 2020 13:08:53 +0000 Subject: [PATCH] Also rename source/targetFirstByte ot offsets in function declarations. --- src/util/externalcommandhelper.cpp | 6 +++--- src/util/externalcommandhelper.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/util/externalcommandhelper.cpp b/src/util/externalcommandhelper.cpp index f5a3aae..05d44c5 100644 --- a/src/util/externalcommandhelper.cpp +++ b/src/util/externalcommandhelper.cpp @@ -87,7 +87,7 @@ bool ExternalCommandHelper::readData(const QString& sourceDevice, QByteArray& bu if (size != buffer.size()) { qCritical() << xi18n("Could not read from device %1.", sourceDevice); - return false; + return false; } return true; @@ -274,7 +274,7 @@ QVariantMap ExternalCommandHelper::CopyBlocks(const QString& sourceDevice, const return reply; } -bool ExternalCommandHelper::WriteData(const QByteArray& buffer, const QString& targetDevice, const qint64 targetFirstByte) +bool ExternalCommandHelper::WriteData(const QByteArray& buffer, const QString& targetDevice, const qint64 targetOffset) { if (!isCallerAuthorized()) { return false; @@ -283,7 +283,7 @@ bool ExternalCommandHelper::WriteData(const QByteArray& buffer, const QString& t if ( targetDevice.left(5) != QStringLiteral("/dev/") ) return false; - return writeData(targetDevice, buffer, targetFirstByte); + return writeData(targetDevice, buffer, targetOffset); } QVariantMap ExternalCommandHelper::RunCommand(const QString& command, const QStringList& arguments, const QByteArray& input, const int processChannelMode) diff --git a/src/util/externalcommandhelper.h b/src/util/externalcommandhelper.h index 522248e..d0c72d4 100644 --- a/src/util/externalcommandhelper.h +++ b/src/util/externalcommandhelper.h @@ -37,8 +37,8 @@ public: public Q_SLOTS: Q_SCRIPTABLE QVariantMap RunCommand(const QString& command, const QStringList& arguments, const QByteArray& input, const int processChannelMode); - Q_SCRIPTABLE QVariantMap CopyBlocks(const QString& sourceDevice, const qint64 sourceFirstByte, const qint64 sourceLength, const QString& targetDevice, const qint64 targetFirstByte, const qint64 blockSize); - Q_SCRIPTABLE bool WriteData(const QByteArray& buffer, const QString& targetDevice, const qint64 targetFirstByte); + Q_SCRIPTABLE QVariantMap CopyBlocks(const QString& sourceDevice, const qint64 sourceOffset, const qint64 sourceLength, const QString& targetDevice, const qint64 targetOffset, const qint64 blockSize); + Q_SCRIPTABLE bool WriteData(const QByteArray& buffer, const QString& targetDevice, const qint64 targetOffset); Q_SCRIPTABLE bool CreateFile(const QString& filePath, const QByteArray& fileContents); private: