From f9913fa28a27f23fde2d4956c62cbb2fb2bc2ee8 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Thu, 21 Nov 2013 22:16:57 +0100 Subject: Boost/C++11 shared pointers. --- src/messageBuilder.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/messageBuilder.cpp') diff --git a/src/messageBuilder.cpp b/src/messageBuilder.cpp index ecd0f5d7..64880483 100644 --- a/src/messageBuilder.cpp +++ b/src/messageBuilder.cpp @@ -43,10 +43,10 @@ messageBuilder::~messageBuilder() } -ref messageBuilder::construct() const +shared_ptr messageBuilder::construct() const { // Create a new message - ref msg = vmime::create (); + shared_ptr msg = make_shared (); // Generate the header fields msg->getHeader()->Subject()->setValue(m_subject); @@ -101,7 +101,7 @@ ref messageBuilder::construct() const (mediaType(mediaTypes::MULTIPART, mediaTypes::MULTIPART_MIXED)); // Create a sub-part "multipart/alternative" for text parts - ref subPart = vmime::create (); + shared_ptr subPart = make_shared (); msg->getBody()->appendPart(subPart); subPart->getHeader()->ContentType()->setValue @@ -133,7 +133,7 @@ ref messageBuilder::construct() const // Generate the attachments if (!m_attach.empty()) { - for (std::vector >::const_iterator a = m_attach.begin() ; + for (std::vector >::const_iterator a = m_attach.begin() ; a != m_attach.end() ; ++a) { (*a)->generateIn(msg); @@ -147,12 +147,12 @@ ref messageBuilder::construct() const const bodyPart& part = *msg->getBody()->getPartAt(0); // Make a full copy of the body, otherwise the copyFrom() will delete the body we're copying - ref bodyCopy = part.getBody()->clone().dynamicCast (); + shared_ptr bodyCopy = vmime::clone(part.getBody()); // First, copy (and replace) the header fields - const std::vector > fields = part.getHeader()->getFieldList(); + const std::vector > fields = part.getHeader()->getFieldList(); - for (std::vector >::const_iterator it = fields.begin() ; + for (std::vector >::const_iterator it = fields.begin() ; it != fields.end() ; ++it) { *(msg->getHeader()->getField((*it)->getName())) = **it; @@ -167,13 +167,13 @@ ref messageBuilder::construct() const } -void messageBuilder::attach(ref attach) +void messageBuilder::attach(shared_ptr attach) { appendAttachment(attach); } -void messageBuilder::appendAttachment(ref attach) +void messageBuilder::appendAttachment(shared_ptr attach) { m_attach.push_back(attach); } @@ -181,7 +181,7 @@ void messageBuilder::appendAttachment(ref attach) void messageBuilder::constructTextPart(const mediaType& type) { - ref part = NULL; + shared_ptr part; try { @@ -196,7 +196,7 @@ void messageBuilder::constructTextPart(const mediaType& type) } -ref messageBuilder::getTextPart() +shared_ptr messageBuilder::getTextPart() { return (m_textPart); } @@ -286,13 +286,13 @@ void messageBuilder::removeAttachment(const size_t pos) } -const ref messageBuilder::getAttachmentAt(const size_t pos) const +const shared_ptr messageBuilder::getAttachmentAt(const size_t pos) const { return (m_attach[pos]); } -ref messageBuilder::getAttachmentAt(const size_t pos) +shared_ptr messageBuilder::getAttachmentAt(const size_t pos) { return (m_attach[pos]); } @@ -304,13 +304,13 @@ size_t messageBuilder::getAttachmentCount() const } -const std::vector > messageBuilder::getAttachmentList() const +const std::vector > messageBuilder::getAttachmentList() const { - std::vector > res; + std::vector > res; res.reserve(m_attach.size()); - for (std::vector >::const_iterator it = m_attach.begin() ; + for (std::vector >::const_iterator it = m_attach.begin() ; it != m_attach.end() ; ++it) { res.push_back(*it); @@ -320,7 +320,7 @@ const std::vector > messageBuilder::getAttachmentList() } -const std::vector > messageBuilder::getAttachmentList() +const std::vector > messageBuilder::getAttachmentList() { return (m_attach); } -- cgit v1.2.3