5 files changed, 33 insertions, 19 deletions
diff --git a/Swiften/Network/MiniUPnPInterface.h b/Swiften/Network/MiniUPnPInterface.h
index 2f69e4b..46e45e5 100644
--- a/Swiften/Network/MiniUPnPInterface.h
+++ b/Swiften/Network/MiniUPnPInterface.h
@@ -1,13 +1,13 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 #pragma once
 
-#include <boost/optional.hpp>
 #include <boost/noncopyable.hpp>
+#include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
 
 #include <Swiften/Network/NATPortMapping.h>
@@ -17,7 +17,7 @@ namespace Swift {
 	class MiniUPnPInterface : public NATTraversalInterface, boost::noncopyable {
 		public:
 			MiniUPnPInterface();
-			~MiniUPnPInterface();
+			virtual ~MiniUPnPInterface();
 
 			virtual bool isAvailable();
 
diff --git a/Swiften/Network/NATPMPInterface.h b/Swiften/Network/NATPMPInterface.h
index f132ed5..467ee5c 100644
--- a/Swiften/Network/NATPMPInterface.h
+++ b/Swiften/Network/NATPMPInterface.h
@@ -1,14 +1,15 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 #pragma once
 
+#include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/noncopyable.hpp>
+
 #include <Swiften/Network/NATPortMapping.h>
 #include <Swiften/Network/NATTraversalInterface.h>
 
@@ -16,7 +17,7 @@ namespace Swift {
 	class NATPMPInterface : public NATTraversalInterface, boost::noncopyable {
 		public:
 			NATPMPInterface();
-			~NATPMPInterface();
+			virtual ~NATPMPInterface();
 
 			virtual bool isAvailable();
 
diff --git a/Swiften/Network/PlatformNATTraversalWorker.h b/Swiften/Network/PlatformNATTraversalWorker.h
index e9af651..2c03dca 100644
--- a/Swiften/Network/PlatformNATTraversalWorker.h
+++ b/Swiften/Network/PlatformNATTraversalWorker.h
@@ -4,19 +4,26 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
 #include <deque>
+
+#include <boost/logic/tribool.hpp>
 #include <boost/optional.hpp>
-#include <boost/thread/thread.hpp>
-#include <boost/thread/mutex.hpp>
 #include <boost/thread/condition_variable.hpp>
-#include <boost/logic/tribool.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Base/Atomic.h>
-#include <Swiften/Network/NATTraverser.h>
 #include <Swiften/Network/HostAddressPort.h>
+#include <Swiften/Network/NATTraverser.h>
 #include <Swiften/Network/NullNATTraversalInterface.h>
 
 namespace Swift {
@@ -35,7 +42,7 @@ namespace Swift {
 
 		public:
 			PlatformNATTraversalWorker(EventLoop* eventLoop);
-			~PlatformNATTraversalWorker();
+			virtual ~PlatformNATTraversalWorker();
 
 			boost::shared_ptr<NATTraversalGetPublicIPRequest> createGetPublicIPRequest();
 			boost::shared_ptr<NATTraversalForwardPortRequest> createForwardPortRequest(int localPort, int publicPort);
diff --git a/Swiften/Network/StaticDomainNameResolver.h b/Swiften/Network/StaticDomainNameResolver.h
index 369a102..ebbc29f 100644
--- a/Swiften/Network/StaticDomainNameResolver.h
+++ b/Swiften/Network/StaticDomainNameResolver.h
@@ -1,21 +1,21 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <vector>
 #include <map>
+#include <vector>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/Network/HostAddress.h>
-#include <Swiften/Network/HostAddressPort.h>
+#include <Swiften/EventLoop/EventLoop.h>
+#include <Swiften/Network/DomainNameAddressQuery.h>
 #include <Swiften/Network/DomainNameResolver.h>
 #include <Swiften/Network/DomainNameServiceQuery.h>
-#include <Swiften/Network/DomainNameAddressQuery.h>
-#include <Swiften/EventLoop/EventLoop.h>
+#include <Swiften/Network/HostAddress.h>
+#include <Swiften/Network/HostAddressPort.h>
 
 namespace Swift {
 	class SWIFTEN_API StaticDomainNameResolver : public DomainNameResolver {
@@ -25,7 +25,7 @@ namespace Swift {
 
 		public:
 			StaticDomainNameResolver(EventLoop* eventLoop);
-			~StaticDomainNameResolver();
+			virtual ~StaticDomainNameResolver();
 
 			void addAddress(const std::string& domain, const HostAddress& address);
 			void addService(const std::string& service, const DomainNameServiceQuery::Result& result);
diff --git a/Swiften/Network/UnixProxyProvider.h b/Swiften/Network/UnixProxyProvider.h
index 37a4d05..4fc8b27 100644
--- a/Swiften/Network/UnixProxyProvider.h
+++ b/Swiften/Network/UnixProxyProvider.h
@@ -4,6 +4,12 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
 #include <Swiften/Network/EnvironmentProxyProvider.h>
@@ -14,7 +20,7 @@ namespace Swift {
 	class UnixProxyProvider : public ProxyProvider {
 		public:
 			UnixProxyProvider();
-			~UnixProxyProvider();
+			virtual ~UnixProxyProvider();
 
 			virtual HostAddressPort getHTTPConnectProxy() const;
 			virtual HostAddressPort getSOCKS5Proxy() const;