Fix some UTF8 strings (#570)

Closes #562, closes #564
picotorrent · Apr 13, 2018 · ff2650f · ff2650f
1 parent 68e2ebd
commit ff2650f
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 24 deletions.
diff --git a/src/picotorrent/applicationupdater.cpp b/src/picotorrent/applicationupdater.cpp
@@ -26,10 +26,10 @@ ApplicationUpdater::~ApplicationUpdater()
 
 void ApplicationUpdater::Check(bool force)
 {
-    std::string updateUrl = m_config->UpdateUrl();
+    wxString updateUrl = m_config->UpdateUrl();
 
     m_httpClient->GetAsync(
-        Utils::ToWideString(updateUrl.c_str(), static_cast<int>(updateUrl.size())),
+        updateUrl.ToStdWstring(),
         std::bind(&ApplicationUpdater::OnHttpResponse, this, std::placeholders::_1, force));
 }
 

diff --git a/src/picotorrent/errorhandler.cpp b/src/picotorrent/errorhandler.cpp
@@ -63,13 +63,13 @@ bool ErrorHandler::Report(const wchar_t* path, const wchar_t* id, void* context,
     std::map<std::wstring, std::wstring> params;
     std::map<std::wstring, std::wstring> files;
 
-    std::string branch = BuildInfo::Branch();
-    std::string commitish = BuildInfo::Commitish();
-    std::string version = BuildInfo::Version();
+    wxString branch = BuildInfo::Branch();
+    wxString commitish = BuildInfo::Commitish();
+    wxString version = BuildInfo::Version();
 
-    params.insert({ L"branch", Utils::ToWideString(branch.c_str(), branch.size()) });
-    params.insert({ L"commitish", Utils::ToWideString(commitish.c_str(), commitish.size()) });
-    params.insert({ L"version", Utils::ToWideString(version.c_str(), version.size()) });
+    params.insert({ L"branch", branch.ToStdWstring() });
+    params.insert({ L"commitish", commitish.ToStdWstring() });
+    params.insert({ L"version", version.ToStdWstring() });
 
     fs::path dmpFile = fs::path(path) / fs::path(id).replace_extension(".dmp");
     files.insert({ L"minidump", dmpFile.wstring() });

diff --git a/src/picotorrent/filestorageviewmodel.cpp b/src/picotorrent/filestorageviewmodel.cpp
@@ -249,7 +249,10 @@ void FileStorageViewModel::GetValue(wxVariant &variant, const wxDataViewItem &it
             icon = GetIconForFile(node->name);
         }
 
-        variant << wxDataViewIconText(node->name, icon);
+        variant << wxDataViewIconText(
+            wxString::FromUTF8(node->name),
+            icon);
+
         break;
     }
     case Columns::Size:

diff --git a/src/picotorrent/torrentlistviewmodel.cpp b/src/picotorrent/torrentlistviewmodel.cpp
@@ -217,7 +217,7 @@ void TorrentListViewModel::GetValueByRow(wxVariant &variant, unsigned int row, u
         }
         else
         {
-            variant = ts.name;
+            variant = wxString::FromUTF8(ts.name);
         }
         break;
     case Columns::QueuePosition:

diff --git a/src/picotorrent/translator.cpp b/src/picotorrent/translator.cpp
@@ -7,7 +7,6 @@
 #include "config.hpp"
 #include "environment.hpp"
 #include "picojson.hpp"
-#include "utils.hpp"
 
 namespace fs = std::experimental::filesystem::v1;
 namespace pj = picojson;
@@ -124,14 +123,12 @@ bool Translator::LoadLanguageFromJson(std::string const& json, Translator::Langu
 
     Language l;
     l.code = langId;
-    l.name = Utils::ToWideString(langName.c_str(), static_cast<int>(langName.size()));
+    l.name = wxString::FromUTF8(langName);
 
     for (auto& p : obj.at("strings").get<pj::object>())
     {
         std::string val = p.second.get<std::string>();
-        wxString converted = Utils::ToWideString(val.c_str(), static_cast<int>(val.size()));
-
-        l.translations.insert({ p.first, converted });
+        l.translations.insert({ p.first, wxString::FromUTF8(val) });
     }
 
     lang = l;

diff --git a/src/picotorrent/utils.cpp b/src/picotorrent/utils.cpp
@@ -110,11 +110,3 @@ wxString Utils::ToReadableStatus(lt::torrent_status const& ts, std::shared_ptr<p
 
     return i18n(tr, "unknown");
 }
-
-std::wstring Utils::ToWideString(const char* buffer, int bufferSize)
-{
-    int size = MultiByteToWideChar(CP_UTF8, 0, buffer, bufferSize, NULL, 0);
-    std::wstring result(size, '\0');
-    MultiByteToWideChar(CP_UTF8, 0, buffer, bufferSize, &result[0], size);
-    return result;
-}
diff --git a/src/picotorrent/utils.hpp b/src/picotorrent/utils.hpp
@@ -24,6 +24,5 @@ namespace pt
         static void OpenAndSelect(std::experimental::filesystem::v1::path path);
         static wxString ToHumanFileSize(int64_t bytes);
         static wxString ToReadableStatus(libtorrent::torrent_status const& ts, std::shared_ptr<Translator> translator);
-        static std::wstring ToWideString(const char* buffer, int bufferSize);
     };
 }