From 3903ae1b831d7ca9fa3e07d6358e1f2548a40136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 5 Feb 2022 14:05:50 +0000 Subject: [PATCH] Rename CopyBlocks to CopyFileData. --- src/util/externalcommand.cpp | 2 +- src/util/externalcommandhelper.cpp | 2 +- src/util/externalcommandhelper.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/externalcommand.cpp b/src/util/externalcommand.cpp index 809716a..0bcd7c3 100644 --- a/src/util/externalcommand.cpp +++ b/src/util/externalcommand.cpp @@ -160,7 +160,7 @@ bool ExternalCommand::copyBlocks(const CopySource& source, CopyTarget& target) connect(interface, &OrgKdeKpmcoreExternalcommandInterface::progress, this, &ExternalCommand::progress); connect(interface, &OrgKdeKpmcoreExternalcommandInterface::report, this, &ExternalCommand::reportSignal); - QDBusPendingCall pcall = interface->CopyBlocks(source.path(), source.firstByte(), source.length(), + QDBusPendingCall pcall = interface->CopyFileData(source.path(), source.firstByte(), source.length(), target.path(), target.firstByte(), blockSize); QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this); diff --git a/src/util/externalcommandhelper.cpp b/src/util/externalcommandhelper.cpp index 403d41a..9bdc527 100644 --- a/src/util/externalcommandhelper.cpp +++ b/src/util/externalcommandhelper.cpp @@ -156,7 +156,7 @@ bool ExternalCommandHelper::CreateFile(const QString &filePath, const QByteArray } // If targetDevice is empty then return QByteArray with data that was read from disk. -QVariantMap ExternalCommandHelper::CopyBlocks(const QString& sourceDevice, const qint64 sourceOffset, const qint64 sourceLength, const QString& targetDevice, const qint64 targetOffset, const qint64 blockSize) +QVariantMap ExternalCommandHelper::CopyFileData(const QString& sourceDevice, const qint64 sourceOffset, const qint64 sourceLength, const QString& targetDevice, const qint64 targetOffset, const qint64 blockSize) { if (!isCallerAuthorized()) { return {}; diff --git a/src/util/externalcommandhelper.h b/src/util/externalcommandhelper.h index 944f012..a98ac97 100644 --- a/src/util/externalcommandhelper.h +++ b/src/util/externalcommandhelper.h @@ -38,7 +38,7 @@ 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 sourceOffset, const qint64 sourceLength, + Q_SCRIPTABLE QVariantMap CopyFileData(const QString& sourceDevice, const qint64 sourceOffset, const qint64 sourceLength, const QString& targetDevice, const qint64 targetOffset, const qint64 blockSize); Q_SCRIPTABLE QByteArray ReadData(const QString& device, const qint64 offset, const qint64 length); Q_SCRIPTABLE bool WriteData(const QByteArray& buffer, const QString& targetDevice, const qint64 targetOffset);