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_cxx/data/parser/cxx/utilityClang.cpp
+6 -5
View File
@@ -4,6 +4,7 @@
#include <clang/AST/DeclTemplate.h>
#include "utility/file/FilePath.h"
#include "utility/utilityString.h"
bool utility::isImplicit(const clang::Decl* d)
{
@@ -108,19 +109,19 @@ SymbolKind utility::getSymbolKind(const clang::VarDecl* d)
return symbolKind;
}
std::string utility::getFileNameOfFileEntry(const clang::FileEntry* entry)
std::wstring utility::getFileNameOfFileEntry(const clang::FileEntry* entry)
{
std::string fileName = "";
std::wstring fileName = L"";
if (entry != nullptr && entry->isValid())
{
fileName = entry->tryGetRealPathName();
fileName = utility::decodeFromUtf8(entry->tryGetRealPathName());
if (fileName.empty())
{
fileName = entry->getName();
fileName = utility::decodeFromUtf8(entry->getName());
}
else
{
fileName = FilePath(entry->getName().str()).getParentDirectory().concatenate(FilePath(fileName).wFileName()).str();
fileName = FilePath(utility::decodeFromUtf8(entry->getName().str())).getParentDirectory().concatenate(FilePath(fileName).wFileName()).wstr();
}
}
return fileName;