X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FStringTools.cc;fp=src%2Fstringtools.cc;h=f4bd967a2c86cfcde22cabb24da4caeb03efa8b8;hp=91d2a6cb805f90454e5506459bb06d9d987b16e6;hb=c2321281bf12a7efaedde930422c7ddbc92080d4;hpb=87bc17e55b0c1dc73ecc66df856d3f08fd7a7724 diff --git a/src/stringtools.cc b/src/Moof/StringTools.cc similarity index 98% rename from src/stringtools.cc rename to src/Moof/StringTools.cc index 91d2a6c..f4bd967 100644 --- a/src/stringtools.cc +++ b/src/Moof/StringTools.cc @@ -30,10 +30,10 @@ #include "ConvertUTF.h" -#include "stringtools.hh" +#include "StringTools.hh" -namespace dc { +namespace Mf { std::wstring multiToWide(const std::string& multiStr) @@ -60,6 +60,7 @@ std::wstring multiToWide(const std::string& multiStr) *targetStart = 0; std::wstring convertedStr(wideStr); delete[] wideStr; + return convertedStr; } else if (sizeof(wchar_t) == 4) @@ -82,6 +83,7 @@ std::wstring multiToWide(const std::string& multiStr) *targetStart = 0; std::wstring convertedStr(wideStr); delete[] wideStr; + return convertedStr; } else @@ -116,6 +118,7 @@ std::string wideToMulti(const std::wstring& wideStr) *targetStart = 0; std::string convertedStr(multiStr); delete[] multiStr; + return convertedStr; } else if (sizeof(wchar_t) == 4) @@ -139,6 +142,7 @@ std::string wideToMulti(const std::wstring& wideStr) *targetStart = 0; std::string convertedStr(multiStr); delete[] multiStr; + return convertedStr; } else @@ -149,7 +153,7 @@ std::string wideToMulti(const std::wstring& wideStr) } -} // namespace dc +} // namespace Mf /** vim: set ts=4 sw=4 tw=80: *************************************************/