From 86c5c9eb3f44fd56ea3d07c8de12a6f010b16f11 Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Wed, 10 Jan 2018 15:38:42 -0500
Subject: [PATCH] datatransfer: modify bytes progression API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
libring has changed the API name for bytes progression.
Change-Id: I7167cf8b85b45077e9fe178dd66e4a540ea30a2a
Reviewed-by: Anthony Léonard <anthony.leonard@savoirfairelinux.com>
---
src/datatransfermodel.cpp | 2 +-
src/qtwrapper/configurationmanager_wrap.h | 4 ++--
test/mocks/configurationmanager_mock.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/datatransfermodel.cpp b/src/datatransfermodel.cpp
index bf202819..a322a456 100644
--- a/src/datatransfermodel.cpp
+++ b/src/datatransfermodel.cpp
@@ -180,7 +180,7 @@ DataTransferModel::transferInfo(const std::string& lrc_id)
std::streamsize
DataTransferModel::bytesProgress(const std::string& lrc_id)
{
- return ConfigurationManager::instance().dataTransferBytesSent(pimpl_->lrc2dringIdMap.at(lrc_id));
+ return ConfigurationManager::instance().dataTransferBytesProgress(pimpl_->lrc2dringIdMap.at(lrc_id));
}
void
diff --git a/src/qtwrapper/configurationmanager_wrap.h b/src/qtwrapper/configurationmanager_wrap.h
index c3c5eb4b..02f7fe6a 100644
--- a/src/qtwrapper/configurationmanager_wrap.h
+++ b/src/qtwrapper/configurationmanager_wrap.h
@@ -606,8 +606,8 @@ public Q_SLOTS: // METHODS
return lrc_info;
}
- uint64_t dataTransferBytesSent(uint64_t transfer_id) {
- return DRing::dataTransferBytesSent(transfer_id);
+ uint64_t dataTransferBytesProgress(uint64_t transfer_id) {
+ return DRing::dataTransferBytesProgress(transfer_id);
}
void acceptFileTransfer(uint64_t transfer_id, const QString& file_path, uint64_t offset) {
diff --git a/test/mocks/configurationmanager_mock.h b/test/mocks/configurationmanager_mock.h
index e2c403cd..ef68dcfd 100644
--- a/test/mocks/configurationmanager_mock.h
+++ b/test/mocks/configurationmanager_mock.h
@@ -665,7 +665,7 @@ public Q_SLOTS: // METHODS
return {};
}
- uint64_t dataTransferBytesSent(uint64_t transfer_id) {
+ uint64_t dataTransferBytesProgress(uint64_t transfer_id) {
(void)transfer_id;
return 0;
}
--
GitLab