From 47e607addf2b4ae475b49ff42d0817ffbeafaa46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Remko=20Tron=C3=A7on?= Date: Sun, 12 Jun 2011 21:54:37 +0200 Subject: Removed more explicit calls to get(). 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); } } -- cgit v0.10.2-6-g49f6