Allow creating 'charset' objects from 'const char*' (for constants).
This commit is contained in:
parent
6c324d55ec
commit
0562415aeb
@ -67,6 +67,12 @@ charset::charset(const string& name)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
charset::charset(const char* name)
|
||||||
|
: m_name(name)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void charset::parse(const string& buffer, const string::size_type position,
|
void charset::parse(const string& buffer, const string::size_type position,
|
||||||
const string::size_type end, string::size_type* newPosition)
|
const string::size_type end, string::size_type* newPosition)
|
||||||
{
|
{
|
||||||
@ -89,16 +95,6 @@ void charset::generate(utility::outputStream& os, const string::size_type /* max
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
struct X
|
|
||||||
{
|
|
||||||
X(const char**);
|
|
||||||
|
|
||||||
operator const char**() { return x; }
|
|
||||||
operator char**() { return const_cast <char**>(x); }
|
|
||||||
|
|
||||||
const char** x;
|
|
||||||
};
|
|
||||||
|
|
||||||
void charset::convert(utility::inputStream& in, utility::outputStream& out,
|
void charset::convert(utility::inputStream& in, utility::outputStream& out,
|
||||||
const charset& source, const charset& dest)
|
const charset& source, const charset& dest)
|
||||||
{
|
{
|
||||||
@ -261,13 +257,6 @@ charset& charset::operator=(const charset& other)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
charset& charset::operator=(const string& name)
|
|
||||||
{
|
|
||||||
parse(name);
|
|
||||||
return (*this);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const bool charset::operator==(const charset& value) const
|
const bool charset::operator==(const charset& value) const
|
||||||
{
|
{
|
||||||
return (utility::stringUtils::isStringEqualNoCase(m_name, value.m_name));
|
return (utility::stringUtils::isStringEqualNoCase(m_name, value.m_name));
|
||||||
|
@ -38,6 +38,7 @@ public:
|
|||||||
|
|
||||||
charset();
|
charset();
|
||||||
charset(const string& name);
|
charset(const string& name);
|
||||||
|
charset(const char* name); // to allow creation from vmime::charsets constants
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
@ -48,7 +49,6 @@ public:
|
|||||||
const string& getName() const;
|
const string& getName() const;
|
||||||
|
|
||||||
charset& operator=(const charset& other);
|
charset& operator=(const charset& other);
|
||||||
charset& operator=(const string& name);
|
|
||||||
|
|
||||||
const bool operator==(const charset& value) const;
|
const bool operator==(const charset& value) const;
|
||||||
const bool operator!=(const charset& value) const;
|
const bool operator!=(const charset& value) const;
|
||||||
|
Loading…
Reference in New Issue
Block a user