3 files changed, 14 insertions, 13 deletions
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.cpp b/Swift/Controllers/FileTransfer/FileTransferController.cpp
index 27e9dbf..5b86a7b 100644
--- a/Swift/Controllers/FileTransfer/FileTransferController.cpp
+++ b/Swift/Controllers/FileTransfer/FileTransferController.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2015-2017 Isode Limited.
+ * Copyright (c) 2015-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -82,7 +82,7 @@ boost::uintmax_t FileTransferController::getSize() const {
 }
 
 void FileTransferController::start(std::string& description) {
-    SWIFT_LOG(debug) << "FileTransferController::start" << std::endl;
+    SWIFT_LOG(debug) << "FileTransferController::start";
     fileReadStream = std::make_shared<FileReadBytestream>(boost::filesystem::path(filename));
     OutgoingFileTransfer::ref outgoingTransfer = ftManager->createOutgoingFileTransfer(otherParty, boost::filesystem::path(filename), description, fileReadStream);
     if (outgoingTransfer) {
@@ -98,7 +98,7 @@ void FileTransferController::start(std::string& description) {
 }
 
 void FileTransferController::accept(std::string& file) {
-    SWIFT_LOG(debug) << "FileTransferController::accept" << std::endl;
+    SWIFT_LOG(debug) << "FileTransferController::accept";
     IncomingFileTransfer::ref incomingTransfer = std::dynamic_pointer_cast<IncomingFileTransfer>(transfer);
     if (incomingTransfer) {
         fileWriteStream = std::make_shared<FileWriteBytestream>(boost::filesystem::path(file));
diff --git a/Swift/Controllers/FileTransfer/FileTransferProgressInfo.cpp b/Swift/Controllers/FileTransfer/FileTransferProgressInfo.cpp
index b073017..eddace9 100644
--- a/Swift/Controllers/FileTransfer/FileTransferProgressInfo.cpp
+++ b/Swift/Controllers/FileTransfer/FileTransferProgressInfo.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2016 Isode Limited.
+ * Copyright (c) 2016-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -18,13 +18,13 @@
 
 namespace Swift {
 
-FileTransferProgressInfo::FileTransferProgressInfo(boost::uintmax_t completeBytes) : completeBytes(completeBytes), completedBytes(0), percentage(0) {
+FileTransferProgressInfo::FileTransferProgressInfo(size_t completeBytes) : completeBytes(completeBytes), completedBytes(0), percentage(0) {
     onProgressPercentage(0);
 }
 
-void FileTransferProgressInfo::setBytesProcessed(int processedBytes) {
+void FileTransferProgressInfo::setBytesProcessed(size_t processedBytes) {
     int oldPercentage = int(double(completedBytes) / double(completeBytes) * 100.0);
-    completedBytes += boost::numeric_cast<boost::uintmax_t>(processedBytes);
+    completedBytes += processedBytes;
     int newPercentage = int(double(completedBytes) / double(completeBytes) * 100.0);
     if (oldPercentage != newPercentage) {
         onProgressPercentage(newPercentage);
diff --git a/Swift/Controllers/FileTransfer/FileTransferProgressInfo.h b/Swift/Controllers/FileTransfer/FileTransferProgressInfo.h
index 5fb955c..869ceba 100644
--- a/Swift/Controllers/FileTransfer/FileTransferProgressInfo.h
+++ b/Swift/Controllers/FileTransfer/FileTransferProgressInfo.h
@@ -5,31 +5,32 @@
  */
 
 /*
- * Copyright (c) 2016 Isode Limited.
+ * Copyright (c) 2016-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <boost/cstdint.hpp>
+#include <cstddef>
+
 #include <boost/signals2.hpp>
 
 namespace Swift {
 
 class FileTransferProgressInfo {
 public:
-    FileTransferProgressInfo(boost::uintmax_t completeBytes);
+    FileTransferProgressInfo(size_t completeBytes);
 
 public:
-    void setBytesProcessed(int processedBytes);
+    void setBytesProcessed(size_t processedBytes);
 
     int getPercentage() const;
     boost::signals2::signal<void (int)> onProgressPercentage;
 
 private:
-    boost::uintmax_t completeBytes;
-    boost::uintmax_t completedBytes;
+    size_t completeBytes;
+    size_t completedBytes;
     int percentage;
 };