3 files changed, 6 insertions, 3 deletions
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index 760e481..e188e6a 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -17,18 +17,19 @@
 #include "QtTextEdit.h"
 #include "QtSettingsProvider.h"
 #include "QtScaledAvatarCache.h"
 
 #include "SwifTools/TabComplete.h"
 #include <Swift/Controllers/UIEvents/UIEventStream.h>
 #include <Swift/Controllers/UIEvents/SendFileUIEvent.h>
 #include "QtFileTransferJSBridge.h"
 
+#include <boost/cstdint.hpp>
 #include <boost/format.hpp>
 #include <boost/lexical_cast.hpp>
 
 #include <QLabel>
 #include <QInputDialog>
 #include <QApplication>
 #include <QBoxLayout>
 #include <QCloseEvent>
 #include <QComboBox>
@@ -465,19 +466,19 @@ void QtChatWindow::setAckState(std::string const& id, ChatWindow::AckState state
 
 int QtChatWindow::getCount() {
 	return unreadCount_;
 }
 
 std::string QtChatWindow::addAction(const std::string &message, const std::string &senderName, bool senderIsSelf, boost::shared_ptr<SecurityLabel> label, const std::string& avatarPath, const boost::posix_time::ptime& time) {
 	return addMessage(" *" + message + "*", senderName, senderIsSelf, label, avatarPath, "font-style:italic ", time);
 }
 
-std::string formatSize(const uintmax_t bytes) {
+std::string formatSize(const boost::uintmax_t bytes) {
 	static const char *siPrefix[] = {"k", "M", "G", "T", "P", "E", "Z", "Y", NULL};
 	int power = 0;
 	double engBytes = bytes;
 	while (engBytes >= 1000) {
 		++power;
 		engBytes = engBytes / 1000.0;
 	}
 	return str( boost::format("%.1lf %sB") % engBytes % (power > 0 ? siPrefix[power-1] : "") );
 }
diff --git a/Swift/QtUI/QtFileTransferListItemModel.cpp b/Swift/QtUI/QtFileTransferListItemModel.cpp
index 1b8ec51..63dd45a 100644
--- a/Swift/QtUI/QtFileTransferListItemModel.cpp
+++ b/Swift/QtUI/QtFileTransferListItemModel.cpp
@@ -1,26 +1,27 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 #include "QtFileTransferListItemModel.h"
 
 #include <boost/bind.hpp>
+#include <boost/cstdint.hpp>
 
 #include <Swiften/Base/boost_bsignals.h>
 #include <Swift/Controllers/FileTransfer/FileTransferController.h>
 #include <Swift/Controllers/FileTransfer/FileTransferOverview.h>
 
 namespace Swift {
 
-extern std::string formatSize(const uintmax_t bytes);
+extern std::string formatSize(const boost::uintmax_t bytes);
 
 QtFileTransferListItemModel::QtFileTransferListItemModel(QObject *parent) : QAbstractItemModel(parent), fileTransferOverview(0) {
 }
 
 void QtFileTransferListItemModel::setFileTransferOverview(FileTransferOverview *overview) {
 	fileTransferOverview = overview;
 	fileTransferOverview->onNewFileTransferController.connect(boost::bind(&QtFileTransferListItemModel::handleNewFileTransferController, this, _1));
 }
 
diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.h b/Swiften/FileTransfer/IncomingJingleFileTransfer.h
index 4ae0d1d..9e77de7 100644
--- a/Swiften/FileTransfer/IncomingJingleFileTransfer.h
+++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.h
@@ -1,18 +1,19 @@
 /*
  * Copyright (c) 2010 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma once
 
 #include <boost/shared_ptr.hpp>
+#include <boost/cstdint.hpp>
 
 #include <Swiften/Base/IDGenerator.h>
 #include <Swiften/Network/Timer.h>
 #include <Swiften/Jingle/JingleSession.h>
 #include <Swiften/Jingle/JingleContentID.h>
 #include <Swiften/FileTransfer/IncomingFileTransfer.h>
 #include <Swiften/FileTransfer/JingleTransport.h>
 #include <Swiften/FileTransfer/JingleIncomingIBBTransport.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamClientSession.h>
@@ -98,19 +99,19 @@ namespace Swift {
 		private:
 			JID ourJID;
 			JingleSession::ref session;
 			IQRouter* router;
 			TimerFactory* timerFactory;
 			JingleContentPayload::ref initialContent;
 			State state;
 			JingleFileTransferDescription::ref description;
 			WriteBytestream::ref stream;
-			uintmax_t receivedBytes;
+			boost::uintmax_t receivedBytes;
 			IncrementalBytestreamHashCalculator* hashCalculator;
 			Timer::ref waitOnHashTimer;
 			IDGenerator idGenerator;
 
 			RemoteJingleTransportCandidateSelector* candidateSelector;
 			LocalJingleTransportCandidateGenerator* candidateGenerator;
 			SOCKS5BytestreamRegistry* s5bRegistry;
 			SOCKS5BytestreamProxy* s5bProxy;
 			bool remoteTransportCandidateSelectFinished;