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

logic: use wstring in symbol and bookmark names

Browse Source 
* use wstring in symbol and bookmark names
* fixed setting apppath in windows includes
* regard utf8 encoding in shared indexer commands
* regard utf8 encoding in shared indexer status
This commit is contained in:
mlangkabel
2018-02-05 17:17:33 +01:00
parent c99e79364f
commit 9e041c1f0a
155 changed files with 1955 additions and 1864 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/controller/CodeController.cpp
+5 -5
View File
@@ -160,7 +160,7 @@ void CodeController::handleMessage(MessageActivateTokens* message)
if (message->tokenNames.size())
{
status += L"Activate \"" + utility::decodeFromUtf8(message->tokenNames[0].getQualifiedName()) + L"\": ";
status += L"Activate \"" + message->tokenNames[0].getQualifiedName() + L"\": ";
}
status += std::to_wstring(message->tokenIds.size()) + L" ";
@@ -660,7 +660,7 @@ std::vector<CodeSnippetParams> CodeController::getSnippetsForFile(
{
if (location->getTokenIds().size())
{
params.title = m_storageAccess->getNameHierarchyForNodeId(location->getTokenIds()[0]).getQualifiedName();
params.title = utility::encodeToUtf8(m_storageAccess->getNameHierarchyForNodeId(location->getTokenIds()[0]).getQualifiedName());
params.titleId = location->getLocationId();
}
}
@@ -682,7 +682,7 @@ std::vector<CodeSnippetParams> CodeController::getSnippetsForFile(
{
if (location->getTokenIds().size())
{
params.footer = m_storageAccess->getNameHierarchyForNodeId(location->getTokenIds()[0]).getQualifiedName();
params.footer = utility::encodeToUtf8(m_storageAccess->getNameHierarchyForNodeId(location->getTokenIds()[0]).getQualifiedName());
params.footerId = location->getLocationId();
}
}
@@ -829,12 +829,12 @@ std::vector<std::string> CodeController::getProjectDescription(SourceLocationFil
break;
}
std::string serializedName = line.substr(posA + 1, posB - posA - 1);
std::wstring serializedName = utility::decodeFromUtf8(line.substr(posA + 1, posB - posA - 1));
NameHierarchy nameHierarchy = NameHierarchy::deserialize(serializedName);
Id tokenId = m_storageAccess->getNodeIdForNameHierarchy(nameHierarchy);
std::string nameString = nameHierarchy.getQualifiedName();
std::string nameString = utility::encodeToUtf8(nameHierarchy.getQualifiedName());
if (tokenId > 0)
{
line.replace(posA, posB - posA + 1, nameString);