1 files changed, 24 insertions, 23 deletions
diff --git a/Swiften/Network/DomainNameServiceQuery.h b/Swiften/Network/DomainNameServiceQuery.h
index fdf5b5d..1631b99 100644
--- a/Swiften/Network/DomainNameServiceQuery.h
+++ b/Swiften/Network/DomainNameServiceQuery.h
@@ -1,40 +1,41 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2018 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <Swiften/Base/boost_bsignals.h>
-#include <boost/optional.hpp>
+#include <memory>
+#include <string>
 #include <vector>
-#include <boost/shared_ptr.hpp>
 
-#include <string>
+#include <boost/optional.hpp>
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
 #include <Swiften/Network/DomainNameResolveError.h>
 
 namespace Swift {
-	class RandomGenerator;
+    class RandomGenerator;
 
-	class SWIFTEN_API DomainNameServiceQuery {
-		public:
-			typedef boost::shared_ptr<DomainNameServiceQuery> ref;
+    class SWIFTEN_API DomainNameServiceQuery {
+        public:
+            typedef std::shared_ptr<DomainNameServiceQuery> ref;
 
-			struct Result {
-				Result(const std::string& hostname = "", int port = -1, int priority = -1, int weight = -1) : hostname(hostname), port(port), priority(priority), weight(weight) {}
-				std::string hostname;
-				int port;
-				int priority;
-				int weight;
-			};
+            struct Result {
+                Result(const std::string& hostname = "", unsigned short port = 0, int priority = -1, int weight = -1) : hostname(hostname), port(port), priority(priority), weight(weight) {}
+                std::string hostname;
+                unsigned short port;
+                int priority;
+                int weight;
+            };
 
-			virtual ~DomainNameServiceQuery();
+            virtual ~DomainNameServiceQuery();
 
-			virtual void run() = 0;
-			static void sortResults(std::vector<DomainNameServiceQuery::Result>& queries, RandomGenerator& generator);
+            virtual void run() = 0;
+            static void sortResults(std::vector<DomainNameServiceQuery::Result>& queries, RandomGenerator& generator);
 
-			boost::signal<void (const std::vector<Result>&)> onResult;
-	};
+            boost::signals2::signal<void (const std::vector<Result>&)> onResult;
+    };
 }