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_gui/qt/window/QtBookmarkBrowser.cpp
+4 -4
View File
@@ -131,7 +131,7 @@ void QtBookmarkBrowser::setBookmarks(const std::vector<std::shared_ptr<Bookmark>
m_bookmarkTree->clear();
std::map<std::string, BookmarkCategory> categoryNamesOrdered;
std::map<std::wstring, BookmarkCategory> categoryNamesOrdered;
for (const std::shared_ptr<Bookmark>& bookmark : bookmarks)
{
categoryNamesOrdered.emplace(bookmark->getCategory().getName(), bookmark->getCategory());
@@ -255,7 +255,7 @@ QTreeWidgetItem* QtBookmarkBrowser::findOrCreateTreeCategory(const BookmarkCateg
{
QTreeWidgetItem* item = m_bookmarkTree->topLevelItem(i);
if (item->whatsThis(0).toStdString() == category.getName())
if (item->whatsThis(0).toStdWString() == category.getName())
{
return item;
}
@@ -268,12 +268,12 @@ QTreeWidgetItem* QtBookmarkBrowser::findOrCreateTreeCategory(const BookmarkCateg
}
else
{
categoryItem->setName("No Category");
categoryItem->setName(L"No Category");
}
categoryItem->setId(category.getId());
QTreeWidgetItem* newItem = new QTreeWidgetItem(m_bookmarkTree);
newItem->setWhatsThis(0, category.getName().c_str());
newItem->setWhatsThis(0, QString::fromStdWString(category.getName()));
categoryItem->setTreeWidgetItem(newItem);