Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-04-01 17:23:49 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-04-04 08:28:23 (GMT) |
| commit | 741c45b74d5f634622eb5f757c49323274fb8937 (patch) | |
| tree | b9cfa6c2fe2e79e03cc8cb7c1ca1e9cf45aa5328 /Swiften/Parser/PayloadParsers/FormParser.cpp | |
| parent | eddd92ed76ae68cb1e202602fd3ebd11b69191a2 (diff) | |
| download | swift-741c45b74d5f634622eb5f757c49323274fb8937.zip swift-741c45b74d5f634622eb5f757c49323274fb8937.tar.bz2 | |
Modernize code to use C++11 shared_ptr instead of Boost's
This change was done by applying the following 'gsed'
replacement calls to all source files:
's/\#include <boost\/shared_ptr\.hpp>/\#include <memory>/g'
's/\#include <boost\/enable_shared_from_this\.hpp>/\#include <memory>/g'
's/\#include <boost\/smart_ptr\/make_shared\.hpp>/\#include <memory>/g'
's/\#include <boost\/make_shared\.hpp>/\#include <memory>/g'
's/\#include <boost\/weak_ptr\.hpp>/\#include <memory>/g'
's/boost::make_shared/std::make_shared/g'
's/boost::dynamic_pointer_cast/std::dynamic_pointer_cast/g'
's/boost::shared_ptr/std::shared_ptr/g'
's/boost::weak_ptr/std::weak_ptr/g'
's/boost::enable_shared_from_this/std::enable_shared_from_this/g'
The remaining issues have been fixed manually.
Test-Information:
Code builds on OS X 10.11.4 and unit tests pass.
Change-Id: Ia7ae34eab869fb9ad6387a1348426b71ae4acd5f
Diffstat (limited to 'Swiften/Parser/PayloadParsers/FormParser.cpp')
| -rw-r--r-- | Swiften/Parser/PayloadParsers/FormParser.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Swiften/Parser/PayloadParsers/FormParser.cpp b/Swiften/Parser/PayloadParsers/FormParser.cpp index 3a2c880..4a0a26f 100644 --- a/Swiften/Parser/PayloadParsers/FormParser.cpp +++ b/Swiften/Parser/PayloadParsers/FormParser.cpp @@ -45,7 +45,7 @@ void FormParser::handleStartElement(const std::string& element, const std::strin parsingItem_ = true; } else if (element == "page") { - currentPage_ = boost::make_shared<FormPage>(); + currentPage_ = std::make_shared<FormPage>(); currentPage_->setLabel(attributes.getAttribute("label")); } } @@ -59,7 +59,7 @@ void FormParser::handleStartElement(const std::string& element, const std::strin } if (level_ >= PayloadLevel) { if (element == "field") { - currentField_ = boost::make_shared<FormField>(); + currentField_ = std::make_shared<FormField>(); std::string type = attributes.getAttribute("type"); FormField::Type fieldType = FormField::UnknownType; if (type == "boolean") { @@ -102,13 +102,13 @@ void FormParser::handleStartElement(const std::string& element, const std::strin } if (level_ > PayloadLevel) { if (element == "section") { - currentSection_ = boost::make_shared<FormSection>(); + currentSection_ = std::make_shared<FormSection>(); currentSection_->setLabel(attributes.getAttribute("label")); sectionStack_.push_back(currentSection_); currentSections_.push_back(currentSection_); } if (element == "reportedref") { - currentReportedRef_ = boost::make_shared<FormReportedRef>(); + currentReportedRef_ = std::make_shared<FormReportedRef>(); } if (element == "fieldref") { currentText_.clear(); @@ -121,7 +121,7 @@ void FormParser::handleStartElement(const std::string& element, const std::strin } if (element == "text") { currentText_.clear(); - currentTextElement_ = boost::make_shared<FormText>(); + currentTextElement_ = std::make_shared<FormText>(); } } ++level_; @@ -191,14 +191,14 @@ void FormParser::handleEndElement(const std::string& element, const std::string& } else { if (currentPages_.size() > 0) { - foreach (boost::shared_ptr<FormPage> page, currentPages_) { + foreach (std::shared_ptr<FormPage> page, currentPages_) { foreach (std::string pageRef, page->getFieldRefs()) { if (pageRef == currentField_->getName()) { page->addField(currentField_); } } } - foreach (boost::shared_ptr<FormSection> section, currentSections_) { + foreach (std::shared_ptr<FormSection> section, currentSections_) { foreach (std::string sectionRef, section->getFieldRefs()) { if (sectionRef == currentField_->getName()) { section->addField(currentField_); |