aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/charset.cpp4
-rw-r--r--src/platforms/posix/posixHandler.cpp2
-rw-r--r--src/platforms/windows/windowsHandler.cpp2
-rw-r--r--src/text.cpp2
-rw-r--r--src/word.cpp8
5 files changed, 9 insertions, 9 deletions
diff --git a/src/charset.cpp b/src/charset.cpp
index 092676b2..f68c7c4f 100644
--- a/src/charset.cpp
+++ b/src/charset.cpp
@@ -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());
}
diff --git a/src/platforms/posix/posixHandler.cpp b/src/platforms/posix/posixHandler.cpp
index 371da4d6..f06c865f 100644
--- a/src/platforms/posix/posixHandler.cpp
+++ b/src/platforms/posix/posixHandler.cpp
@@ -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;
diff --git a/src/platforms/windows/windowsHandler.cpp b/src/platforms/windows/windowsHandler.cpp
index 8bbfe37b..b4f605ec 100644
--- a/src/platforms/windows/windowsHandler.cpp
+++ b/src/platforms/windows/windowsHandler.cpp
@@ -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
char szCharset[256];
diff --git a/src/text.cpp b/src/text.cpp
index d1ae6075..05353b08 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -51,7 +51,7 @@ text::text(const string& t, const charset& ch)
text::text(const string& t)
{
- createFromString(t, charset::getLocaleCharset());
+ createFromString(t, charset::getLocalCharset());
}
diff --git a/src/word.cpp b/src/word.cpp
index 008745ef..b558b842 100644
--- a/src/word.cpp
+++ b/src/word.cpp
@@ -43,7 +43,7 @@ namespace vmime
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
- : m_buffer(buffer), m_charset(charset::getLocaleCharset())
+word::word(const string& buffer) // Defaults to local charset
+ : m_buffer(buffer), m_charset(charset::getLocalCharset())
{
}
@@ -696,7 +696,7 @@ word& word::operator=(const word& w)
word& word::operator=(const string& s)
{
m_buffer = s;
- m_charset = charset::getLocaleCharset();
+ m_charset = charset::getLocalCharset();
return (*this);
}