18 files changed, 63 insertions, 51 deletions
diff --git a/SwifTools/Application/ApplicationPathProvider.cpp b/SwifTools/Application/ApplicationPathProvider.cpp
index 8b952bb..77457ef 100644
--- a/SwifTools/Application/ApplicationPathProvider.cpp
+++ b/SwifTools/Application/ApplicationPathProvider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -25,7 +25,7 @@ boost::filesystem::path ApplicationPathProvider::getProfileDir(const std::string
         boost::filesystem::create_directory(result);
     }
     catch (const boost::filesystem::filesystem_error& e) {
-        SWIFT_LOG(error) << e.what() << std::endl;
+        SWIFT_LOG(error) << e.what();
     }
     return result;
 }
diff --git a/SwifTools/Application/MacOSXApplicationPathProvider.cpp b/SwifTools/Application/MacOSXApplicationPathProvider.cpp
index 684d8b2..d7b99b9 100644
--- a/SwifTools/Application/MacOSXApplicationPathProvider.cpp
+++ b/SwifTools/Application/MacOSXApplicationPathProvider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -23,7 +23,7 @@ boost::filesystem::path MacOSXApplicationPathProvider::getDataDir() const {
         boost::filesystem::create_directory(result);
     }
     catch (const boost::filesystem::filesystem_error& e) {
-        SWIFT_LOG(error) << e.what() << std::endl;
+        SWIFT_LOG(error) << e.what();
     }
     return result;
 }
diff --git a/SwifTools/Application/UnixApplicationPathProvider.cpp b/SwifTools/Application/UnixApplicationPathProvider.cpp
index e455d23..a345766 100644
--- a/SwifTools/Application/UnixApplicationPathProvider.cpp
+++ b/SwifTools/Application/UnixApplicationPathProvider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -54,7 +54,7 @@ boost::filesystem::path UnixApplicationPathProvider::getDataDir() const {
         boost::filesystem::create_directories(dataPath);
     }
     catch (const boost::filesystem::filesystem_error& e) {
-        SWIFT_LOG(error) << "file system error: " << e.what() << std::endl;
+        SWIFT_LOG(error) << "file system error: " << e.what();
     }
     return dataPath;
 }
diff --git a/SwifTools/AutoUpdater/SparkleAutoUpdater.mm b/SwifTools/AutoUpdater/SparkleAutoUpdater.mm
index b4a4c05..274ab3c 100644
--- a/SwifTools/AutoUpdater/SparkleAutoUpdater.mm
+++ b/SwifTools/AutoUpdater/SparkleAutoUpdater.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Isode Limited.
+ * Copyright (c) 2016-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -46,7 +46,7 @@ SparkleAutoUpdater::SparkleAutoUpdater(const std::string& appcastFeed) : d(new P
 
     SWIFT_LOG(debug) << (canDoSilentUpdates ?
         "The current running user has enough permissions to do a silent update." :
-        "The current running user has insufficient permissions to do a silent update.") << std::endl;
+        "The current running user has insufficient permissions to do a silent update.");
 
     setAppcastFeed(appcastFeed);
 }
diff --git a/SwifTools/AutoUpdater/SparkleAutoUpdaterDelegate.mm b/SwifTools/AutoUpdater/SparkleAutoUpdaterDelegate.mm
index be58355..b9294d9 100644
--- a/SwifTools/AutoUpdater/SparkleAutoUpdaterDelegate.mm
+++ b/SwifTools/AutoUpdater/SparkleAutoUpdaterDelegate.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2017 Isode Limited.
+ * Copyright (c) 2016-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -49,7 +49,7 @@ using namespace Swift;
 - (void)updater:(SUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error {
     (void)updater;
     (void)item;
-    SWIFT_LOG(error) << ns2StdString([error localizedDescription]) << std::endl;
+    SWIFT_LOG(error) << ns2StdString([error localizedDescription]);
     onNewUpdateState(AutoUpdater::State::ErrorCheckingForUpdate);
 }
 
@@ -71,7 +71,7 @@ using namespace Swift;
         onNewUpdateState(AutoUpdater::State::NoUpdateAvailable);
     }
     else {
-        SWIFT_LOG(error) << ns2StdString([error localizedDescription]) << std::endl;
+        SWIFT_LOG(error) << ns2StdString([error localizedDescription]);
         onNewUpdateState(AutoUpdater::State::ErrorCheckingForUpdate);
     }
 }
diff --git a/SwifTools/CrashReporter.cpp b/SwifTools/CrashReporter.cpp
index bf637c8..b02e73b 100644
--- a/SwifTools/CrashReporter.cpp
+++ b/SwifTools/CrashReporter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016 Isode Limited.
+ * Copyright (c) 2012-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -46,7 +46,7 @@ CrashReporter::CrashReporter(const boost::filesystem::path& path, const std::str
             boost::filesystem::create_directories(path);
         }
         catch (const boost::filesystem::filesystem_error& e) {
-            SWIFT_LOG(error) << "ERROR: " << e.what() << std::endl;
+            SWIFT_LOG(error) << "ERROR: " << e.what();
         }
     }
 
diff --git a/SwifTools/Dock/Dock.h b/SwifTools/Dock/Dock.h
index 6120445..362aabc 100644
--- a/SwifTools/Dock/Dock.h
+++ b/SwifTools/Dock/Dock.h
@@ -1,11 +1,13 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <cstddef>
+
 namespace Swift {
 
 
@@ -13,6 +15,6 @@ namespace Swift {
         public:
             virtual ~Dock();
 
-            virtual void setNumberOfPendingMessages(int i) = 0;
+            virtual void setNumberOfPendingMessages(size_t i) = 0;
     };
 }
diff --git a/SwifTools/Dock/MacOSXDock.h b/SwifTools/Dock/MacOSXDock.h
index 6b33506..ef85a88 100644
--- a/SwifTools/Dock/MacOSXDock.h
+++ b/SwifTools/Dock/MacOSXDock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -16,6 +16,6 @@ namespace Swift {
         public:
             MacOSXDock(CocoaApplication* application);
 
-            virtual void setNumberOfPendingMessages(int i);
+            virtual void setNumberOfPendingMessages(size_t i);
     };
 }
diff --git a/SwifTools/Dock/MacOSXDock.mm b/SwifTools/Dock/MacOSXDock.mm
index 5c7207c..3935ac0 100644
--- a/SwifTools/Dock/MacOSXDock.mm
+++ b/SwifTools/Dock/MacOSXDock.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -18,7 +18,7 @@ namespace Swift {
 MacOSXDock::MacOSXDock(CocoaApplication*) {
 }
 
-void MacOSXDock::setNumberOfPendingMessages(int i) {
+void MacOSXDock::setNumberOfPendingMessages(size_t i) {
     std::string label(i > 0 ? boost::lexical_cast<std::string>(i) : "");
     NSString *labelString = [[NSString alloc] initWithUTF8String: label.c_str()];
     [[NSApp dockTile] setBadgeLabel: labelString];
diff --git a/SwifTools/Dock/NullDock.h b/SwifTools/Dock/NullDock.h
index 9f3c554..137ba03 100644
--- a/SwifTools/Dock/NullDock.h
+++ b/SwifTools/Dock/NullDock.h
@@ -1,11 +1,13 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <cstddef>
+
 #include <SwifTools/Dock/Dock.h>
 
 namespace Swift {
@@ -13,7 +15,7 @@ namespace Swift {
         public:
             NullDock() {}
 
-            virtual void setNumberOfPendingMessages(int) {
+            virtual void setNumberOfPendingMessages(size_t) {
             }
     };
 }
diff --git a/SwifTools/Dock/WindowsDock.h b/SwifTools/Dock/WindowsDock.h
index fc10a48..f9a9dae 100644
--- a/SwifTools/Dock/WindowsDock.h
+++ b/SwifTools/Dock/WindowsDock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -18,7 +18,7 @@ namespace Swift {
         public:
             WindowsDock(QSystemTrayIcon* tray, Notifier* notifier) : tray(tray), notifier(notifier) {}
 
-            virtual void setNumberOfPendingMessages(int i) {
+            virtual void setNumberOfPendingMessages(size_t i) {
                 if (notifier->isAvailable()) {
                     return;
                 }
diff --git a/SwifTools/HunspellChecker.cpp b/SwifTools/HunspellChecker.cpp
index 1de369b..019a4dc 100644
--- a/SwifTools/HunspellChecker.cpp
+++ b/SwifTools/HunspellChecker.cpp
@@ -84,12 +84,12 @@ bool HunspellChecker::isAutomaticallyDetectingLanguage() {
 void HunspellChecker::setActiveLanguage(const std::string& language) {
     auto dictionaries = detectedDictionaries();
     if (dictionaries.find(language) != dictionaries.end()) {
-        SWIFT_LOG(debug) << "Initialized Hunspell with dic,aff files " << dictionaries[language].dicPath << " , " << dictionaries[language].affPath << std::endl;
+        SWIFT_LOG(debug) << "Initialized Hunspell with dic,aff files " << dictionaries[language].dicPath << " , " << dictionaries[language].affPath;
         speller_ = std::unique_ptr<Hunspell>(new Hunspell(dictionaries[language].affPath.c_str(), dictionaries[language].dicPath.c_str()));
         activeLangauge_ = language;
     }
     else {
-        SWIFT_LOG(warning) << "Unsupported language '" << language << "'" << std::endl;
+        SWIFT_LOG(warning) << "Unsupported language '" << language << "'";
     }
 }
 
diff --git a/SwifTools/Idle/MacOSXIdleQuerier.cpp b/SwifTools/Idle/MacOSXIdleQuerier.cpp
index 6d6780b..89fa050 100644
--- a/SwifTools/Idle/MacOSXIdleQuerier.cpp
+++ b/SwifTools/Idle/MacOSXIdleQuerier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -10,6 +10,8 @@
 
 #include <cassert>
 #include <iostream>
+#include <limits>
+
 #include <boost/numeric/conversion/cast.hpp>
 #include <CoreFoundation/CoreFoundation.h>
 
@@ -29,7 +31,12 @@ int MacOSXIdleQuerier::getIdleTimeSeconds() {
     assert(result);
     (void) result;
     CFRelease(property);
-    return boost::numeric_cast<int>(idle / 1000000000);
+    try {
+        return boost::numeric_cast<int>(idle / 1000000000);
+    }
+    catch (const boost::numeric::bad_numeric_cast&) {
+        return std::numeric_limits<int>::max();
+    }
 }
 
 }
diff --git a/SwifTools/MacOSXChecker.mm b/SwifTools/MacOSXChecker.mm
index 519f06c..afaa87c 100644
--- a/SwifTools/MacOSXChecker.mm
+++ b/SwifTools/MacOSXChecker.mm
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2017 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -19,6 +19,8 @@
 
 #include <AppKit/AppKit.h>
 
+#include <SwifTools/Cocoa/CocoaUtil.h>
+
 namespace Swift {
 
 MacOSXChecker::MacOSXChecker() {
@@ -54,7 +56,7 @@ void MacOSXChecker::getSuggestions(const std::string& word, std::vector<std::str
     NSString* wordString = [[NSString alloc] initWithUTF8String: word.c_str()];
     NSArray* suggestions = [spellChecker guessesForWordRange:NSMakeRange(0, [wordString length]) inString:wordString language:nil inSpellDocumentWithTag:0];
     for(unsigned int i = 0; i < [suggestions count]; ++i) {
-        list.push_back(std::string([[suggestions objectAtIndex:i] UTF8String]));
+        list.push_back(ns2StdString([suggestions objectAtIndex:i]));
     }
     [wordString release];
 }
@@ -69,7 +71,7 @@ void MacOSXChecker::checkFragment(const std::string& fragment, PositionPairList&
         if (range.location != NSNotFound) {
             if (range.location < nextLocation)
                 break;
-            misspelledPositions.push_back(PositionPair(static_cast<int>(range.location), static_cast<int>(range.location + range.length)));
+            misspelledPositions.push_back(PositionPair(range.location, range.location + range.length));
             nextLocation = range.location + range.length + 1;
         }
     } while (range.location != NSNotFound);
diff --git a/SwifTools/Notifier/NotificationCenterNotifier.mm b/SwifTools/Notifier/NotificationCenterNotifier.mm
index 1538186..e6fdfb6 100644
--- a/SwifTools/Notifier/NotificationCenterNotifier.mm
+++ b/SwifTools/Notifier/NotificationCenterNotifier.mm
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -88,7 +88,7 @@ void NotificationCenterNotifier::handleUserNotificationActivated(const std::stri
         }
     }
     else {
-        SWIFT_LOG(warning) << "Missing callback entry for activated notification. The activate notification may come from another instance." << std::endl;
+        SWIFT_LOG(warning) << "Missing callback entry for activated notification. The activate notification may come from another instance.";
     }
 }
 
diff --git a/SwifTools/SpellParser.cpp b/SwifTools/SpellParser.cpp
index 5bafa6e..e449b45 100644
--- a/SwifTools/SpellParser.cpp
+++ b/SwifTools/SpellParser.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.
  */
@@ -15,7 +15,6 @@
 #include <string>
 
 #include <boost/bind.hpp>
-#include <boost/numeric/conversion/cast.hpp>
 #include <boost/ref.hpp>
 #include <boost/spirit/include/lex_lexertl.hpp>
 
@@ -47,14 +46,14 @@ struct counter
     {
         switch (t.id()) {
             case ID_WWW:
-                position += boost::numeric_cast<size_t>(t.value().size());
+                position += static_cast<std::size_t>(t.value().size());
                 break;
             case ID_HTTP:
-                position += boost::numeric_cast<size_t>(t.value().size());
+                position += static_cast<std::size_t>(t.value().size());
                 break;
             case ID_WORD:       // matched a word
-                wordPositions.push_back(boost::tuples::make_tuple(position, position + boost::numeric_cast<size_t>(t.value().size())));
-                position += boost::numeric_cast<size_t>(t.value().size());
+                wordPositions.push_back(boost::tuples::make_tuple(position, position + static_cast<std::size_t>(t.value().size())));
+                position += static_cast<std::size_t>(t.value().size());
                 break;
             case ID_CHAR:       // match a simple char
                 ++position;
diff --git a/SwifTools/SpellParser.h b/SwifTools/SpellParser.h
index 5b057c9..3c1cf8b 100644
--- a/SwifTools/SpellParser.h
+++ b/SwifTools/SpellParser.h
@@ -26,7 +26,7 @@ namespace Swift {
         ID_CHAR = 4
     };
 
-    typedef boost::tuple<int, int> PositionPair;
+    typedef boost::tuple<size_t, size_t> PositionPair;
     typedef std::vector<PositionPair > PositionPairList;
 
     class SpellParser{
diff --git a/SwifTools/UnitTest/SpellParserTest.cpp b/SwifTools/UnitTest/SpellParserTest.cpp
index ccfd7e5..bf974ec 100644
--- a/SwifTools/UnitTest/SpellParserTest.cpp
+++ b/SwifTools/UnitTest/SpellParserTest.cpp
@@ -34,21 +34,21 @@ class SpellParserTest : public CppUnit::TestFixture {
         }
         void testSimpleCheckFragment() {
             parser_->check("fragment test", position_);
-            int size = position_.size();
-            CPPUNIT_ASSERT_EQUAL(2, size);
-            CPPUNIT_ASSERT_EQUAL(0, boost::get<0>(position_.front()));
-            CPPUNIT_ASSERT_EQUAL(8, boost::get<1>(position_.front()));
-            CPPUNIT_ASSERT_EQUAL(9, boost::get<0>(position_.back()));
-            CPPUNIT_ASSERT_EQUAL(13, boost::get<1>(position_.back()));
+            auto size = position_.size();
+            CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), size);
+            CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), boost::get<0>(position_.front()));
+            CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(8), boost::get<1>(position_.front()));
+            CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(9), boost::get<0>(position_.back()));
+            CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(13), boost::get<1>(position_.back()));
         }
         void testWWWCheckFragment() {
             parser_->check("www.link.com fragment test", position_);
-            int size = position_.size();
-            CPPUNIT_ASSERT_EQUAL(2, size);
-            CPPUNIT_ASSERT_EQUAL(13, boost::get<0>(position_.front()));
-            CPPUNIT_ASSERT_EQUAL(21, boost::get<1>(position_.front()));
-            CPPUNIT_ASSERT_EQUAL(22, boost::get<0>(position_.back()));
-            CPPUNIT_ASSERT_EQUAL(26, boost::get<1>(position_.back()));
+            auto size = position_.size();
+            CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), size);
+            CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(13), boost::get<0>(position_.front()));
+            CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(21), boost::get<1>(position_.front()));
+            CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(22), boost::get<0>(position_.back()));
+            CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(26), boost::get<1>(position_.back()));
         }
     private:
         const std::unique_ptr<SpellParser> parser_ = std::unique_ptr<SpellParser>(new SpellParser());