Fixed typo in function name.
This commit is contained in:
parent
43f78c2e96
commit
49f9628c0a
@ -109,9 +109,9 @@ void charset::convert(const string& in, string& out, const charset& source, cons
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const charset charset::getLocaleCharset()
|
const charset charset::getLocalCharset()
|
||||||
{
|
{
|
||||||
return (platform::getHandler()->getLocaleCharset());
|
return (platform::getHandler()->getLocalCharset());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -164,7 +164,7 @@ const vmime::datetime posixHandler::getCurrentLocalTime() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const vmime::charset posixHandler::getLocaleCharset() const
|
const vmime::charset posixHandler::getLocalCharset() const
|
||||||
{
|
{
|
||||||
const PLockHelper lock;
|
const PLockHelper lock;
|
||||||
|
|
||||||
|
@ -118,7 +118,7 @@ const vmime::datetime windowsHandler::getCurrentLocalTime() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const vmime::charset windowsHandler::getLocaleCharset() const
|
const vmime::charset windowsHandler::getLocalCharset() const
|
||||||
{
|
{
|
||||||
#if VMIME_HAVE_MLANG
|
#if VMIME_HAVE_MLANG
|
||||||
char szCharset[256];
|
char szCharset[256];
|
||||||
|
@ -51,7 +51,7 @@ text::text(const string& t, const charset& ch)
|
|||||||
|
|
||||||
text::text(const string& t)
|
text::text(const string& t)
|
||||||
{
|
{
|
||||||
createFromString(t, charset::getLocaleCharset());
|
createFromString(t, charset::getLocalCharset());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ namespace vmime
|
|||||||
|
|
||||||
|
|
||||||
word::word()
|
word::word()
|
||||||
: m_charset(charset::getLocaleCharset())
|
: m_charset(charset::getLocalCharset())
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -54,8 +54,8 @@ word::word(const word& w)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
word::word(const string& buffer) // Defaults to locale charset
|
word::word(const string& buffer) // Defaults to local charset
|
||||||
: m_buffer(buffer), m_charset(charset::getLocaleCharset())
|
: m_buffer(buffer), m_charset(charset::getLocalCharset())
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -696,7 +696,7 @@ word& word::operator=(const word& w)
|
|||||||
word& word::operator=(const string& s)
|
word& word::operator=(const string& s)
|
||||||
{
|
{
|
||||||
m_buffer = s;
|
m_buffer = s;
|
||||||
m_charset = charset::getLocaleCharset();
|
m_charset = charset::getLocalCharset();
|
||||||
return (*this);
|
return (*this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -92,7 +92,7 @@ VMIME_TEST_SUITE_BEGIN
|
|||||||
|
|
||||||
VASSERT_EQ("2.1", 1, t2.getWordCount());
|
VASSERT_EQ("2.1", 1, t2.getWordCount());
|
||||||
VASSERT_EQ("2.2", "Test\xa9\xc3", t2.getWordAt(0)->getBuffer());
|
VASSERT_EQ("2.2", "Test\xa9\xc3", t2.getWordAt(0)->getBuffer());
|
||||||
VASSERT_EQ("2.3", vmime::charset::getLocaleCharset(), t2.getWordAt(0)->getCharset());
|
VASSERT_EQ("2.3", vmime::charset::getLocalCharset(), t2.getWordAt(0)->getCharset());
|
||||||
|
|
||||||
vmime::text t3("Test\xa9\xc3", vmime::charset(vmime::charsets::ISO8859_13));
|
vmime::text t3("Test\xa9\xc3", vmime::charset(vmime::charsets::ISO8859_13));
|
||||||
|
|
||||||
@ -241,10 +241,10 @@ VMIME_TEST_SUITE_BEGIN
|
|||||||
|
|
||||||
void testWordConstructors()
|
void testWordConstructors()
|
||||||
{
|
{
|
||||||
VASSERT_EQ("1.1", vmime::charset::getLocaleCharset(), vmime::word().getCharset());
|
VASSERT_EQ("1.1", vmime::charset::getLocalCharset(), vmime::word().getCharset());
|
||||||
VASSERT_EQ("1.2", "", vmime::word().getBuffer());
|
VASSERT_EQ("1.2", "", vmime::word().getBuffer());
|
||||||
|
|
||||||
VASSERT_EQ("2.1", vmime::charset::getLocaleCharset(), vmime::word("foo").getCharset());
|
VASSERT_EQ("2.1", vmime::charset::getLocalCharset(), vmime::word("foo").getCharset());
|
||||||
VASSERT_EQ("2.2", "foo", vmime::word("foo").getBuffer());
|
VASSERT_EQ("2.2", "foo", vmime::word("foo").getBuffer());
|
||||||
|
|
||||||
VASSERT_EQ("3.1", "bar", vmime::word("foo", vmime::charset("bar")).getCharset().getName());
|
VASSERT_EQ("3.1", "bar", vmime::word("foo", vmime::charset("bar")).getCharset().getName());
|
||||||
|
@ -77,12 +77,12 @@ public:
|
|||||||
|
|
||||||
/** Returns the default charset used on the system.
|
/** Returns the default charset used on the system.
|
||||||
*
|
*
|
||||||
* This function simply calls <code>platformHandler::getLocaleCharset()</code>
|
* This function simply calls <code>platformHandler::getLocalCharset()</code>
|
||||||
* and is provided for convenience.
|
* and is provided for convenience.
|
||||||
*
|
*
|
||||||
* @return system default charset
|
* @return system default charset
|
||||||
*/
|
*/
|
||||||
static const charset getLocaleCharset();
|
static const charset getLocalCharset();
|
||||||
|
|
||||||
/** Convert a string buffer from one charset to another
|
/** Convert a string buffer from one charset to another
|
||||||
* charset (in-memory conversion)
|
* charset (in-memory conversion)
|
||||||
|
@ -100,9 +100,9 @@ public:
|
|||||||
|
|
||||||
/** Return the charset used on the system.
|
/** Return the charset used on the system.
|
||||||
*
|
*
|
||||||
* @return locale charset
|
* @return local charset
|
||||||
*/
|
*/
|
||||||
virtual const charset getLocaleCharset() const = 0;
|
virtual const charset getLocalCharset() const = 0;
|
||||||
|
|
||||||
/** This function is called when VMime library is waiting for
|
/** This function is called when VMime library is waiting for
|
||||||
* something (for example, it is called when there is no data
|
* something (for example, it is called when there is no data
|
||||||
|
@ -59,7 +59,7 @@ public:
|
|||||||
|
|
||||||
const vmime::datetime getCurrentLocalTime() const;
|
const vmime::datetime getCurrentLocalTime() const;
|
||||||
|
|
||||||
const vmime::charset getLocaleCharset() const;
|
const vmime::charset getLocalCharset() const;
|
||||||
|
|
||||||
const vmime::string getHostName() const;
|
const vmime::string getHostName() const;
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@ public:
|
|||||||
|
|
||||||
const vmime::datetime getCurrentLocalTime() const;
|
const vmime::datetime getCurrentLocalTime() const;
|
||||||
|
|
||||||
const vmime::charset getLocaleCharset() const;
|
const vmime::charset getLocalCharset() const;
|
||||||
|
|
||||||
const vmime::string getHostName() const;
|
const vmime::string getHostName() const;
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ public:
|
|||||||
|
|
||||||
word();
|
word();
|
||||||
word(const word& w);
|
word(const word& w);
|
||||||
word(const string& buffer); // Defaults to locale charset
|
word(const string& buffer); // Defaults to local charset
|
||||||
word(const string& buffer, const charset& charset);
|
word(const string& buffer, const charset& charset);
|
||||||
|
|
||||||
/** Return the raw data for this encoded word.
|
/** Return the raw data for this encoded word.
|
||||||
|
Loading…
Reference in New Issue
Block a user