summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-12 19:54:37 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-12 19:54:37 (GMT)
commit47e607addf2b4ae475b49ff42d0817ffbeafaa46 (patch)
tree9a5dcccf5d12019690079a7665cb9f67f1312c4d
parent8df7a3c93342e49c6b407b390e631f058546c0c3 (diff)
downloadswift-contrib-47e607addf2b4ae475b49ff42d0817ffbeafaa46.zip
swift-contrib-47e607addf2b4ae475b49ff42d0817ffbeafaa46.tar.bz2
Removed more explicit calls to get().
-rw-r--r--Swiften/Parser/PayloadParsers/ErrorParser.cpp6
-rw-r--r--Swiften/Parser/PayloadParsers/PrivateStorageParser.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/Parser/PayloadParsers/ErrorParser.cpp b/Swiften/Parser/PayloadParsers/ErrorParser.cpp
index 1b0094e..8a02317 100644
--- a/Swiften/Parser/PayloadParsers/ErrorParser.cpp
+++ b/Swiften/Parser/PayloadParsers/ErrorParser.cpp
@@ -108,7 +108,7 @@ void ErrorParser::handleStartElement(const std::string& element, const std::stri
}
}
}
- if (level_ >= PayloadLevel && currentPayloadParser.get()) {
+ if (level_ >= PayloadLevel && currentPayloadParser) {
currentPayloadParser->handleStartElement(element, ns, attributes);
}
++level_;
@@ -116,7 +116,7 @@ void ErrorParser::handleStartElement(const std::string& element, const std::stri
void ErrorParser::handleEndElement(const std::string& element, const std::string& ns) {
--level_;
- if (currentPayloadParser.get()) {
+ if (currentPayloadParser) {
if (level_ >= PayloadLevel) {
currentPayloadParser->handleEndElement(element, ns);
}
@@ -134,7 +134,7 @@ void ErrorParser::handleEndElement(const std::string& element, const std::string
}
void ErrorParser::handleCharacterData(const std::string& data) {
- if (level_ > PayloadLevel && currentPayloadParser.get()) {
+ if (level_ > PayloadLevel && currentPayloadParser) {
currentPayloadParser->handleCharacterData(data);
}
else {
diff --git a/Swiften/Parser/PayloadParsers/PrivateStorageParser.cpp b/Swiften/Parser/PayloadParsers/PrivateStorageParser.cpp
index b7bcd5d..bf16394 100644
--- a/Swiften/Parser/PayloadParsers/PrivateStorageParser.cpp
+++ b/Swiften/Parser/PayloadParsers/PrivateStorageParser.cpp
@@ -21,7 +21,7 @@ void PrivateStorageParser::handleStartElement(const std::string& element, const
}
}
- if (level >= 1 && currentPayloadParser.get()) {
+ if (level >= 1 && currentPayloadParser) {
currentPayloadParser->handleStartElement(element, ns, attributes);
}
++level;
@@ -29,7 +29,7 @@ void PrivateStorageParser::handleStartElement(const std::string& element, const
void PrivateStorageParser::handleEndElement(const std::string& element, const std::string& ns) {
--level;
- if (currentPayloadParser.get()) {
+ if (currentPayloadParser) {
if (level >= 1) {
currentPayloadParser->handleEndElement(element, ns);
}
@@ -41,7 +41,7 @@ void PrivateStorageParser::handleEndElement(const std::string& element, const st
}
void PrivateStorageParser::handleCharacterData(const std::string& data) {
- if (level > 1 && currentPayloadParser.get()) {
+ if (level > 1 && currentPayloadParser) {
currentPayloadParser->handleCharacterData(data);
}
}