ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src: switched to using only wstring for status message

Browse Source
This commit is contained in:
mlangkabel
2018-02-12 10:39:28 +01:00
parent 72c2596251
commit e3322adf2e
20 changed files with 69 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_java/utility/utilityGradle.cpp
+6 -4
View File
@@ -83,8 +83,9 @@ namespace utility
if (utility::isPrefix("[ERROR]", utility::trim(output)))
{
// TODO: move error handling to caller of this function
const std::string dialogMessage =
"The following error occurred while executing a Gradle command:\n\n" + utility::replace(output, "\r\n", "\n");
const std::wstring dialogMessage =
L"The following error occurred while executing a Gradle command:\n\n" +
utility::decodeFromUtf8(utility::replace(output, "\r\n", "\n"));
MessageStatus(dialogMessage, true, false).dispatch();
Application::getInstance()->handleDialog(dialogMessage);
@@ -111,8 +112,9 @@ namespace utility
if (utility::isPrefix("[ERROR]", utility::trim(output)))
{
// TODO: move error handling to caller of this function
const std::string dialogMessage =
"The following error occurred while executing a Gradle command:\n\n" + utility::replace(output, "\r\n", "\n");
const std::wstring dialogMessage =
L"The following error occurred while executing a Gradle command:\n\n" +
utility::decodeFromUtf8(utility::replace(output, "\r\n", "\n"));
MessageStatus(dialogMessage, true, false).dispatch();
Application::getInstance()->handleDialog(dialogMessage);
src/lib_java/utility/utilityMaven.cpp
+6 -4
View File
@@ -90,8 +90,9 @@ namespace utility
if (utility::isPrefix("[ERROR]", utility::trim(line)))
{
// TODO: move error handling to caller of this function
const std::string dialogMessage =
"The following error occurred while executing a Maven command:\n\n" + utility::replace(line, "\r\n", "\n");
const std::wstring dialogMessage =
L"The following error occurred while executing a Maven command:\n\n" +
utility::decodeFromUtf8(utility::replace(line, "\r\n", "\n"));
MessageStatus(dialogMessage, true, false).dispatch();
Application::getInstance()->handleDialog(dialogMessage);
return false;
@@ -114,8 +115,9 @@ namespace utility
if (outputAccess->getLineCount() > 0 && utility::isPrefix("Error", utility::trim(outputAccess->getLine(1))))
{
// TODO: move error handling to caller of this function
const std::string dialogMessage =
"The following error occurred while executing a Maven command:\n\n" + utility::replace(outputAccess->getText(), "\r\n", "\n");
const std::wstring dialogMessage =
L"The following error occurred while executing a Maven command:\n\n" +
utility::decodeFromUtf8(utility::replace(outputAccess->getText(), "\r\n", "\n"));
MessageStatus(dialogMessage, true, false).dispatch();