From 867c7e6e146d235553254b796deec5e902c35433 Mon Sep 17 00:00:00 2001 From: codereader Date: Sat, 1 Aug 2020 10:25:26 +0200 Subject: [PATCH] #5231: Use string/encoding instead of wxutil/IConv in RegistryTree. --- radiantcore/xmlregistry/RegistryTree.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/radiantcore/xmlregistry/RegistryTree.cpp b/radiantcore/xmlregistry/RegistryTree.cpp index 2f0b19430b..2d1e707e65 100644 --- a/radiantcore/xmlregistry/RegistryTree.cpp +++ b/radiantcore/xmlregistry/RegistryTree.cpp @@ -2,8 +2,7 @@ #include "itextstream.h" #include "string/split.h" - -#include "wxutil/IConv.h" +#include "string/encoding.h" namespace registry { @@ -165,7 +164,7 @@ std::string RegistryTree::get(const std::string& key) if (!nodeList.empty()) { // Get and convert the value - return wxutil::IConv::localeFromUTF8(nodeList[0].getAttributeValue("value")); + return string::utf8_to_mb(nodeList[0].getAttributeValue("value")); } return std::string();