2 files changed, 16 insertions, 10 deletions
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.cpp b/Swift/Controllers/FileTransfer/FileTransferController.cpp
index 3feaf49..0160a7a 100644
--- a/Swift/Controllers/FileTransfer/FileTransferController.cpp
+++ b/Swift/Controllers/FileTransfer/FileTransferController.cpp
@@ -10,6 +10,7 @@
 #include <Swiften/FileTransfer/FileReadBytestream.h>
 #include <Swiften/Base/boost_bsignals.h>
 #include <boost/bind.hpp>
+#include <boost/filesystem.hpp>
 #include "Swift/Controllers/UIInterfaces/ChatWindow.h"
 #include <Swiften/Base/Log.h>
 #include <Swift/Controllers/Intl.h>
@@ -24,7 +25,7 @@ FileTransferController::FileTransferController(const JID& receipient, const std:
 }
 
 FileTransferController::FileTransferController(IncomingFileTransfer::ref transfer) :
-	sending(false), otherParty(transfer->getSender()), filename(transfer->filename), transfer(transfer), ftManager(0), ftProgressInfo(0), chatWindow(0), currentState(FileTransfer::State::WaitingForStart) {
+	sending(false), otherParty(transfer->getSender()), filename(transfer->getFileName()), transfer(transfer), ftManager(0), ftProgressInfo(0), chatWindow(0), currentState(FileTransfer::State::WaitingForStart) {
 
 }
 
@@ -41,7 +42,7 @@ std::string FileTransferController::setChatWindow(ChatWindow* wnd, std::string n
 	if (sending) {
 		uiID = wnd->addFileTransfer(QT_TRANSLATE_NOOP("", "me"), true, filename, boost::filesystem::file_size(boost::filesystem::path(filename)));
 	} else {
-		uiID = wnd->addFileTransfer(nickname, false, filename, transfer->fileSizeInBytes);
+		uiID = wnd->addFileTransfer(nickname, false, filename, transfer->getFileSizeInBytes());
 	}
 	return uiID;
 }
@@ -64,7 +65,7 @@ int FileTransferController::getProgress() const {
 
 boost::uintmax_t FileTransferController::getSize() const {
 	if (transfer) {
-		return transfer->fileSizeInBytes;
+		return transfer->getFileSizeInBytes();
 	} else {
 		return 0;
 	}
@@ -75,9 +76,9 @@ void FileTransferController::start(std::string& description) {
 	fileReadStream = boost::make_shared<FileReadBytestream>(boost::filesystem::path(filename));
 	OutgoingFileTransfer::ref outgoingTransfer = ftManager->createOutgoingFileTransfer(otherParty, boost::filesystem::path(filename), description, fileReadStream);
 	if (outgoingTransfer) {
-		ftProgressInfo = new FileTransferProgressInfo(outgoingTransfer->fileSizeInBytes);
+		ftProgressInfo = new FileTransferProgressInfo(outgoingTransfer->getFileSizeInBytes());
 		ftProgressInfo->onProgressPercentage.connect(boost::bind(&FileTransferController::handleProgressPercentageChange, this, _1));
-		outgoingTransfer->onStateChange.connect(boost::bind(&FileTransferController::handleFileTransferStateChange, this, _1));
+		outgoingTransfer->onStateChanged.connect(boost::bind(&FileTransferController::handleFileTransferStateChange, this, _1));
 		outgoingTransfer->onProcessedBytes.connect(boost::bind(&FileTransferProgressInfo::setBytesProcessed, ftProgressInfo, _1));
 		outgoingTransfer->start();
 		transfer = outgoingTransfer;
@@ -92,9 +93,9 @@ void FileTransferController::accept(std::string& file) {
 	if (incomingTransfer) {
 		fileWriteStream = boost::make_shared<FileWriteBytestream>(boost::filesystem::path(file));
 
-		ftProgressInfo = new FileTransferProgressInfo(transfer->fileSizeInBytes);
+		ftProgressInfo = new FileTransferProgressInfo(transfer->getFileSizeInBytes());
 		ftProgressInfo->onProgressPercentage.connect(boost::bind(&FileTransferController::handleProgressPercentageChange, this, _1));
-		transfer->onStateChange.connect(boost::bind(&FileTransferController::handleFileTransferStateChange, this, _1));
+		transfer->onStateChanged.connect(boost::bind(&FileTransferController::handleFileTransferStateChange, this, _1));
 		transfer->onProcessedBytes.connect(boost::bind(&FileTransferProgressInfo::setBytesProcessed, ftProgressInfo, _1));
 		incomingTransfer->accept(fileWriteStream);
 	} else {
@@ -113,7 +114,10 @@ void FileTransferController::cancel() {
 void FileTransferController::handleFileTransferStateChange(FileTransfer::State state) {
 	currentState = state;
 	onStateChage();
-	switch(state.state) {
+	switch(state.type) {
+		case FileTransfer::State::Initial:
+			assert(false);
+			return;
 		case FileTransfer::State::Negotiating:
 			chatWindow->setFileTransferStatus(uiID, ChatWindow::Negotiating);
 			return;
@@ -138,7 +142,7 @@ void FileTransferController::handleFileTransferStateChange(FileTransfer::State s
 		case FileTransfer::State::WaitingForStart:
 			return;
 	}
-	std::cerr << "Unhandled FileTransfer::State!" << std::endl;
+	assert(false);
 }
 
 void FileTransferController::handleProgressPercentageChange(int percentage) {
diff --git a/Swift/Controllers/FileTransfer/FileTransferProgressInfo.cpp b/Swift/Controllers/FileTransfer/FileTransferProgressInfo.cpp
index 6d19fa1..3081f71 100644
--- a/Swift/Controllers/FileTransfer/FileTransferProgressInfo.cpp
+++ b/Swift/Controllers/FileTransfer/FileTransferProgressInfo.cpp
@@ -6,6 +6,8 @@
 
 #include "FileTransferProgressInfo.h"
 
+#include <boost/numeric/conversion/cast.hpp>
+
 #include <Swiften/Base/Log.h>
 
 namespace Swift {
@@ -16,7 +18,7 @@ FileTransferProgressInfo::FileTransferProgressInfo(boost::uintmax_t completeByte
 
 void FileTransferProgressInfo::setBytesProcessed(int processedBytes) {
 	int oldPercentage = int(double(completedBytes) / double(completeBytes) * 100.0);
-	completedBytes += processedBytes;
+	completedBytes += boost::numeric_cast<boost::uintmax_t>(processedBytes);
 	int newPercentage = int(double(completedBytes) / double(completeBytes) * 100.0);
 	if (oldPercentage != newPercentage) {
 		onProgressPercentage(newPercentage);