7 files changed, 29 insertions, 23 deletions
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.cpp b/Swift/Controllers/FileTransfer/FileTransferController.cpp
index d4a082a..69b5c89 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>
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);
diff --git a/Swift/Controllers/HighlightManager.cpp b/Swift/Controllers/HighlightManager.cpp
index 74a07c0..7ab578e 100644
--- a/Swift/Controllers/HighlightManager.cpp
+++ b/Swift/Controllers/HighlightManager.cpp
@@ -106,14 +106,14 @@ void HighlightManager::storeSettings()
 
 HighlightRule HighlightManager::getRule(int index) const
 {
-	assert(index >= 0 && boost::numeric_cast<std::vector<std::string>::size_type>(index) < rules_.size());
-	return rules_[index];
+	assert(index >= 0 && static_cast<size_t>(index) < rules_.size());
+	return rules_[static_cast<size_t>(index)];
 }
 
 void HighlightManager::setRule(int index, const HighlightRule& rule)
 {
-	assert(index >= 0 && boost::numeric_cast<std::vector<std::string>::size_type>(index) < rules_.size());
-	rules_[index] = rule;
+	assert(index >= 0 && static_cast<size_t>(index) < rules_.size());
+	rules_[static_cast<size_t>(index)] = rule;
 	storeSettings();
 }
 
diff --git a/Swift/Controllers/HighlightRule.cpp b/Swift/Controllers/HighlightRule.cpp
index 01d1228..28f26cf 100644
--- a/Swift/Controllers/HighlightRule.cpp
+++ b/Swift/Controllers/HighlightRule.cpp
@@ -88,7 +88,7 @@ HighlightRule HighlightRule::fromString(const std::string& s)
 	boost::split(v, s, boost::is_any_of("\n"));
 
 	HighlightRule r;
-	int i = 0;
+	size_t i = 0;
 	try {
 		boost::split(r.senders_, v.at(i++), boost::is_any_of("\t"));
 		r.senders_.erase(std::remove_if(r.senders_.begin(), r.senders_.end(), boost::lambda::_1 == ""), r.senders_.end());
diff --git a/Swift/Controllers/Roster/LeastCommonSubsequence.h b/Swift/Controllers/Roster/LeastCommonSubsequence.h
index dd3c95a..9d45679 100644
--- a/Swift/Controllers/Roster/LeastCommonSubsequence.h
+++ b/Swift/Controllers/Roster/LeastCommonSubsequence.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Remko Tronçon
+ * Copyright (c) 2011-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <vector>
+#include <boost/numeric/conversion/cast.hpp>
 
 namespace Swift {
 	using std::equal_to;
@@ -14,8 +15,8 @@ namespace Swift {
 	namespace Detail {
 		template<typename XIt, typename YIt, typename Length, typename Predicate>
 		void computeLeastCommonSubsequenceMatrix(XIt xBegin, XIt xEnd, YIt yBegin, YIt yEnd, std::vector<Length>& result) {
-			size_t width = std::distance(xBegin, xEnd) + 1;
-			size_t height = std::distance(yBegin, yEnd)  + 1;
+			size_t width = static_cast<size_t>(std::distance(xBegin, xEnd) + 1);
+			size_t height = static_cast<size_t>(std::distance(yBegin, yEnd)  + 1);
 			result.resize(width * height);
 
 			// Initialize first row & column
@@ -30,7 +31,7 @@ namespace Swift {
 			Predicate predicate;
 			for (size_t i = 1; i < width; ++i) {
 				for (size_t j = 1; j < height; ++j) {
-					result[i + j*width] = (predicate(*(xBegin + i-1), *(yBegin + j-1)) ? result[(i-1) + (j-1)*width] + 1 : std::max(result[i + (j-1)*width], result[i-1 + (j*width)]));
+					result[i + j*width] = predicate(*(xBegin + boost::numeric_cast<long long>(i)-1), *(yBegin + boost::numeric_cast<long long >(j)-1)) ? result[(i-1) + (j-1)*width] + 1 : std::max(result[i + (j-1)*width], result[i-1 + (j*width)]);
 				}
 			}
 		}
@@ -46,29 +47,29 @@ namespace Swift {
 		typename std::vector<X>::const_iterator yBegin = y.begin();
 		while (xBegin < x.end() && yBegin < y.end() && insertRemovePredicate(*xBegin, *yBegin)) {
 			if (updatePredicate(*xBegin, *yBegin)) {
-				updates.push_back(std::distance(x.begin(), xBegin));
-				postUpdates.push_back(std::distance(y.begin(), yBegin));
+				updates.push_back(static_cast<size_t>(std::distance(x.begin(), xBegin)));
+				postUpdates.push_back(static_cast<size_t>(std::distance(y.begin(), yBegin)));
 			}
 			++xBegin;
 			++yBegin;
 		}
-		size_t prefixLength = std::distance(x.begin(), xBegin);
+		size_t prefixLength = static_cast<size_t>(std::distance(x.begin(), xBegin));
 
 		// Find & handle common suffix (Optimization to reduce LCS matrix size)
 		typename std::vector<X>::const_reverse_iterator xEnd = x.rbegin();
 		typename std::vector<X>::const_reverse_iterator yEnd = y.rbegin();
 		while (xEnd.base() > xBegin && yEnd.base() > yBegin && insertRemovePredicate(*xEnd, *yEnd)) {
 			if (updatePredicate(*xEnd, *yEnd)) {
-				updates.push_back(std::distance(x.begin(), xEnd.base()) - 1);
-				postUpdates.push_back(std::distance(y.begin(), yEnd.base()) - 1);
+				updates.push_back(static_cast<size_t>(std::distance(x.begin(), xEnd.base()) - 1));
+				postUpdates.push_back(static_cast<size_t>(std::distance(y.begin(), yEnd.base()) - 1));
 			}
 			++xEnd;
 			++yEnd;
 		}
 
 		// Compute lengths
-		size_t xLength = std::distance(xBegin, xEnd.base());
-		size_t yLength = std::distance(yBegin, yEnd.base());
+		size_t xLength = static_cast<size_t>(std::distance(xBegin, xEnd.base()));
+		size_t yLength = static_cast<size_t>(std::distance(yBegin, yEnd.base()));
 
 		// Compute LCS matrix
 		std::vector<unsigned int> lcs;
@@ -77,7 +78,7 @@ namespace Swift {
 		// Process LCS matrix
 		size_t i = xLength;
 		size_t j = yLength;
-		const size_t width = xLength + 1;
+		size_t width = xLength + 1;
 		while (true) {
 			if (i > 0 && j > 0 && insertRemovePredicate(x[prefixLength + i-1], y[prefixLength + j-1])) {
 				// x[i-1] same
diff --git a/Swift/Controllers/Roster/TableRoster.cpp b/Swift/Controllers/Roster/TableRoster.cpp
index c00bf4f..eb036db 100644
--- a/Swift/Controllers/Roster/TableRoster.cpp
+++ b/Swift/Controllers/Roster/TableRoster.cpp
@@ -9,6 +9,7 @@
 #include <boost/cast.hpp>
 #include <cassert>
 #include <algorithm>
+#include <boost/numeric/conversion/cast.hpp>
 #include <Swiften/Base/foreach.h>
 
 #include <Swiften/Network/TimerFactory.h>
@@ -132,13 +133,13 @@ void TableRoster::handleUpdateTimerTick() {
 		computeIndexDiff<Item, ItemEquals, ItemNeedsUpdate >(sections[sectionUpdates[i]].items, newSections[sectionPostUpdates[i]].items, itemUpdates, itemPostUpdates, itemRemoves, itemInserts);
 		size_t end = update.insertedRows.size();
 		update.insertedRows.resize(update.insertedRows.size() + itemInserts.size());
-		std::transform(itemInserts.begin(), itemInserts.end(), update.insertedRows.begin() + end, CreateIndexForSection(sectionPostUpdates[i]));
+		std::transform(itemInserts.begin(), itemInserts.end(), update.insertedRows.begin() + boost::numeric_cast<long long>(end), CreateIndexForSection(sectionPostUpdates[i]));
 		end = update.deletedRows.size();
 		update.deletedRows.resize(update.deletedRows.size() + itemRemoves.size());
-		std::transform(itemRemoves.begin(), itemRemoves.end(), update.deletedRows.begin() + end, CreateIndexForSection(sectionUpdates[i]));
+		std::transform(itemRemoves.begin(), itemRemoves.end(), update.deletedRows.begin() + boost::numeric_cast<long long>(end), CreateIndexForSection(sectionUpdates[i]));
 		end = update.updatedRows.size();
 		update.updatedRows.resize(update.updatedRows.size() + itemUpdates.size());
-		std::transform(itemUpdates.begin(), itemUpdates.end(), update.updatedRows.begin() + end, CreateIndexForSection(sectionPostUpdates[i]));
+		std::transform(itemUpdates.begin(), itemUpdates.end(), update.updatedRows.begin() + boost::numeric_cast<long long>(end), CreateIndexForSection(sectionPostUpdates[i]));
 	}
 	
 	// Switch the old model with the new
diff --git a/Swift/Controllers/Storages/CertificateFileStorage.cpp b/Swift/Controllers/Storages/CertificateFileStorage.cpp
index a4a95c7..55016d5 100644
--- a/Swift/Controllers/Storages/CertificateFileStorage.cpp
+++ b/Swift/Controllers/Storages/CertificateFileStorage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -8,6 +8,7 @@
 
 #include <iostream>
 #include <boost/filesystem/fstream.hpp>
+#include <boost/numeric/conversion/cast.hpp>
 
 #include <Swiften/StringCodecs/SHA1.h>
 #include <Swiften/StringCodecs/Hexify.h>
@@ -50,7 +51,7 @@ void CertificateFileStorage::addCertificate(Certificate::ref certificate) {
 	}
 	boost::filesystem::ofstream file(certificatePath, boost::filesystem::ofstream::binary|boost::filesystem::ofstream::out);
 	ByteArray data = certificate->toDER();
-	file.write(reinterpret_cast<const char*>(vecptr(data)), data.size());
+	file.write(reinterpret_cast<const char*>(vecptr(data)), boost::numeric_cast<std::streamsize>(data.size()));
 	file.close();
 }