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/messageIdSequence.cpp | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'src/messageIdSequence.cpp') diff --git a/src/messageIdSequence.cpp b/src/messageIdSequence.cpp index 99c96319..bfd0c30f 100644 --- a/src/messageIdSequence.cpp +++ b/src/messageIdSequence.cpp @@ -50,9 +50,9 @@ messageIdSequence::messageIdSequence(const messageIdSequence& midSeq) } -ref messageIdSequence::clone() const +shared_ptr messageIdSequence::clone() const { - return vmime::create (*this); + return make_shared (*this); } @@ -63,7 +63,7 @@ void messageIdSequence::copyFrom(const component& other) removeAllMessageIds(); for (unsigned int i = 0 ; i < midSeq.m_list.size() ; ++i) - m_list.push_back(midSeq.m_list[i]->clone().dynamicCast ()); + m_list.push_back(vmime::clone(midSeq.m_list[i])); } @@ -74,9 +74,9 @@ messageIdSequence& messageIdSequence::operator=(const messageIdSequence& other) } -const std::vector > messageIdSequence::getChildComponents() +const std::vector > messageIdSequence::getChildComponents() { - std::vector > res; + std::vector > res; copy_vector(m_list, res); @@ -94,7 +94,7 @@ void messageIdSequence::parseImpl while (pos < end) { - ref parsedMid = messageId::parseNext(ctx, buffer, pos, end, &pos); + shared_ptr parsedMid = messageId::parseNext(ctx, buffer, pos, end, &pos); if (parsedMid != NULL) m_list.push_back(parsedMid); @@ -118,7 +118,7 @@ void messageIdSequence::generateImpl generationContext tmpCtx(ctx); tmpCtx.setMaxLineLength(ctx.getMaxLineLength() - 2); - for (std::vector >::const_iterator it = m_list.begin() ; ; ) + for (std::vector >::const_iterator it = m_list.begin() ; ; ) { (*it)->generate(ctx, os, pos, &pos); @@ -135,15 +135,15 @@ void messageIdSequence::generateImpl } -void messageIdSequence::appendMessageId(ref mid) +void messageIdSequence::appendMessageId(shared_ptr mid) { m_list.push_back(mid); } -void messageIdSequence::insertMessageIdBefore(ref beforeMid, ref mid) +void messageIdSequence::insertMessageIdBefore(shared_ptr beforeMid, shared_ptr mid) { - const std::vector >::iterator it = std::find + const std::vector >::iterator it = std::find (m_list.begin(), m_list.end(), beforeMid); if (it == m_list.end()) @@ -153,15 +153,15 @@ void messageIdSequence::insertMessageIdBefore(ref beforeMid, ref mid) +void messageIdSequence::insertMessageIdBefore(const size_t pos, shared_ptr mid) { m_list.insert(m_list.begin() + pos, mid); } -void messageIdSequence::insertMessageIdAfter(ref afterMid, ref mid) +void messageIdSequence::insertMessageIdAfter(shared_ptr afterMid, shared_ptr mid) { - const std::vector >::iterator it = std::find + const std::vector >::iterator it = std::find (m_list.begin(), m_list.end(), afterMid); if (it == m_list.end()) @@ -171,15 +171,15 @@ void messageIdSequence::insertMessageIdAfter(ref afterMid, ref mid) +void messageIdSequence::insertMessageIdAfter(const size_t pos, shared_ptr mid) { m_list.insert(m_list.begin() + pos + 1, mid); } -void messageIdSequence::removeMessageId(ref mid) +void messageIdSequence::removeMessageId(shared_ptr mid) { - const std::vector >::iterator it = std::find + const std::vector >::iterator it = std::find (m_list.begin(), m_list.end(), mid); if (it == m_list.end()) @@ -191,7 +191,7 @@ void messageIdSequence::removeMessageId(ref mid) void messageIdSequence::removeMessageId(const size_t pos) { - const std::vector >::iterator it = m_list.begin() + pos; + const std::vector >::iterator it = m_list.begin() + pos; m_list.erase(it); } @@ -215,25 +215,25 @@ bool messageIdSequence::isEmpty() const } -const ref messageIdSequence::getMessageIdAt(const size_t pos) +const shared_ptr messageIdSequence::getMessageIdAt(const size_t pos) { return (m_list[pos]); } -const ref messageIdSequence::getMessageIdAt(const size_t pos) const +const shared_ptr messageIdSequence::getMessageIdAt(const size_t pos) const { return (m_list[pos]); } -const std::vector > messageIdSequence::getMessageIdList() const +const std::vector > messageIdSequence::getMessageIdList() const { - std::vector > list; + std::vector > list; list.reserve(m_list.size()); - for (std::vector >::const_iterator it = m_list.begin() ; + for (std::vector >::const_iterator it = m_list.begin() ; it != m_list.end() ; ++it) { list.push_back(*it); @@ -243,7 +243,7 @@ const std::vector > messageIdSequence::getMessageIdList() } -const std::vector > messageIdSequence::getMessageIdList() +const std::vector > messageIdSequence::getMessageIdList() { return (m_list); } -- cgit v1.2.3