summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Component')
-rw-r--r--Swiften/Component/Component.h3
-rw-r--r--Swiften/Component/ComponentConnector.cpp7
-rw-r--r--Swiften/Component/ComponentConnector.h11
-rw-r--r--Swiften/Component/ComponentHandshakeGenerator.cpp5
-rw-r--r--Swiften/Component/ComponentSession.cpp6
-rw-r--r--Swiften/Component/ComponentSession.h13
-rw-r--r--Swiften/Component/ComponentSessionStanzaChannel.cpp5
-rw-r--r--Swiften/Component/ComponentSessionStanzaChannel.h6
-rw-r--r--Swiften/Component/ComponentXMLTracer.cpp3
-rw-r--r--Swiften/Component/CoreComponent.cpp6
-rw-r--r--Swiften/Component/UnitTest/ComponentSessionTest.cpp14
11 files changed, 43 insertions, 36 deletions
diff --git a/Swiften/Component/Component.h b/Swiften/Component/Component.h
index 9d8b5d3..63aa9f7 100644
--- a/Swiften/Component/Component.h
+++ b/Swiften/Component/Component.h
@@ -6,9 +6,8 @@
#pragma once
-#include <Swiften/Component/CoreComponent.h>
-
#include <Swiften/Base/API.h>
+#include <Swiften/Component/CoreComponent.h>
namespace Swift {
class SoftwareVersionResponder;
diff --git a/Swiften/Component/ComponentConnector.cpp b/Swiften/Component/ComponentConnector.cpp
index 072fd73..7a2121a 100644
--- a/Swiften/Component/ComponentConnector.cpp
+++ b/Swiften/Component/ComponentConnector.cpp
@@ -1,17 +1,18 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swiften/Component/ComponentConnector.h>
-#include <boost/bind.hpp>
#include <iostream>
+#include <boost/bind.hpp>
+
#include <Swiften/Network/ConnectionFactory.h>
-#include <Swiften/Network/DomainNameResolver.h>
#include <Swiften/Network/DomainNameAddressQuery.h>
+#include <Swiften/Network/DomainNameResolver.h>
#include <Swiften/Network/TimerFactory.h>
namespace Swift {
diff --git a/Swiften/Component/ComponentConnector.h b/Swiften/Component/ComponentConnector.h
index e5acdb0..008236b 100644
--- a/Swiften/Component/ComponentConnector.h
+++ b/Swiften/Component/ComponentConnector.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,15 +7,16 @@
#pragma once
#include <deque>
-#include <Swiften/Base/boost_bsignals.h>
+#include <string>
+
#include <boost/shared_ptr.hpp>
#include <Swiften/Base/API.h>
+#include <Swiften/Base/boost_bsignals.h>
#include <Swiften/Network/Connection.h>
-#include <Swiften/Network/Timer.h>
-#include <Swiften/Network/HostAddressPort.h>
-#include <string>
#include <Swiften/Network/DomainNameResolveError.h>
+#include <Swiften/Network/HostAddressPort.h>
+#include <Swiften/Network/Timer.h>
namespace Swift {
class DomainNameAddressQuery;
diff --git a/Swiften/Component/ComponentHandshakeGenerator.cpp b/Swiften/Component/ComponentHandshakeGenerator.cpp
index 8914686..a0eacab 100644
--- a/Swiften/Component/ComponentHandshakeGenerator.cpp
+++ b/Swiften/Component/ComponentHandshakeGenerator.cpp
@@ -1,13 +1,14 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swiften/Component/ComponentHandshakeGenerator.h>
-#include <Swiften/StringCodecs/Hexify.h>
+
#include <Swiften/Base/String.h>
#include <Swiften/Crypto/CryptoProvider.h>
+#include <Swiften/StringCodecs/Hexify.h>
namespace Swift {
diff --git a/Swiften/Component/ComponentSession.cpp b/Swiften/Component/ComponentSession.cpp
index d69790f..79660de 100644
--- a/Swiften/Component/ComponentSession.cpp
+++ b/Swiften/Component/ComponentSession.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -9,11 +9,11 @@
#include <boost/bind.hpp>
#include <boost/smart_ptr/make_shared.hpp>
+#include <Swiften/Component/ComponentHandshakeGenerator.h>
+#include <Swiften/Elements/ComponentHandshake.h>
#include <Swiften/Elements/ProtocolHeader.h>
#include <Swiften/Elements/StreamFeatures.h>
-#include <Swiften/Elements/ComponentHandshake.h>
#include <Swiften/Session/SessionStream.h>
-#include <Swiften/Component/ComponentHandshakeGenerator.h>
namespace Swift {
diff --git a/Swiften/Component/ComponentSession.h b/Swiften/Component/ComponentSession.h
index 0b8c55c..3a750cc 100644
--- a/Swiften/Component/ComponentSession.h
+++ b/Swiften/Component/ComponentSession.h
@@ -1,21 +1,22 @@
/*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <boost/shared_ptr.hpp>
+#include <string>
+
#include <boost/enable_shared_from_this.hpp>
+#include <boost/shared_ptr.hpp>
#include <Swiften/Base/API.h>
-#include <Swiften/JID/JID.h>
-#include <Swiften/Base/boost_bsignals.h>
#include <Swiften/Base/Error.h>
-#include <string>
-#include <Swiften/Elements/ToplevelElement.h>
+#include <Swiften/Base/boost_bsignals.h>
#include <Swiften/Elements/Stanza.h>
+#include <Swiften/Elements/ToplevelElement.h>
+#include <Swiften/JID/JID.h>
#include <Swiften/Session/SessionStream.h>
namespace Swift {
diff --git a/Swiften/Component/ComponentSessionStanzaChannel.cpp b/Swiften/Component/ComponentSessionStanzaChannel.cpp
index fa58d4b..7ff374f 100644
--- a/Swiften/Component/ComponentSessionStanzaChannel.cpp
+++ b/Swiften/Component/ComponentSessionStanzaChannel.cpp
@@ -1,14 +1,15 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swiften/Component/ComponentSessionStanzaChannel.h>
-#include <boost/bind.hpp>
#include <iostream>
+#include <boost/bind.hpp>
+
namespace Swift {
void ComponentSessionStanzaChannel::setSession(boost::shared_ptr<ComponentSession> session) {
diff --git a/Swiften/Component/ComponentSessionStanzaChannel.h b/Swiften/Component/ComponentSessionStanzaChannel.h
index f0f4abd..a507904 100644
--- a/Swiften/Component/ComponentSessionStanzaChannel.h
+++ b/Swiften/Component/ComponentSessionStanzaChannel.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -10,10 +10,10 @@
#include <Swiften/Base/API.h>
#include <Swiften/Base/IDGenerator.h>
-#include <Swiften/Component/ComponentSession.h>
#include <Swiften/Client/StanzaChannel.h>
-#include <Swiften/Elements/Message.h>
+#include <Swiften/Component/ComponentSession.h>
#include <Swiften/Elements/IQ.h>
+#include <Swiften/Elements/Message.h>
#include <Swiften/Elements/Presence.h>
namespace Swift {
diff --git a/Swiften/Component/ComponentXMLTracer.cpp b/Swiften/Component/ComponentXMLTracer.cpp
index 8efc774..49d948b 100644
--- a/Swiften/Component/ComponentXMLTracer.cpp
+++ b/Swiften/Component/ComponentXMLTracer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,6 +7,7 @@
#include <Swiften/Component/ComponentXMLTracer.h>
#include <iostream>
+
#include <boost/bind.hpp>
namespace Swift {
diff --git a/Swiften/Component/CoreComponent.cpp b/Swiften/Component/CoreComponent.cpp
index 358b0c6..fbf59f3 100644
--- a/Swiften/Component/CoreComponent.cpp
+++ b/Swiften/Component/CoreComponent.cpp
@@ -1,14 +1,15 @@
/*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swiften/Component/CoreComponent.h>
-#include <boost/bind.hpp>
#include <iostream>
+#include <boost/bind.hpp>
+
#include <Swiften/Base/IDGenerator.h>
#include <Swiften/Component/ComponentSession.h>
#include <Swiften/Component/ComponentSessionStanzaChannel.h>
@@ -19,7 +20,6 @@
#include <Swiften/TLS/PKCS12Certificate.h>
#include <Swiften/TLS/TLSOptions.h>
-
namespace Swift {
CoreComponent::CoreComponent(const JID& jid, const std::string& secret, NetworkFactories* networkFactories) : networkFactories(networkFactories), jid_(jid), secret_(secret), disconnectRequested_(false) {
diff --git a/Swiften/Component/UnitTest/ComponentSessionTest.cpp b/Swiften/Component/UnitTest/ComponentSessionTest.cpp
index 8d5d700..61c8ce9 100644
--- a/Swiften/Component/UnitTest/ComponentSessionTest.cpp
+++ b/Swiften/Component/UnitTest/ComponentSessionTest.cpp
@@ -1,21 +1,23 @@
/*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
#include <deque>
+
#include <boost/bind.hpp>
#include <boost/optional.hpp>
-#include <Swiften/Session/SessionStream.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
#include <Swiften/Component/ComponentSession.h>
-#include <Swiften/Elements/ComponentHandshake.h>
-#include <Swiften/Elements/AuthFailure.h>
#include <Swiften/Crypto/CryptoProvider.h>
#include <Swiften/Crypto/PlatformCryptoProvider.h>
+#include <Swiften/Elements/AuthFailure.h>
+#include <Swiften/Elements/ComponentHandshake.h>
+#include <Swiften/Session/SessionStream.h>
using namespace Swift;