GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed constructor ambiguity in 'fileAttachment'.

Browse Source
This commit is contained in:
Vincent Richard 2008-01-28 12:29:28 +00:00
parent 0c30c298da
commit 50c3621cd3
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -2,6 +2,13 @@
VERSION 0.8.2cvs VERSION 0.8.2cvs
================ ================
2008-01-28 Vincent Richard <vincent@vincent-richard.net>
* fileAttachment: fixed constructor ambiguity due to implicit conversions.
Removed default values and reordered parameters (API breaking change).
Many thanks to Philipp Frenkel. More information here:
http://sourceforge.net/forum/message.php?msg_id=4739926
2007-11-20 Vincent Richard <vincent@vincent-richard.net> 2007-11-20 Vincent Richard <vincent@vincent-richard.net>
* text, word: fixed incorrect white-space between words. * text, word: fixed incorrect white-space between words.

12
src/fileAttachment.cpp
View File

@ -36,6 +36,16 @@ namespace vmime
{ {
fileAttachment::fileAttachment(const string& filename, const mediaType& type)
{
m_type = type;
setData(filename);
m_encoding = encoding::decide(m_data);
}
fileAttachment::fileAttachment(const string& filename, const mediaType& type, const text& desc) fileAttachment::fileAttachment(const string& filename, const mediaType& type, const text& desc)
{ {
m_type = type; m_type = type;
@ -48,7 +58,7 @@ fileAttachment::fileAttachment(const string& filename, const mediaType& type, co
fileAttachment::fileAttachment(const string& filename, const mediaType& type, fileAttachment::fileAttachment(const string& filename, const mediaType& type,
const encoding& enc, const text& desc) const text& desc, const encoding& enc)
{ {
m_type = type; m_type = type;
m_desc = desc; m_desc = desc;

5
vmime/fileAttachment.hpp
View File

@ -41,8 +41,9 @@ class fileAttachment : public defaultAttachment
{ {
public: public:
fileAttachment(const string& filename, const mediaType& type, const text& desc = NULL_TEXT); fileAttachment(const string& filename, const mediaType& type);
fileAttachment(const string& filename, const mediaType& type, const encoding& enc, const text& desc = NULL_TEXT); fileAttachment(const string& filename, const mediaType& type, const text& desc);
fileAttachment(const string& filename, const mediaType& type, const text& desc, const encoding& enc);
/** Stores information about a file attachment. /** Stores information about a file attachment.
*/ */