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

logic: used wstring in FilePath constructor

Browse Source 
* used wstring in FilePath constructor where easily possible
* added FilePath concatenate method that accepts string parameter
* implemented using only wstring in MessageStatus
* used wstring in config
This commit is contained in:
mlangkabel
2018-01-30 11:00:23 +01:00
parent 143cf6a02d
commit 0dda63f7ae
157 changed files with 1230 additions and 945 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_java/project/SourceGroupJava.cpp
+8 -6
View File
@@ -11,6 +11,8 @@
#include "utility/text/TextAccess.h"
#include "utility/ScopedFunctor.h"
#include "utility/utilityJava.h"
#include "utility/utilityQString.h"
#include "utility/utilityString.h"
#include "Application.h"
SourceGroupJava::SourceGroupJava()
@@ -63,7 +65,7 @@ std::shared_ptr<const SourceGroupSettings> SourceGroupJava::getSourceGroupSettin
bool SourceGroupJava::prepareJavaEnvironment()
{
const std::string errorString = utility::prepareJavaEnvironment();
const std::wstring errorString = utility::decodeFromUtf8(utility::prepareJavaEnvironment());
if (errorString.size() > 0)
{
@@ -73,13 +75,13 @@ bool SourceGroupJava::prepareJavaEnvironment()
if (!JavaEnvironmentFactory::getInstance())
{
std::string dialogMessage =
"Sourcetrail was unable to locate Java on this machine.\n"
std::wstring dialogMessage =
L"Sourcetrail was unable to locate Java on this machine.\n"
"Please make sure to provide the correct Java Path in the preferences.";
if (errorString.size() > 0)
if (!errorString.empty())
{
dialogMessage += "\n\nError: " + errorString;
dialogMessage += L"\n\nError: " + errorString;
}
MessageStatus(dialogMessage, true, false).dispatch();
@@ -163,7 +165,7 @@ std::set<FilePath> SourceGroupJava::fetchRootDirectories() const
const std::vector<std::string> packageNameParts = utility::splitToVector(packageName, ".");
for (std::vector<std::string>::const_reverse_iterator it = packageNameParts.rbegin(); it != packageNameParts.rend(); it++)
{
if (rootPath.fileName() != (*it))
if (rootPath.wFileName() != utility::decodeFromUtf8(*it))
{
success = false;
break;
src/lib_java/project/SourceGroupJavaMaven.cpp
+2 -2
View File
@@ -105,8 +105,8 @@ bool SourceGroupJavaMaven::prepareMavenData()
if (!success)
{
const std::string dialogMessage =
"Sourcetrail was unable to locate Maven on this machine.\n"
const std::wstring dialogMessage =
L"Sourcetrail was unable to locate Maven on this machine.\n"
"Please make sure to provide the correct Maven Path in the preferences.";
MessageStatus(dialogMessage, true, false).dispatch();