charset: pass const references

master
Andrzej Rybczak 12 years ago
parent 5d436ddc76
commit 3cc76ff0c4
  1. 8
      src/charset.cpp
  2. 8
      src/charset.h

@ -44,24 +44,24 @@ std::locale internalLocale()
return loc; return loc;
} }
std::string toUtf8From(std::string s, const char *charset) std::string toUtf8From(const std::string &s, const char *charset)
{ {
return boost::locale::conv::to_utf<char>(s, charset); return boost::locale::conv::to_utf<char>(s, charset);
} }
std::string fromUtf8To(std::string s, const char *charset) std::string fromUtf8To(const std::string &s, const char *charset)
{ {
return boost::locale::conv::to_utf<char>(s, charset); return boost::locale::conv::to_utf<char>(s, charset);
} }
std::string utf8ToLocale(std::string s) std::string utf8ToLocale(const std::string &s)
{ {
return Config.system_encoding.empty() return Config.system_encoding.empty()
? s ? s
: boost::locale::conv::from_utf<char>(s, Config.system_encoding); : boost::locale::conv::from_utf<char>(s, Config.system_encoding);
} }
std::string localeToUtf8(std::string s) std::string localeToUtf8(const std::string &s)
{ {
return Config.system_encoding.empty() return Config.system_encoding.empty()
? s ? s

@ -28,11 +28,11 @@ namespace Charset {
std::locale internalLocale(); std::locale internalLocale();
std::string toUtf8From(std::string s, const char *charset); std::string toUtf8From(const std::string &s, const char *charset);
std::string fromUtf8To(std::string s, const char *charset); std::string fromUtf8To(const std::string &s, const char *charset);
std::string utf8ToLocale(std::string s); std::string utf8ToLocale(const std::string &s);
std::string localeToUtf8(std::string s); std::string localeToUtf8(const std::string &s);
} }

Loading…
Cancel
Save