summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Parser')
-rw-r--r--Swiften/Parser/ElementParser.h6
-rw-r--r--Swiften/Parser/GenericElementParser.h4
-rw-r--r--Swiften/Parser/GenericStanzaParser.h4
-rw-r--r--Swiften/Parser/StanzaParser.h4
-rw-r--r--Swiften/Parser/UnitTest/StanzaParserTest.cpp4
-rw-r--r--Swiften/Parser/UnitTest/XMPPParserTest.cpp8
-rw-r--r--Swiften/Parser/XMPPParserClient.h6
7 files changed, 18 insertions, 18 deletions
diff --git a/Swiften/Parser/ElementParser.h b/Swiften/Parser/ElementParser.h
index 1815240..256e2dc 100644
--- a/Swiften/Parser/ElementParser.h
+++ b/Swiften/Parser/ElementParser.h
@@ -1,5 +1,5 @@
/*
- * 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.
*/
@@ -10,7 +10,7 @@
#include <string>
#include <Swiften/Base/API.h>
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
#include <Swiften/Parser/AttributeMap.h>
namespace Swift {
@@ -22,6 +22,6 @@ namespace Swift {
virtual void handleEndElement(const std::string& element, const std::string& ns) = 0;
virtual void handleCharacterData(const std::string& data) = 0;
- virtual boost::shared_ptr<Element> getElement() const = 0;
+ virtual boost::shared_ptr<ToplevelElement> getElement() const = 0;
};
}
diff --git a/Swiften/Parser/GenericElementParser.h b/Swiften/Parser/GenericElementParser.h
index 224c59e..4395622 100644
--- a/Swiften/Parser/GenericElementParser.h
+++ b/Swiften/Parser/GenericElementParser.h
@@ -1,5 +1,5 @@
/*
- * 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.
*/
@@ -22,7 +22,7 @@ namespace Swift {
stanza_ = boost::make_shared<ElementType>();
}
- virtual boost::shared_ptr<Element> getElement() const {
+ virtual boost::shared_ptr<ToplevelElement> getElement() const {
return stanza_;
}
diff --git a/Swiften/Parser/GenericStanzaParser.h b/Swiften/Parser/GenericStanzaParser.h
index c756c9a..2aff4d5 100644
--- a/Swiften/Parser/GenericStanzaParser.h
+++ b/Swiften/Parser/GenericStanzaParser.h
@@ -1,5 +1,5 @@
/*
- * 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.
*/
@@ -23,7 +23,7 @@ namespace Swift {
stanza_ = boost::make_shared<STANZA_TYPE>();
}
- virtual boost::shared_ptr<Element> getElement() const {
+ virtual boost::shared_ptr<ToplevelElement> getElement() const {
return stanza_;
}
diff --git a/Swiften/Parser/StanzaParser.h b/Swiften/Parser/StanzaParser.h
index 0af6b43..fc60b47 100644
--- a/Swiften/Parser/StanzaParser.h
+++ b/Swiften/Parser/StanzaParser.h
@@ -1,5 +1,5 @@
/*
- * 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.
*/
@@ -28,7 +28,7 @@ namespace Swift {
void handleEndElement(const std::string& element, const std::string& ns);
void handleCharacterData(const std::string& data);
- virtual boost::shared_ptr<Element> getElement() const = 0;
+ virtual boost::shared_ptr<ToplevelElement> getElement() const = 0;
virtual void handleStanzaAttributes(const AttributeMap&) {}
virtual boost::shared_ptr<Stanza> getStanza() const {
diff --git a/Swiften/Parser/UnitTest/StanzaParserTest.cpp b/Swiften/Parser/UnitTest/StanzaParserTest.cpp
index 88e6dec..020f0ca 100644
--- a/Swiften/Parser/UnitTest/StanzaParserTest.cpp
+++ b/Swiften/Parser/UnitTest/StanzaParserTest.cpp
@@ -1,5 +1,5 @@
/*
- * 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.
*/
@@ -196,7 +196,7 @@ class StanzaParserTest : public CppUnit::TestFixture {
stanza_ = boost::make_shared<MyStanza>();
}
- virtual boost::shared_ptr<Element> getElement() const {
+ virtual boost::shared_ptr<ToplevelElement> getElement() const {
return stanza_;
}
diff --git a/Swiften/Parser/UnitTest/XMPPParserTest.cpp b/Swiften/Parser/UnitTest/XMPPParserTest.cpp
index f8d60f2..7d2d3fa 100644
--- a/Swiften/Parser/UnitTest/XMPPParserTest.cpp
+++ b/Swiften/Parser/UnitTest/XMPPParserTest.cpp
@@ -1,5 +1,5 @@
/*
- * 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.
*/
@@ -162,7 +162,7 @@ class XMPPParserTest : public CppUnit::TestFixture {
public:
enum Type { StreamStart, ElementEvent, StreamEnd };
struct Event {
- Event(Type type, boost::shared_ptr<Element> element)
+ Event(Type type, boost::shared_ptr<ToplevelElement> element)
: type(type), element(element) {}
Event(Type type, const ProtocolHeader& header) : type(type), header(header) {}
@@ -170,7 +170,7 @@ class XMPPParserTest : public CppUnit::TestFixture {
Type type;
boost::optional<ProtocolHeader> header;
- boost::shared_ptr<Element> element;
+ boost::shared_ptr<ToplevelElement> element;
};
Client() {}
@@ -179,7 +179,7 @@ class XMPPParserTest : public CppUnit::TestFixture {
events.push_back(Event(StreamStart, header));
}
- void handleElement(boost::shared_ptr<Element> element) {
+ void handleElement(boost::shared_ptr<ToplevelElement> element) {
events.push_back(Event(ElementEvent, element));
}
diff --git a/Swiften/Parser/XMPPParserClient.h b/Swiften/Parser/XMPPParserClient.h
index 85e0f86..7d35968 100644
--- a/Swiften/Parser/XMPPParserClient.h
+++ b/Swiften/Parser/XMPPParserClient.h
@@ -1,5 +1,5 @@
/*
- * 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.
*/
@@ -9,7 +9,7 @@
#include <boost/shared_ptr.hpp>
#include <Swiften/Base/API.h>
-#include <Swiften/Elements/Element.h>
+#include <Swiften/Elements/ToplevelElement.h>
namespace Swift {
@@ -20,7 +20,7 @@ namespace Swift {
virtual ~XMPPParserClient();
virtual void handleStreamStart(const ProtocolHeader&) = 0;
- virtual void handleElement(boost::shared_ptr<Element>) = 0;
+ virtual void handleElement(boost::shared_ptr<ToplevelElement>) = 0;
virtual void handleStreamEnd() = 0;
};
}