From ea57bf8207e0deff2cf64c3b668c75d2ded37152 Mon Sep 17 00:00:00 2001 From: aleks-f Date: Mon, 11 Mar 2013 20:49:36 -0500 Subject: [PATCH] renamed getPartStore() to createPartStore() --- Net/include/Poco/Net/FilePartSource.h | 1 - Net/include/Poco/Net/MailMessage.h | 10 +++++----- Net/src/MailMessage.cpp | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Net/include/Poco/Net/FilePartSource.h b/Net/include/Poco/Net/FilePartSource.h index e1a0cef78..58f1079a3 100644 --- a/Net/include/Poco/Net/FilePartSource.h +++ b/Net/include/Poco/Net/FilePartSource.h @@ -43,7 +43,6 @@ #include "Poco/Net/Net.h" #include "Poco/Net/PartSource.h" #include "Poco/FileStream.h" -#include "Poco/TemporaryFile.h" namespace Poco { diff --git a/Net/include/Poco/Net/MailMessage.h b/Net/include/Poco/Net/MailMessage.h index 9d5553c33..54c639ac3 100644 --- a/Net/include/Poco/Net/MailMessage.h +++ b/Net/include/Poco/Net/MailMessage.h @@ -219,15 +219,15 @@ public: /// To include non-ASCII characters in the part name or filename, /// use RFC 2047 word encoding (see encodeWord()). - PartSource* getPartStore(const std::string& content, + PartSource* createPartStore(const std::string& content, const std::string& mediaType, const std::string& filename = ""); - /// Returns either built-in default (StringPartSource) part store or, + /// Returns either default StringPartSource part store or, /// if the part store factory was provided during contruction, /// the one created by PartStoreFactory. - /// Returned part store is allocated on the heap; it is caller's responsibility - /// to delete it after use. Typical use is handler passing it back to MailMessage, - /// which takes care of the cleanup. + /// Returned part store is allocated on the heap; it is caller's + /// responsibility to delete it after use. Typical use is handler + /// passing it back to MailMessage, which takes care of the cleanup. const PartVec& parts() const; /// Returns const reference to the vector containing part stores. diff --git a/Net/src/MailMessage.cpp b/Net/src/MailMessage.cpp index 88ba24704..2ea20594f 100644 --- a/Net/src/MailMessage.cpp +++ b/Net/src/MailMessage.cpp @@ -114,7 +114,7 @@ namespace NameValueCollection::ConstIterator it = header.begin(); NameValueCollection::ConstIterator end = header.end(); - PartSource* pPS = _pMsg->getPartStore(tmp, + PartSource* pPS = _pMsg->createPartStore(tmp, header[MailMessage::HEADER_CONTENT_TYPE], getFileNameFromDisp(it->second)); poco_check_ptr (pPS); @@ -680,7 +680,7 @@ std::string MailMessage::encodeWord(const std::string& text, const std::string& } -PartSource* MailMessage::getPartStore(const std::string& content, const std::string& mediaType, const std::string& filename) +PartSource* MailMessage::createPartStore(const std::string& content, const std::string& mediaType, const std::string& filename) { if (!_pStoreFactory) return new StringPartSource(content, mediaType, filename); else return _pStoreFactory->createPartStore(content, mediaType, filename);