From 8322981b472029268f6fa5a4816b4222796aa974 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Sat, 26 Sep 2009 21:12:15 +0000 Subject: [PATCH] Use wxString in lieu of std::string to stop confusion on OSX, also makes more sense.. Originally committed to SVN as r3573. --- aegisub/reporter/report.cpp | 2 +- aegisub/reporter/report.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aegisub/reporter/report.cpp b/aegisub/reporter/report.cpp index 3666ccc31..a38c6808e 100644 --- a/aegisub/reporter/report.cpp +++ b/aegisub/reporter/report.cpp @@ -153,7 +153,7 @@ void Report::ProcessNode(wxXmlNode *node, wxString *text, wxListView *listView) while (child) { wxString name = child->GetName(); - if ((names = nMap.find(std::string(name.utf8_str()))) != nMap.end()) { + if ((names = nMap.find(name)) != nMap.end()) { node_name = locale->GetString(names->second); } else { wxLogDebug("Report::ProcessNode Unknown node found: \"%s\" (add it to nMap)\n", name); diff --git a/aegisub/reporter/report.h b/aegisub/reporter/report.h index 4f4c66b29..3a98352ef 100644 --- a/aegisub/reporter/report.h +++ b/aegisub/reporter/report.h @@ -43,10 +43,10 @@ private: }; /// Map of internal XML elements to human readable names. - typedef std::map nameMap; + typedef std::map nameMap; /// element->human name pairs. - typedef std::pair nPair; + typedef std::pair nPair; /// Struct to hold generatex XML Report. struct XMLReport {