10 files changed, 47 insertions, 37 deletions
diff --git a/Swift/Controllers/AccountController.cpp b/Swift/Controllers/AccountController.cpp
index ec914a6..27655c0 100644
--- a/Swift/Controllers/AccountController.cpp
+++ b/Swift/Controllers/AccountController.cpp
@@ -401,11 +401,11 @@ void AccountController::handleConnected() {
     assert(chatsManager_);
     chatsManager_->setOnline(true);
     adHocManager_->setOnline(true);
 }
 
-void AccountController::handleEventQueueLengthChange(int count) {
+void AccountController::handleEventQueueLengthChange(size_t count) {
     dock_->setNumberOfPendingMessages(count);
 }
 
 void AccountController::reconnectAfterError() {
     if (reconnectTimer_) {
diff --git a/Swift/Controllers/AccountController.h b/Swift/Controllers/AccountController.h
index 774aa8b..4a31645 100644
--- a/Swift/Controllers/AccountController.h
+++ b/Swift/Controllers/AccountController.h
@@ -109,11 +109,11 @@ namespace Swift {
             void handleCancelLoginRequest();
             void handleQuitRequest();
             void handleChangeStatusRequest(StatusShow::Type show, const std::string &statusText);
             void handleDisconnected(const boost::optional<ClientError>& error);
             void handleServerDiscoInfoResponse(std::shared_ptr<DiscoInfo>, ErrorPayload::ref);
-            void handleEventQueueLengthChange(int count);
+            void handleEventQueueLengthChange(size_t count);
             void handleVCardReceived(const JID& j, VCard::ref vCard);
             void handleSettingChanged(const std::string& settingPath);
             void handlePurgeSavedLoginRequest(const std::string& username);
             void sendPresence(std::shared_ptr<Presence> presence);
             void handleInputIdleChanged(bool);
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
@@ -3,11 +3,11 @@
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2016 Isode Limited.
+ * Copyright (c) 2016-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/Controllers/FileTransfer/FileTransferProgressInfo.h>
@@ -16,17 +16,17 @@
 
 #include <Swiften/Base/Log.h>
 
 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);
     }
     percentage = 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
@@ -3,34 +3,35 @@
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * 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;
 };
 
 }
diff --git a/Swift/Controllers/Roster/LeastCommonSubsequence.h b/Swift/Controllers/Roster/LeastCommonSubsequence.h
index 8daa20c..7988ee7 100644
--- a/Swift/Controllers/Roster/LeastCommonSubsequence.h
+++ b/Swift/Controllers/Roster/LeastCommonSubsequence.h
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2011-2016 Isode Limited.
+ * Copyright (c) 2011-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
@@ -30,11 +30,11 @@ namespace Swift {
 
             // Compute the LCS lengths for subsets
             Predicate predicate;
             for (size_t i = 1; i < width; ++i) {
                 for (size_t j = 1; j < height; ++j) {
-                    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)]);
+                    result[i + j*width] = predicate(*(xBegin + static_cast<long long>(i)-1), *(yBegin + static_cast<long long>(j)-1)) ? result[(i-1) + (j-1)*width] + 1 : std::max(result[i + (j-1)*width], result[i-1 + (j*width)]);
                 }
             }
         }
     }
 
diff --git a/Swift/Controllers/Roster/TableRoster.cpp b/Swift/Controllers/Roster/TableRoster.cpp
index 713f390..01bf4a6 100644
--- a/Swift/Controllers/Roster/TableRoster.cpp
+++ b/Swift/Controllers/Roster/TableRoster.cpp
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2011-2016 Isode Limited.
+ * Copyright (c) 2011-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/Controllers/Roster/TableRoster.h>
@@ -130,19 +130,24 @@ void TableRoster::handleUpdateTimerTick() {
         std::vector<size_t> itemUpdates;
         std::vector<size_t> itemPostUpdates;
         std::vector<size_t> itemRemoves;
         std::vector<size_t> itemInserts;
         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() + 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() + 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() + boost::numeric_cast<long long>(end), CreateIndexForSection(sectionPostUpdates[i]));
+        try {
+            size_t end = update.insertedRows.size();
+            update.insertedRows.resize(update.insertedRows.size() + itemInserts.size());
+            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() + 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() + boost::numeric_cast<long long>(end), CreateIndexForSection(sectionPostUpdates[i]));
+        }
+        catch (const boost::numeric::bad_numeric_cast&) {
+            // If any container claims it has more than long long max items, we have bigger issues, so letting this pass
+        }
     }
 
     // Switch the old model with the new
     sections.swap(newSections);
 
diff --git a/Swift/Controllers/Storages/CertificateFileStorage.cpp b/Swift/Controllers/Storages/CertificateFileStorage.cpp
index 8ba7d12..2e1343f 100644
--- a/Swift/Controllers/Storages/CertificateFileStorage.cpp
+++ b/Swift/Controllers/Storages/CertificateFileStorage.cpp
@@ -48,14 +48,19 @@ void CertificateFileStorage::addCertificate(Certificate::ref certificate) {
         }
         catch (const boost::filesystem::filesystem_error& e) {
             std::cerr << "ERROR: " << e.what() << std::endl;
         }
     }
-    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)), boost::numeric_cast<std::streamsize>(data.size()));
-    file.close();
+    try {
+        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)), boost::numeric_cast<std::streamsize>(data.size()));
+        file.close();
+    }
+    catch (...) {
+        SWIFT_LOG(warning) << "Failed to store certificate to " << certificatePath << std::endl;
+    }
 }
 
 boost::filesystem::path CertificateFileStorage::getCertificatePath(Certificate::ref certificate) const {
     return path / Hexify::hexify(crypto->getSHA1Hash(certificate->toDER()));
 }
diff --git a/Swift/Controllers/XMPPEvents/EventController.cpp b/Swift/Controllers/XMPPEvents/EventController.cpp
index f8fb192..0e9429d 100644
--- a/Swift/Controllers/XMPPEvents/EventController.cpp
+++ b/Swift/Controllers/XMPPEvents/EventController.cpp
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/Controllers/XMPPEvents/EventController.h>
@@ -49,22 +49,22 @@ void EventController::handleIncomingEvent(std::shared_ptr<StanzaEvent> sourceEve
     }
 
     if ((messageEvent && messageEvent->isReadable()) || subscriptionEvent || errorEvent || mucInviteEvent || incomingFileTransferEvent) {
         events_.push_back(sourceEvent);
         sourceEvent->onConclusion.connect(boost::bind(&EventController::handleEventConcluded, this, sourceEvent));
-        onEventQueueLengthChange(boost::numeric_cast<int>(events_.size()));
+        onEventQueueLengthChange(events_.size());
         onEventQueueEventAdded(sourceEvent);
         if (sourceEvent->getConcluded()) {
             handleEventConcluded(sourceEvent);
         }
     }
 }
 
 void EventController::handleEventConcluded(std::shared_ptr<StanzaEvent> event) {
     event->onConclusion.disconnect(boost::bind(&EventController::handleEventConcluded, this, event));
     events_.erase(std::remove(events_.begin(), events_.end(), event), events_.end());
-    onEventQueueLengthChange(boost::numeric_cast<int>(events_.size()));
+    onEventQueueLengthChange(events_.size());
 }
 
 void EventController::disconnectAll() {
     onEventQueueLengthChange.disconnect_all_slots();
     onEventQueueEventAdded.disconnect_all_slots();
diff --git a/Swift/Controllers/XMPPEvents/EventController.h b/Swift/Controllers/XMPPEvents/EventController.h
index 8a095d9..5b746e4 100644
--- a/Swift/Controllers/XMPPEvents/EventController.h
+++ b/Swift/Controllers/XMPPEvents/EventController.h
@@ -1,13 +1,14 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <cstddef>
 #include <memory>
 #include <vector>
 
 #include <boost/signals2.hpp>
 
@@ -20,11 +21,11 @@ namespace Swift {
         public:
             EventController();
             ~EventController();
 
             void handleIncomingEvent(std::shared_ptr<StanzaEvent> sourceEvent);
-            boost::signals2::signal<void (int)> onEventQueueLengthChange;
+            boost::signals2::signal<void (size_t)> onEventQueueLengthChange;
             boost::signals2::signal<void (std::shared_ptr<StanzaEvent>)> onEventQueueEventAdded;
             const EventList& getEvents() const {return events_;}
             void disconnectAll();
             void clear();
 
diff --git a/Swift/QtUI/QtWebView.cpp b/Swift/QtUI/QtWebView.cpp
index 967be1a..24636ed 100644
--- a/Swift/QtUI/QtWebView.cpp
+++ b/Swift/QtUI/QtWebView.cpp
@@ -1,16 +1,14 @@
 /*
- * Copyright (c) 2010-2017 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 
 #include <Swift/QtUI/QtWebView.h>
 
-#include <boost/numeric/conversion/cast.hpp>
-
 #include <QFocusEvent>
 #include <QKeyEvent>
 #include <QKeySequence>
 #include <QMenu>
 
@@ -46,11 +44,11 @@ void QtWebView::keyPressEvent(QKeyEvent* event) {
     QKeyEvent* translatedEvent = new QKeyEvent(QEvent::KeyPress,
                                key,
                                modifiers,
                                event->text(),
                                event->isAutoRepeat(),
-                               boost::numeric_cast<unsigned short>(event->count()));
+                               event->count());
     QWebView::keyPressEvent(translatedEvent);
     delete translatedEvent;
 }
 
 void QtWebView::dragEnterEvent(QDragEnterEvent*) {