aboutsummaryrefslogtreecommitdiffstats
path: root/vmime
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--vmime/charset.hpp4
-rw-r--r--vmime/platform.hpp4
-rw-r--r--vmime/platforms/posix/posixHandler.hpp2
-rw-r--r--vmime/platforms/windows/windowsHandler.hpp2
-rw-r--r--vmime/word.hpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/vmime/charset.hpp b/vmime/charset.hpp
index e2de7ebb..b88b5eff 100644
--- a/vmime/charset.hpp
+++ b/vmime/charset.hpp
@@ -77,12 +77,12 @@ public:
/** 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.
*
* @return system default charset
*/
- static const charset getLocaleCharset();
+ static const charset getLocalCharset();
/** Convert a string buffer from one charset to another
* charset (in-memory conversion)
diff --git a/vmime/platform.hpp b/vmime/platform.hpp
index fc1b4ea4..cb86dfd8 100644
--- a/vmime/platform.hpp
+++ b/vmime/platform.hpp
@@ -100,9 +100,9 @@ public:
/** 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
* something (for example, it is called when there is no data
diff --git a/vmime/platforms/posix/posixHandler.hpp b/vmime/platforms/posix/posixHandler.hpp
index 0d6b9d19..4bf3a220 100644
--- a/vmime/platforms/posix/posixHandler.hpp
+++ b/vmime/platforms/posix/posixHandler.hpp
@@ -59,7 +59,7 @@ public:
const vmime::datetime getCurrentLocalTime() const;
- const vmime::charset getLocaleCharset() const;
+ const vmime::charset getLocalCharset() const;
const vmime::string getHostName() const;
diff --git a/vmime/platforms/windows/windowsHandler.hpp b/vmime/platforms/windows/windowsHandler.hpp
index 2b61c1e7..5e95d65b 100644
--- a/vmime/platforms/windows/windowsHandler.hpp
+++ b/vmime/platforms/windows/windowsHandler.hpp
@@ -58,7 +58,7 @@ public:
const vmime::datetime getCurrentLocalTime() const;
- const vmime::charset getLocaleCharset() const;
+ const vmime::charset getLocalCharset() const;
const vmime::string getHostName() const;
diff --git a/vmime/word.hpp b/vmime/word.hpp
index 73312f6c..2622f322 100644
--- a/vmime/word.hpp
+++ b/vmime/word.hpp
@@ -46,7 +46,7 @@ public:
word();
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);
/** Return the raw data for this encoded word.