src: broad refactoring to use FilePath.wstr() where easily possible
This commit is contained in:
@@ -44,9 +44,10 @@ void SharedIndexerCommand::fromLocal(IndexerCommand* indexerCommand)
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG_ERROR_STREAM(<< "Trying to push unhandled type of IndexerCommand for file: "
|
||||
<< indexerCommand->getSourceFilePath().str() << ". Type string is: " << indexerCommandTypeToString(indexerCommand->getIndexerCommandType())
|
||||
<< ". It will be ignored.");
|
||||
LOG_ERROR(L"Trying to push unhandled type of IndexerCommand for file: " +
|
||||
indexerCommand->getSourceFilePath().wstr() + L". Type string is: " +
|
||||
utility::decodeFromUtf8(indexerCommandTypeToString(indexerCommand->getIndexerCommandType())) +
|
||||
L". It will be ignored.");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -91,8 +92,8 @@ std::shared_ptr<IndexerCommand> SharedIndexerCommand::fromShared(const SharedInd
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG_ERROR_STREAM(<< "Cannot convert shared IndexerCommand for file: "
|
||||
<< indexerCommand.getSourceFilePath().str() << ". The type is unknown.");
|
||||
LOG_ERROR(L"Cannot convert shared IndexerCommand for file: " +
|
||||
indexerCommand.getSourceFilePath().wstr() + L". The type is unknown.");
|
||||
}
|
||||
|
||||
return nullptr;
|
||||
|
||||
@@ -63,9 +63,9 @@ SourceLocation* SourceLocationCollection::addSourceLocation(
|
||||
{
|
||||
if (startLineNumber > endLineNumber || (startLineNumber == endLineNumber && startColumnNumber > endColumnNumber))
|
||||
{
|
||||
LOG_ERROR_STREAM(<< "SourceLocation has wrong boundaries: " << filePath.str() << " "
|
||||
<< startLineNumber << ":" << startColumnNumber << " "
|
||||
<< endLineNumber << ":" << endColumnNumber);
|
||||
LOG_ERROR(L"SourceLocation has wrong boundaries: " + filePath.wstr() + L" " +
|
||||
std::to_wstring(startLineNumber) + L":" + std::to_wstring(startColumnNumber) + L" " +
|
||||
std::to_wstring(endLineNumber) + L":" + std::to_wstring(endColumnNumber));
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ bool Settings::load(const FilePath& filePath)
|
||||
{
|
||||
clear();
|
||||
m_filePath = filePath;
|
||||
LOG_WARNING("File for Settings not found: " + filePath.str());
|
||||
LOG_WARNING(L"File for Settings not found: " + filePath.wstr());
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -50,7 +50,7 @@ void Settings::save()
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG_WARNING("Settings were not saved: " + m_filePath.str());
|
||||
LOG_WARNING(L"Settings were not saved: " + m_filePath.wstr());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -86,7 +86,7 @@ std::vector<std::string> TextAccess::readFile(const FilePath& filePath)
|
||||
|
||||
if (srcFile.fail())
|
||||
{
|
||||
LOG_ERROR("Could not open file " + filePath.str());
|
||||
LOG_ERROR(L"Could not open file " + filePath.wstr());
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user