6 files changed, 22 insertions, 18 deletions
diff --git a/Slimber/Cocoa/MainMenu.xib b/Slimber/Cocoa/MainMenu.xib
index bed7223..fb124d4 100644
--- a/Slimber/Cocoa/MainMenu.xib
+++ b/Slimber/Cocoa/MainMenu.xib
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
 	<data>
-		<int key="IBDocument.SystemTarget">1050</int>
+		<int key="IBDocument.SystemTarget">1060</int>
 		<string key="IBDocument.SystemVersion">9J61</string>
 		<string key="IBDocument.InterfaceBuilderVersion">677</string>
 		<string key="IBDocument.AppKitVersion">949.46</string>
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<integer value="136"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
diff --git a/Slimber/MainController.cpp b/Slimber/MainController.cpp
index cd36132..93eb4e7 100644
--- a/Slimber/MainController.cpp
+++ b/Slimber/MainController.cpp
@@ -96,25 +96,25 @@ void MainController::handleServicesChanged() {
     }
     menuletController->setUserNames(names);
 }
 
 void MainController::handleServerStopped(boost::optional<ServerError> error) {
     if (error) {
         std::string message;
         switch (error->getType()) {
             case ServerError::C2SPortConflict:
-                message = std::string("Error: Port ") + boost::lexical_cast<std::string>(server->getClientToServerPort()) + std::string(" in use");
+                message = std::string("Error: Port ") + std::to_string(server->getClientToServerPort()) + std::string(" in use");
                 break;
             case ServerError::C2SError:
                 message = std::string("Local connection server error");
              break;
             case ServerError::LinkLocalPortConflict:
-                message = std::string("Error: Port ") + boost::lexical_cast<std::string>(server->getLinkLocalPort()) + std::string(" in use");
+                message = std::string("Error: Port ") + std::to_string(server->getLinkLocalPort()) + std::string(" in use");
                 break;
             case ServerError::LinkLocalError:
                 message = std::string("External connection server error");
                 break;
         }
         menuletController->setXMPPStatus(message, MenuletController::Offline);
     }
     else {
         menuletController->setXMPPStatus("XMPP Server Not Running", MenuletController::Offline);
diff --git a/Slimber/SConscript b/Slimber/SConscript
index a41fe0b..fa5aa53 100644
--- a/Slimber/SConscript
+++ b/Slimber/SConscript
@@ -5,22 +5,22 @@ Import("env")
 env["BUILD_SLIMBER"] = True
 if env["PLATFORM"] == "win32" :
     if not env.get("HAVE_BONJOUR") and "Slimber" in env["PROJECTS"] :
         env["PROJECTS"].remove("Slimber")
 elif env["PLATFORM"] != "darwin" :
     if not env.get("HAVE_AVAHI", False) and "Slimber" in env["PROJECTS"] :
         env["PROJECTS"].remove("Slimber")
 
 if not "Slimber" in env["PROJECTS"] and env["SCONS_STAGE"] == "flags" :
-        print "Bonjour missing. Not building Slimber."
+        print("Bonjour missing. Not building Slimber.")
 
 if not env.get("HAVE_QT", False) and "Slimber" in env["PROJECTS"] :
-    print "Qt missing. Not building Slimber."
+    print("Qt missing. Not building Slimber.")
     env["PROJECTS"].remove("Slimber")
 
 if "Slimber" in env["PROJECTS"] :
 
 ################################################################################
 # Flags
 ################################################################################
 
     if env["SCONS_STAGE"] == "flags" :
diff --git a/Slimber/Server.cpp b/Slimber/Server.cpp
index 3bc3112..bfa34f5 100644
--- a/Slimber/Server.cpp
+++ b/Slimber/Server.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Slimber/Server.h>
 
 #include <cassert>
 #include <string>
 
@@ -33,20 +33,20 @@
 #include <Limber/Server/ServerFromClientSession.h>
 #include <Limber/Server/UserRegistry.h>
 
 #include <Slimber/LinkLocalPresenceManager.h>
 #include <Slimber/VCardCollection.h>
 
 namespace Swift {
 
 Server::Server(
-        int clientConnectionPort,
-        int linkLocalConnectionPort,
+        unsigned short clientConnectionPort,
+        unsigned short linkLocalConnectionPort,
         LinkLocalServiceBrowser* linkLocalServiceBrowser,
         VCardCollection* vCardCollection,
         EventLoop* eventLoop) :
             linkLocalServiceRegistered(false),
             rosterRequested(false),
             clientConnectionPort(clientConnectionPort),
             linkLocalConnectionPort(linkLocalConnectionPort),
             linkLocalServiceBrowser(linkLocalServiceBrowser),
             vCardCollection(vCardCollection),
diff --git a/Slimber/Server.h b/Slimber/Server.h
index 4842cd9..2ee5a4a 100644
--- a/Slimber/Server.h
+++ b/Slimber/Server.h
@@ -1,11 +1,11 @@
 /*
- * 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 <memory>
 #include <vector>
 
@@ -35,33 +35,33 @@ namespace Swift {
     class BoostConnectionServer;
     class SessionTracer;
     class RosterPayload;
     class Presence;
     class EventLoop;
 
     class Server {
         public:
             Server(
-                    int clientConnectionPort,
-                    int linkLocalConnectionPort,
+                    unsigned short clientConnectionPort,
+                    unsigned short linkLocalConnectionPort,
                     LinkLocalServiceBrowser* browser,
                     VCardCollection* vCardCollection,
                     EventLoop* eventLoop);
             ~Server();
 
             void start();
             void stop();
 
-            int getLinkLocalPort() const {
+            unsigned short getLinkLocalPort() const {
                 return linkLocalConnectionPort;
             }
 
-            int getClientToServerPort() const {
+            unsigned short getClientToServerPort() const {
                 return clientConnectionPort;
             }
 
             boost::signals2::signal<void (bool)> onSelfConnected;
             boost::signals2::signal<void (boost::optional<ServerError>)> onStopped;
 
         private:
             void stop(boost::optional<ServerError>);
 
@@ -99,20 +99,20 @@ namespace Swift {
         private:
             IDGenerator idGenerator;
             FullPayloadParserFactoryCollection payloadParserFactories;
             FullPayloadSerializerCollection payloadSerializers;
             BoostIOServiceThread boostIOServiceThread;
             DummyUserRegistry userRegistry;
             PlatformXMLParserFactory xmlParserFactory;
             bool linkLocalServiceRegistered;
             bool rosterRequested;
-            int clientConnectionPort;
-            int linkLocalConnectionPort;
+            unsigned short clientConnectionPort;
+            unsigned short linkLocalConnectionPort;
             LinkLocalServiceBrowser* linkLocalServiceBrowser;
             VCardCollection* vCardCollection;
             EventLoop* eventLoop;
             LinkLocalPresenceManager* presenceManager;
             bool stopping;
             std::shared_ptr<BoostConnectionServer> serverFromClientConnectionServer;
             std::vector<boost::signals2::connection> serverFromClientConnectionServerSignalConnections;
             std::shared_ptr<ServerFromClientSession> serverFromClientSession;
             std::shared_ptr<Presence> lastPresence;
diff --git a/Slimber/UnitTest/LinkLocalPresenceManagerTest.cpp b/Slimber/UnitTest/LinkLocalPresenceManagerTest.cpp
index c8e7700..b1a51c9 100644
--- a/Slimber/UnitTest/LinkLocalPresenceManagerTest.cpp
+++ b/Slimber/UnitTest/LinkLocalPresenceManagerTest.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <map>
 
 #include <boost/bind.hpp>
 
 #include <cppunit/extensions/HelperMacros.h>
@@ -219,35 +219,39 @@ class LinkLocalPresenceManagerTest : public CppUnit::TestFixture {
             return testling;
         }
 
         void addService(const std::string& name, const std::string& nickName = std::string(), const std::string& firstName = std::string(), const std::string& lastName = std::string()) {
             DNSSDServiceID service(name, "local.");
             LinkLocalServiceInfo info;
             info.setFirstName(firstName);
             info.setLastName(lastName);
             info.setNick(nickName);
-            querier->setServiceInfo(service, DNSSDResolveServiceQuery::Result(name + "._presence._tcp.local", "rabbithole.local", 1234, info.toTXTRecord()));
+            auto txtRecord = info.toTXTRecord();
+            CPPUNIT_ASSERT(txtRecord);
+            querier->setServiceInfo(service, DNSSDResolveServiceQuery::Result(name + "._presence._tcp.local", "rabbithole.local", 1234, *txtRecord));
             querier->addService(service);
             eventLoop->processEvents();
         }
 
         void removeService(const std::string& name) {
             DNSSDServiceID service(name, "local.");
             querier->removeService(DNSSDServiceID(name, "local."));
             eventLoop->processEvents();
         }
 
         void updateServicePresence(const std::string& name, LinkLocalServiceInfo::Status status, const std::string& message) {
             DNSSDServiceID service(name, "local.");
             LinkLocalServiceInfo info;
             info.setStatus(status);
             info.setMessage(message);
-            querier->setServiceInfo(service, DNSSDResolveServiceQuery::Result(name + "._presence._tcp.local", "rabbithole.local", 1234, info.toTXTRecord()));
+            auto txtRecord = info.toTXTRecord();
+            CPPUNIT_ASSERT(txtRecord);
+            querier->setServiceInfo(service, DNSSDResolveServiceQuery::Result(name + "._presence._tcp.local", "rabbithole.local", 1234, *txtRecord));
             eventLoop->processEvents();
         }
 
         void handleRosterChanged(std::shared_ptr<RosterPayload> payload) {
             rosterChanges.push_back(payload);
         }
 
         void handlePresenceChanged(std::shared_ptr<Presence> presence) {
             presenceChanges.push_back(presence);