From e3322adf2ef3039aea4cff40f5a27b9df5b4dc62 Mon Sep 17 00:00:00 2001 From: mlangkabel Date: Mon, 12 Feb 2018 10:39:28 +0100 Subject: [PATCH] src: switched to using only wstring for status message --- src/lib/component/view/DialogView.cpp | 4 ++-- src/lib/component/view/DialogView.h | 4 ++-- src/lib/data/TaskCleanStorage.cpp | 4 ++-- src/lib/data/TaskFinishParsing.cpp | 4 ++-- .../data/TaskShowUnknownProgressDialog.cpp | 4 ++-- src/lib/data/TaskShowUnknownProgressDialog.h | 8 +++---- src/lib/project/Project.cpp | 6 ++--- src/lib_gui/qt/view/QtDialogView.cpp | 22 +++++++++---------- src/lib_gui/qt/view/QtDialogView.h | 6 ++--- src/lib_gui/qt/window/QtIndexingDialog.cpp | 8 +++---- src/lib_gui/qt/window/QtIndexingDialog.h | 4 ++-- src/lib_gui/qt/window/QtWindow.cpp | 8 +++---- src/lib_gui/qt/window/QtWindow.h | 4 ++-- .../QtProjectWizzardContentPath.cpp | 6 ++--- .../QtProjectWizzardContentPaths.cpp | 10 ++++----- src/lib_java/project/SourceGroupJava.cpp | 2 +- .../project/SourceGroupJavaGradle.cpp | 4 ++-- src/lib_java/project/SourceGroupJavaMaven.cpp | 6 ++--- src/lib_java/utility/utilityGradle.cpp | 10 +++++---- src/lib_java/utility/utilityMaven.cpp | 10 +++++---- 20 files changed, 69 insertions(+), 65 deletions(-) diff --git a/src/lib/component/view/DialogView.cpp b/src/lib/component/view/DialogView.cpp index e38fe5a2..43069815 100644 --- a/src/lib/component/view/DialogView.cpp +++ b/src/lib/component/view/DialogView.cpp @@ -9,7 +9,7 @@ DialogView::~DialogView() { } -void DialogView::showUnknownProgressDialog(const std::string& title, const std::string& message) +void DialogView::showUnknownProgressDialog(const std::wstring& title, const std::wstring& message) { } @@ -17,7 +17,7 @@ void DialogView::hideUnknownProgressDialog() { } -void DialogView::showProgressDialog(const std::string& title, const std::string& message, size_t progress) +void DialogView::showProgressDialog(const std::wstring& title, const std::wstring& message, size_t progress) { } diff --git a/src/lib/component/view/DialogView.h b/src/lib/component/view/DialogView.h index 55755900..9d1a0c84 100644 --- a/src/lib/component/view/DialogView.h +++ b/src/lib/component/view/DialogView.h @@ -16,10 +16,10 @@ public: DialogView(StorageAccess* storageAccess); virtual ~DialogView(); - virtual void showUnknownProgressDialog(const std::string& title, const std::string& message); + virtual void showUnknownProgressDialog(const std::wstring& title, const std::wstring& message); virtual void hideUnknownProgressDialog(); - virtual void showProgressDialog(const std::string& title, const std::string& message, size_t progress); + virtual void showProgressDialog(const std::wstring& title, const std::wstring& message, size_t progress); virtual void hideProgressDialog(); virtual void startIndexingDialog( diff --git a/src/lib/data/TaskCleanStorage.cpp b/src/lib/data/TaskCleanStorage.cpp index 4bcd8281..290ad342 100644 --- a/src/lib/data/TaskCleanStorage.cpp +++ b/src/lib/data/TaskCleanStorage.cpp @@ -18,7 +18,7 @@ TaskCleanStorage::TaskCleanStorage( void TaskCleanStorage::doEnter(std::shared_ptr blackboard) { Application::getInstance()->getDialogView()->showUnknownProgressDialog( - "Clearing Files", std::to_string(m_filePaths.size()) + " Files"); + L"Clearing Files", std::to_wstring(m_filePaths.size()) + L" Files"); m_start = utility::durationStart(); @@ -33,7 +33,7 @@ Task::TaskState TaskCleanStorage::doUpdate(std::shared_ptr blackboar m_storage->clearFileElements(m_filePaths, [=](int progress) { Application::getInstance()->getDialogView()->showProgressDialog( - "Clearing", std::to_string(m_filePaths.size()) + " Files", progress); + L"Clearing", std::to_wstring(m_filePaths.size()) + L" Files", progress); } ); diff --git a/src/lib/data/TaskFinishParsing.cpp b/src/lib/data/TaskFinishParsing.cpp index 4e93db76..9dd9967e 100644 --- a/src/lib/data/TaskFinishParsing.cpp +++ b/src/lib/data/TaskFinishParsing.cpp @@ -34,10 +34,10 @@ Task::TaskState TaskFinishParsing::doUpdate(std::shared_ptr blackboa std::shared_ptr dialogView = Application::getInstance()->getDialogView(); - dialogView->showUnknownProgressDialog("Finish Indexing", "Optimizing database"); + dialogView->showUnknownProgressDialog(L"Finish Indexing", L"Optimizing database"); m_storage->optimizeMemory(); - dialogView->showUnknownProgressDialog("Finish Indexing", "Building caches"); + dialogView->showUnknownProgressDialog(L"Finish Indexing", L"Building caches"); m_storage->buildCaches(); dialogView->hideUnknownProgressDialog(); diff --git a/src/lib/data/TaskShowUnknownProgressDialog.cpp b/src/lib/data/TaskShowUnknownProgressDialog.cpp index 231f7a52..3df27a31 100644 --- a/src/lib/data/TaskShowUnknownProgressDialog.cpp +++ b/src/lib/data/TaskShowUnknownProgressDialog.cpp @@ -4,8 +4,8 @@ #include "Application.h" TaskShowUnknownProgressDialog::TaskShowUnknownProgressDialog( - const std::string& title, - const std::string& message + const std::wstring& title, + const std::wstring& message ) : m_title(title) , m_message(message) diff --git a/src/lib/data/TaskShowUnknownProgressDialog.h b/src/lib/data/TaskShowUnknownProgressDialog.h index 5bd0700a..52bfc79f 100644 --- a/src/lib/data/TaskShowUnknownProgressDialog.h +++ b/src/lib/data/TaskShowUnknownProgressDialog.h @@ -10,8 +10,8 @@ class TaskShowUnknownProgressDialog { public: TaskShowUnknownProgressDialog( - const std::string& title, - const std::string& message + const std::wstring& title, + const std::wstring& message ); virtual ~TaskShowUnknownProgressDialog(); @@ -22,8 +22,8 @@ private: virtual void doExit(std::shared_ptr blackboard); virtual void doReset(std::shared_ptr blackboard); - const std::string m_title; - const std::string m_message; + const std::wstring m_title; + const std::wstring m_message; }; #endif // TASK_SHOW_UNKNOWN_PROGRESS_DIALOG_H diff --git a/src/lib/project/Project.cpp b/src/lib/project/Project.cpp index a63eee73..e4560274 100644 --- a/src/lib/project/Project.cpp +++ b/src/lib/project/Project.cpp @@ -245,7 +245,7 @@ void Project::refresh(RefreshMode refreshMode, DialogView* dialogView) } } - dialogView->showUnknownProgressDialog("Preparing Project", "Processing Files"); + dialogView->showUnknownProgressDialog(L"Preparing Project", L"Processing Files"); ScopedFunctor dialogHider([&dialogView](){ dialogView->hideUnknownProgressDialog(); }); @@ -333,7 +333,7 @@ void Project::buildIndex(const RefreshInfo& info, DialogView* dialogView) MessageStatus(L"Preparing Indexing", false, true).dispatch(); MessageClearErrorCount().dispatch(); - dialogView->showUnknownProgressDialog("Preparing Indexing", "Setting up Indexers"); + dialogView->showUnknownProgressDialog(L"Preparing Indexing", L"Setting up Indexers"); std::shared_ptr taskSequential = std::make_shared(); @@ -440,7 +440,7 @@ void Project::buildIndex(const RefreshInfo& info, DialogView* dialogView) ); // add task that notifies the user of what's going on taskSequential->addTask( // we don't need to hide this dialog again, because it's overridden by other dialogs later on. - std::make_shared("Finish Indexing", "Saving\nRemaining Data") + std::make_shared(L"Finish Indexing", L"Saving\nRemaining Data") ); // add task that injects the remaining intermediate storages into the persistent storage diff --git a/src/lib_gui/qt/view/QtDialogView.cpp b/src/lib_gui/qt/view/QtDialogView.cpp index f5feeb5b..76a65e64 100644 --- a/src/lib_gui/qt/view/QtDialogView.cpp +++ b/src/lib_gui/qt/view/QtDialogView.cpp @@ -30,9 +30,9 @@ QtDialogView::~QtDialogView() m_resultReady = true; } -void QtDialogView::showUnknownProgressDialog(const std::string& title, const std::string& message) +void QtDialogView::showUnknownProgressDialog(const std::wstring& title, const std::wstring& message) { - MessageStatus(title + ": " + message, false, true).dispatch(); + MessageStatus(title + L": " + message, false, true).dispatch(); m_onQtThread2( [=]() @@ -56,7 +56,7 @@ void QtDialogView::hideUnknownProgressDialog() setParentWindow(nullptr); } -void QtDialogView::showProgressDialog(const std::string& title, const std::string& message, size_t progress) +void QtDialogView::showProgressDialog(const std::wstring& title, const std::wstring& message, size_t progress) { m_onQtThread( [=]() @@ -81,11 +81,11 @@ void QtDialogView::showProgressDialog(const std::string& title, const std::strin if (sendStatusMessage) { - MessageStatus(title + ": " + message + " [" + std::to_string(progress) + "%]", false, true).dispatch(); + MessageStatus(title + L": " + message + L" [" + std::to_wstring(progress) + L"%]", false, true).dispatch(); } - window->updateTitle(title.c_str()); - window->updateMessage(message.c_str()); + window->updateTitle(QString::fromStdWString(title)); + window->updateMessage(QString::fromStdWString(message)); window->updateProgress(progress); setUIBlocked(true); @@ -143,7 +143,7 @@ void QtDialogView::startIndexingDialog( connect(timer.get(), &QTimer::timeout, [=]() { - showUnknownProgress("Preparing Indexing", "Processing Files", true); + showUnknownProgress(L"Preparing Indexing", L"Processing Files", true); } ); timer->start(200); @@ -348,7 +348,7 @@ void QtDialogView::setParentWindow(QtWindow* window) ); } -void QtDialogView::showUnknownProgress(const std::string& title, const std::string& message, bool stacked) +void QtDialogView::showUnknownProgress(const std::wstring& title, const std::wstring& message, bool stacked) { QtIndexingDialog* window = nullptr; @@ -369,8 +369,8 @@ void QtDialogView::showUnknownProgress(const std::string& title, const std::stri window->setupUnknownProgress(); } - window->updateTitle(title.c_str()); - window->updateMessage(message.c_str()); + window->updateTitle(QString::fromStdWString(title)); + window->updateMessage(QString::fromStdWString(message)); setUIBlocked(true); } @@ -418,7 +418,7 @@ void QtDialogView::handleMessage(MessageInterruptTasks* message) QtIndexingDialog* window = dynamic_cast(m_windowStack.getTopWindow()); if (window && window->getType() == QtIndexingDialog::DIALOG_INDEXING) { - showUnknownProgressDialog("Interrupting Indexing", "Waiting for indexer\nthreads to finish"); + showUnknownProgressDialog(L"Interrupting Indexing", L"Waiting for indexer\nthreads to finish"); } } ); diff --git a/src/lib_gui/qt/view/QtDialogView.h b/src/lib_gui/qt/view/QtDialogView.h index 23e0ccb6..81dc8878 100644 --- a/src/lib_gui/qt/view/QtDialogView.h +++ b/src/lib_gui/qt/view/QtDialogView.h @@ -29,10 +29,10 @@ public: QtDialogView(QtMainWindow* mainWindow, StorageAccess* storageAccess); virtual ~QtDialogView(); - virtual void showUnknownProgressDialog(const std::string& title, const std::string& message) override; + virtual void showUnknownProgressDialog(const std::wstring& title, const std::wstring& message) override; virtual void hideUnknownProgressDialog() override; - virtual void showProgressDialog(const std::string& title, const std::string& message, size_t progress) override; + virtual void showProgressDialog(const std::wstring& title, const std::wstring& message, size_t progress) override; virtual void hideProgressDialog() override; virtual void startIndexingDialog( @@ -51,7 +51,7 @@ public: void setParentWindow(QtWindow* window); private slots: - void showUnknownProgress(const std::string& title, const std::string& message, bool stacked); + void showUnknownProgress(const std::wstring& title, const std::wstring& message, bool stacked); void hideUnknownProgress(); void setUIBlocked(bool blocked); diff --git a/src/lib_gui/qt/window/QtIndexingDialog.cpp b/src/lib_gui/qt/window/QtIndexingDialog.cpp index a46e8fb2..6bf5a3f4 100644 --- a/src/lib_gui/qt/window/QtIndexingDialog.cpp +++ b/src/lib_gui/qt/window/QtIndexingDialog.cpp @@ -265,7 +265,7 @@ void QtIndexingDialog::setupProgress() finishSetup(); } -void QtIndexingDialog::updateMessage(QString message) +void QtIndexingDialog::updateMessage(const QString& message) { if (m_messageLabel) { @@ -273,13 +273,13 @@ void QtIndexingDialog::updateMessage(QString message) } } -std::string QtIndexingDialog::getMessage() const +std::wstring QtIndexingDialog::getMessage() const { if (m_messageLabel) { - return m_messageLabel->text().toStdString(); + return m_messageLabel->text().toStdWString(); } - return ""; + return L""; } void QtIndexingDialog::updateProgress(size_t progress) diff --git a/src/lib_gui/qt/window/QtIndexingDialog.h b/src/lib_gui/qt/window/QtIndexingDialog.h index db305d9a..c038c0a9 100644 --- a/src/lib_gui/qt/window/QtIndexingDialog.h +++ b/src/lib_gui/qt/window/QtIndexingDialog.h @@ -47,8 +47,8 @@ public: void setupUnknownProgress(); void setupProgress(); - void updateMessage(QString message); - std::string getMessage() const; + void updateMessage(const QString& message); + std::wstring getMessage() const; void updateProgress(size_t progress); size_t getProgress() const; void updateIndexingProgress(size_t fileCount, size_t totalFileCount, const FilePath& sourcePath); diff --git a/src/lib_gui/qt/window/QtWindow.cpp b/src/lib_gui/qt/window/QtWindow.cpp index 5ab25b5d..f13d2db2 100644 --- a/src/lib_gui/qt/window/QtWindow.cpp +++ b/src/lib_gui/qt/window/QtWindow.cpp @@ -205,7 +205,7 @@ void QtWindow::moveToCenter() } } -void QtWindow::updateTitle(QString title) +void QtWindow::updateTitle(const QString& title) { if (m_title) { @@ -213,13 +213,13 @@ void QtWindow::updateTitle(QString title) } } -std::string QtWindow::getTitle() const +std::wstring QtWindow::getTitle() const { if (m_title) { - return m_title->text().toStdString(); + return m_title->text().toStdWString(); } - return ""; + return L""; } void QtWindow::updateSubTitle(QString subTitle) diff --git a/src/lib_gui/qt/window/QtWindow.h b/src/lib_gui/qt/window/QtWindow.h index 11ce5b1d..b0c8cdc1 100644 --- a/src/lib_gui/qt/window/QtWindow.h +++ b/src/lib_gui/qt/window/QtWindow.h @@ -34,8 +34,8 @@ public: void moveToCenter(); - void updateTitle(QString title); - std::string getTitle() const; + void updateTitle(const QString& title); + std::wstring getTitle() const; void updateSubTitle(QString subTitle); void updateNextButton(QString text); diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.cpp index 805303b9..726b7c76 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPath.cpp @@ -236,7 +236,7 @@ std::vector QtProjectWizzardContentPathSourceMaven::getFilePaths() con }); std::dynamic_pointer_cast(dialogView)->setParentWindow(m_window); - dialogView->showUnknownProgressDialog("Preparing Project", "Maven\nGenerating Source Files"); + dialogView->showUnknownProgressDialog(L"Preparing Project", L"Maven\nGenerating Source Files"); const bool success = utility::mavenGenerateSources(mavenPath, mavenProjectRoot); if (!success) { @@ -250,7 +250,7 @@ std::vector QtProjectWizzardContentPathSourceMaven::getFilePaths() con } else { - dialogView->showUnknownProgressDialog("Preparing Project", "Maven\nFetching Source Directories"); + dialogView->showUnknownProgressDialog(L"Preparing Project", L"Maven\nFetching Source Directories"); const std::vector sourceDirectories = utility::mavenGetAllDirectoriesFromEffectivePom( mavenPath, mavenProjectRoot, @@ -382,7 +382,7 @@ std::vector QtProjectWizzardContentPathSourceGradle::getFilePaths() co std::dynamic_pointer_cast(dialogView)->setParentWindow(m_window); { - dialogView->showUnknownProgressDialog("Preparing Project", "Gradle\nFetching Source Directories"); + dialogView->showUnknownProgressDialog(L"Preparing Project", L"Gradle\nFetching Source Directories"); const std::vector sourceDirectories = utility::gradleGetAllSourceDirectories( gradleProjectRoot, settings->getShouldIndexGradleTests() diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp index 30f4868a..323de651 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp @@ -212,7 +212,7 @@ std::vector QtProjectWizzardContentPathsSource::getFilePaths() const }); std::dynamic_pointer_cast(dialogView)->setParentWindow(m_window); - dialogView->showUnknownProgressDialog("Processing", "Gathering Source Files"); + dialogView->showUnknownProgressDialog(L"Processing", L"Gathering Source Files"); FileManager fileManager; fileManager.update( @@ -534,7 +534,7 @@ void QtProjectWizzardContentPathsHeaderSearch::validateIncludesButtonClicked() { std::dynamic_pointer_cast(dialogView)->setParentWindow(m_window); - dialogView->showUnknownProgressDialog("Processing", "Gathering Source Files"); + dialogView->showUnknownProgressDialog(L"Processing", L"Gathering Source Files"); ScopedFunctor dialogHider([&dialogView](){ dialogView->hideUnknownProgressDialog(); }); @@ -570,7 +570,7 @@ void QtProjectWizzardContentPathsHeaderSearch::validateIncludesButtonClicked() [&](const float progress) { Application::getInstance()->getDialogView()->showProgressDialog( - "Processing", std::to_string(int(progress * sourceFilePaths.size())) + " Files", int(progress * 100.0f) + L"Processing", std::to_wstring(int(progress * sourceFilePaths.size())) + L" Files", int(progress * 100.0f) ); } ); @@ -597,7 +597,7 @@ void QtProjectWizzardContentPathsHeaderSearch::finishedSelectDetectIncludesRootP std::vector headerSearchPaths; { dialogView->setParentWindow(m_window); - dialogView->showUnknownProgressDialog("Processing", "Gathering Source Files"); + dialogView->showUnknownProgressDialog(L"Processing", L"Gathering Source Files"); ScopedFunctor dialogHider([&dialogView]() { dialogView->hideUnknownProgressDialog(); }); @@ -631,7 +631,7 @@ void QtProjectWizzardContentPathsHeaderSearch::finishedSelectDetectIncludesRootP [&](const float progress) { Application::getInstance()->getDialogView()->showProgressDialog( - "Processing", std::to_string(int(progress * sourceFilePaths.size())) + " Files", int(progress * 100.0f) + L"Processing", std::to_wstring(int(progress * sourceFilePaths.size())) + L" Files", int(progress * 100.0f) ); } ); diff --git a/src/lib_java/project/SourceGroupJava.cpp b/src/lib_java/project/SourceGroupJava.cpp index 10724bfb..5d38577d 100644 --- a/src/lib_java/project/SourceGroupJava.cpp +++ b/src/lib_java/project/SourceGroupJava.cpp @@ -137,7 +137,7 @@ std::vector SourceGroupJava::doGetClassPath() const std::set SourceGroupJava::fetchRootDirectories() const { std::shared_ptr dialogView = Application::getInstance()->getDialogView(); - dialogView->showUnknownProgressDialog("Preparing Project", "Gathering Root\nDirectories"); + dialogView->showUnknownProgressDialog(L"Preparing Project", L"Gathering Root\nDirectories"); ScopedFunctor dialogHider([&dialogView](){ dialogView->hideUnknownProgressDialog(); diff --git a/src/lib_java/project/SourceGroupJavaGradle.cpp b/src/lib_java/project/SourceGroupJavaGradle.cpp index 03618fc1..2e595fe7 100644 --- a/src/lib_java/project/SourceGroupJavaGradle.cpp +++ b/src/lib_java/project/SourceGroupJavaGradle.cpp @@ -76,7 +76,7 @@ std::vector SourceGroupJavaGradle::getAllSourcePaths() const if (m_settings->getGradleProjectFilePathExpandedAndAbsolute().exists()) { std::shared_ptr dialogView = Application::getInstance()->getDialogView(); - dialogView->showUnknownProgressDialog("Preparing Project", "Gradle\nFetching Source Directories"); + dialogView->showUnknownProgressDialog(L"Preparing Project", L"Gradle\nFetching Source Directories"); const FilePath projectRootPath = m_settings->getGradleProjectFilePathExpandedAndAbsolute().getParentDirectory(); sourcePaths = utility::gradleGetAllSourceDirectories(projectRootPath, m_settings->getShouldIndexGradleTests()); @@ -98,7 +98,7 @@ bool SourceGroupJavaGradle::prepareGradleData() dialogView->hideUnknownProgressDialog(); }); - dialogView->showUnknownProgressDialog("Preparing Project", "Gradle\nExporting Dependencies"); + dialogView->showUnknownProgressDialog(L"Preparing Project", L"Gradle\nExporting Dependencies"); bool success = utility::gradleCopyDependencies( projectRootPath, diff --git a/src/lib_java/project/SourceGroupJavaMaven.cpp b/src/lib_java/project/SourceGroupJavaMaven.cpp index ff0f8898..3c491f03 100644 --- a/src/lib_java/project/SourceGroupJavaMaven.cpp +++ b/src/lib_java/project/SourceGroupJavaMaven.cpp @@ -76,7 +76,7 @@ std::vector SourceGroupJavaMaven::getAllSourcePaths() const if (m_settings && m_settings->getMavenProjectFilePathExpandedAndAbsolute().exists()) { std::shared_ptr dialogView = Application::getInstance()->getDialogView(); - dialogView->showUnknownProgressDialog("Preparing Project", "Maven\nFetching Source Directories"); + dialogView->showUnknownProgressDialog(L"Preparing Project", L"Maven\nFetching Source Directories"); const FilePath mavenPath(ApplicationSettings::getInstance()->getMavenPath()); const FilePath projectRootPath = m_settings->getMavenProjectFilePathExpandedAndAbsolute().getParentDirectory(); @@ -95,7 +95,7 @@ bool SourceGroupJavaMaven::prepareMavenData() const FilePath projectRootPath = m_settings->getMavenProjectFilePathExpandedAndAbsolute().getParentDirectory(); std::shared_ptr dialogView = Application::getInstance()->getDialogView(); - dialogView->showUnknownProgressDialog("Preparing Project", "Maven\nGenerating Source Files"); + dialogView->showUnknownProgressDialog(L"Preparing Project", L"Maven\nGenerating Source Files"); ScopedFunctor dialogHider([&dialogView](){ dialogView->hideUnknownProgressDialog(); @@ -115,7 +115,7 @@ bool SourceGroupJavaMaven::prepareMavenData() if (success) { - dialogView->showUnknownProgressDialog("Preparing Project", "Maven\nExporting Dependencies"); + dialogView->showUnknownProgressDialog(L"Preparing Project", L"Maven\nExporting Dependencies"); success = utility::mavenCopyDependencies( mavenPath, projectRootPath, m_settings->getMavenDependenciesDirectoryExpandedAndAbsolute() diff --git a/src/lib_java/utility/utilityGradle.cpp b/src/lib_java/utility/utilityGradle.cpp index 46657e18..8a150b77 100644 --- a/src/lib_java/utility/utilityGradle.cpp +++ b/src/lib_java/utility/utilityGradle.cpp @@ -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); diff --git a/src/lib_java/utility/utilityMaven.cpp b/src/lib_java/utility/utilityMaven.cpp index 886e5ffd..893f1ee9 100644 --- a/src/lib_java/utility/utilityMaven.cpp +++ b/src/lib_java/utility/utilityMaven.cpp @@ -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();