Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften/LinkLocal
diff options
context:
space:
mode:
authorRichard Maudsley <richard.maudsley@isode.com>2014-04-28 08:36:39 (GMT)
committerRichard Maudsley <richard.maudsley@isode.com>2014-04-28 15:23:59 (GMT)
commitbe642f17bfa2df7cb88ddb5fb4aa37438d9e2110 (patch)
treec11e239dfcfcab2b38b64e6a19ffb48e8c30c44d /Swiften/LinkLocal
parent64511948b075e650cacfcc78e40371abee1d2716 (diff)
downloadswift-contrib-be642f17bfa2df7cb88ddb5fb4aa37438d9e2110.zip
swift-contrib-be642f17bfa2df7cb88ddb5fb4aa37438d9e2110.tar.bz2
Create ToplevelElement to replace Element.
Change-Id: I3460f6f4a2ffa9b795080664f49d9138440de72d
Diffstat (limited to 'Swiften/LinkLocal')
-rw-r--r--Swiften/LinkLocal/IncomingLinkLocalSession.cpp4
-rw-r--r--Swiften/LinkLocal/IncomingLinkLocalSession.h6
-rw-r--r--Swiften/LinkLocal/LinkLocalConnector.cpp4
-rw-r--r--Swiften/LinkLocal/LinkLocalConnector.h10
-rw-r--r--Swiften/LinkLocal/OutgoingLinkLocalSession.cpp8
-rw-r--r--Swiften/LinkLocal/OutgoingLinkLocalSession.h10
6 files changed, 21 insertions, 21 deletions
diff --git a/Swiften/LinkLocal/IncomingLinkLocalSession.cpp b/Swiften/LinkLocal/IncomingLinkLocalSession.cpp
index 610b28b..63f3ca1 100644
--- a/Swiften/LinkLocal/IncomingLinkLocalSession.cpp
+++ b/Swiften/LinkLocal/IncomingLinkLocalSession.cpp
@@ -1,4 +1,4 @@
/*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
@@ -50,5 +50,5 @@ void IncomingLinkLocalSession::handleStreamStart(const ProtocolHeader& incomingH
}
-void IncomingLinkLocalSession::handleElement(boost::shared_ptr<Element> element) {
+void IncomingLinkLocalSession::handleElement(boost::shared_ptr<ToplevelElement> element) {
boost::shared_ptr<Stanza> stanza = boost::dynamic_pointer_cast<Stanza>(element);
// If we get our first stanza before streamfeatures, our session is implicitly
diff --git a/Swiften/LinkLocal/IncomingLinkLocalSession.h b/Swiften/LinkLocal/IncomingLinkLocalSession.h
index f00c166..e10cd0a 100644
--- a/Swiften/LinkLocal/IncomingLinkLocalSession.h
+++ b/Swiften/LinkLocal/IncomingLinkLocalSession.h
@@ -1,4 +1,4 @@
/*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
@@ -17,5 +17,5 @@ namespace Swift {
class ProtocolHeader;
class XMLParserFactory;
- class Element;
+ class ToplevelElement;
class PayloadParserFactoryCollection;
class PayloadSerializerCollection;
@@ -33,5 +33,5 @@ namespace Swift {
private:
- void handleElement(boost::shared_ptr<Element>);
+ void handleElement(boost::shared_ptr<ToplevelElement>);
void handleStreamStart(const ProtocolHeader&);
void setInitialized();
diff --git a/Swiften/LinkLocal/LinkLocalConnector.cpp b/Swiften/LinkLocal/LinkLocalConnector.cpp
index af96e65..6471ca7 100644
--- a/Swiften/LinkLocal/LinkLocalConnector.cpp
+++ b/Swiften/LinkLocal/LinkLocalConnector.cpp
@@ -1,4 +1,4 @@
/*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
@@ -72,5 +72,5 @@ void LinkLocalConnector::handleConnected(bool error) {
}
-void LinkLocalConnector::queueElement(boost::shared_ptr<Element> element) {
+void LinkLocalConnector::queueElement(boost::shared_ptr<ToplevelElement> element) {
queuedElements.push_back(element);
}
diff --git a/Swiften/LinkLocal/LinkLocalConnector.h b/Swiften/LinkLocal/LinkLocalConnector.h
index 52692ef..367e972 100644
--- a/Swiften/LinkLocal/LinkLocalConnector.h
+++ b/Swiften/LinkLocal/LinkLocalConnector.h
@@ -1,4 +1,4 @@
/*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
@@ -19,5 +19,5 @@ namespace Swift {
class ConnectionFactory;
class HostAddress;
- class Element;
+ class ToplevelElement;
class PayloadParserFactoryCollection;
class PayloadSerializerCollection;
@@ -39,7 +39,7 @@ namespace Swift {
void connect();
void cancel();
- void queueElement(boost::shared_ptr<Element> element);
+ void queueElement(boost::shared_ptr<ToplevelElement> element);
- const std::vector<boost::shared_ptr<Element> >& getQueuedElements() const {
+ const std::vector<boost::shared_ptr<ToplevelElement> >& getQueuedElements() const {
return queuedElements;
}
@@ -62,5 +62,5 @@ namespace Swift {
boost::shared_ptr<Connection> connection;
boost::bsignals::connection connectionConnectFinishedConnection;
- std::vector<boost::shared_ptr<Element> > queuedElements;
+ std::vector<boost::shared_ptr<ToplevelElement> > queuedElements;
};
}
diff --git a/Swiften/LinkLocal/OutgoingLinkLocalSession.cpp b/Swiften/LinkLocal/OutgoingLinkLocalSession.cpp
index 7a59715..1d280ef 100644
--- a/Swiften/LinkLocal/OutgoingLinkLocalSession.cpp
+++ b/Swiften/LinkLocal/OutgoingLinkLocalSession.cpp
@@ -1,4 +1,4 @@
/*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
@@ -36,5 +36,5 @@ void OutgoingLinkLocalSession::handleSessionStarted() {
void OutgoingLinkLocalSession::handleStreamStart(const ProtocolHeader&) {
- foreach(const boost::shared_ptr<Element>& stanza, queuedElements_) {
+ foreach(const boost::shared_ptr<ToplevelElement>& stanza, queuedElements_) {
sendElement(stanza);
}
@@ -42,9 +42,9 @@ void OutgoingLinkLocalSession::handleStreamStart(const ProtocolHeader&) {
}
-void OutgoingLinkLocalSession::handleElement(boost::shared_ptr<Element> element) {
+void OutgoingLinkLocalSession::handleElement(boost::shared_ptr<ToplevelElement> element) {
onElementReceived(element);
}
-void OutgoingLinkLocalSession::queueElement(boost::shared_ptr<Element> element) {
+void OutgoingLinkLocalSession::queueElement(boost::shared_ptr<ToplevelElement> element) {
queuedElements_.push_back(element);
}
diff --git a/Swiften/LinkLocal/OutgoingLinkLocalSession.h b/Swiften/LinkLocal/OutgoingLinkLocalSession.h
index b97f2bf..4550ae4 100644
--- a/Swiften/LinkLocal/OutgoingLinkLocalSession.h
+++ b/Swiften/LinkLocal/OutgoingLinkLocalSession.h
@@ -1,4 +1,4 @@
/*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
@@ -18,5 +18,5 @@ namespace Swift {
class ConnectionFactory;
class XMLParserFactory;
- class Element;
+ class ToplevelElement;
class PayloadParserFactoryCollection;
class PayloadSerializerCollection;
@@ -32,13 +32,13 @@ namespace Swift {
XMLParserFactory* xmlParserFactory);
- void queueElement(boost::shared_ptr<Element> element);
+ void queueElement(boost::shared_ptr<ToplevelElement> element);
private:
void handleSessionStarted();
- void handleElement(boost::shared_ptr<Element>);
+ void handleElement(boost::shared_ptr<ToplevelElement>);
void handleStreamStart(const ProtocolHeader&);
private:
- std::vector<boost::shared_ptr<Element> > queuedElements_;
+ std::vector<boost::shared_ptr<ToplevelElement> > queuedElements_;
};
}