logic: use wstring in symbol and bookmark names

* 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

src/lib_gui/qt/window/QtBookmarkBrowser.cpp

@@ -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);
 

src/lib_gui/qt/window/QtBookmarkCreator.cpp

@@ -111,27 +111,27 @@ void QtBookmarkCreator::refreshStyle()
 	).c_str());
 }
 
-void QtBookmarkCreator::setDisplayName(const std::string& name)
+void QtBookmarkCreator::setDisplayName(const std::wstring& name)
 {
-	m_displayName->setText(name.c_str());
+	m_displayName->setText(QString::fromStdWString(name));
 }
 
-void QtBookmarkCreator::setComment(const std::string& comment)
+void QtBookmarkCreator::setComment(const std::wstring& comment)
 {
-	m_commentBox->setText(comment.c_str());
+	m_commentBox->setText(QString::fromStdWString(comment));
 }
 
 void QtBookmarkCreator::setBookmarkCategories(const std::vector<BookmarkCategory>& categories)
 {
 	for (unsigned int i = 0; i < categories.size(); i++)
 	{
-		m_categoryBox->addItem(categories[i].getName().c_str());
+		m_categoryBox->addItem(QString::fromStdWString(categories[i].getName()));
 	}
 }
 
 void QtBookmarkCreator::setCurrentBookmarkCategory(const BookmarkCategory& category)
 {
-	int index = m_categoryBox->findText(category.getName().c_str());
+	int index = m_categoryBox->findText(QString::fromStdWString(category.getName()));
 
 	if (index > -1)
 	{
@@ -139,7 +139,7 @@ void QtBookmarkCreator::setCurrentBookmarkCategory(const BookmarkCategory& categ
 	}
 	else
 	{
-		m_categoryBox->addItem(category.getName().c_str());
+		m_categoryBox->addItem(QString::fromStdWString(category.getName()));
 		m_categoryBox->setCurrentIndex(1);
 	}
 }
@@ -158,9 +158,9 @@ void QtBookmarkCreator::resizeEvent(QResizeEvent* event)
 
 void QtBookmarkCreator::handleNext()
 {
-	std::string name = m_displayName->text().toStdString();
-	std::string comment = m_commentBox->toPlainText().toStdString();
-	std::string category = m_categoryBox->currentText().toStdString();
+	std::wstring name = m_displayName->text().toStdWString();
+	std::wstring comment = m_commentBox->toPlainText().toStdWString();
+	std::wstring category = m_categoryBox->currentText().toStdWString();
 
 	if (m_editBookmarkId)
 	{

src/lib_gui/qt/window/QtBookmarkCreator.h

@@ -26,8 +26,8 @@ public:
 
 	void refreshStyle();
 
-	void setDisplayName(const std::string& name);
-	void setComment(const std::string& comment);
+	void setDisplayName(const std::wstring& name);
+	void setComment(const std::wstring& comment);
 
 	void setBookmarkCategories(const std::vector<BookmarkCategory>& categories);
 	void setCurrentBookmarkCategory(const BookmarkCategory& category);

src/lib_gui/qt/window/QtIndexingDialog.cpp

@@ -296,7 +296,7 @@ size_t QtIndexingDialog::getProgress() const
 	return m_progressBar->getProgress();
 }
 
-void QtIndexingDialog::updateIndexingProgress(size_t fileCount, size_t totalFileCount, std::string sourcePath)
+void QtIndexingDialog::updateIndexingProgress(size_t fileCount, size_t totalFileCount, const FilePath& sourcePath)
 {
 	updateMessage(QString::number(fileCount) + "/" + QString::number(totalFileCount) + " File" + (totalFileCount > 1 ? "s" : ""));
 
@@ -306,9 +306,9 @@ void QtIndexingDialog::updateIndexingProgress(size_t fileCount, size_t totalFile
 		progress = fileCount * 100 / totalFileCount;
 	}
 
-	if (sourcePath.size())
+	if (!sourcePath.empty())
 	{
-		m_sourcePath = QString::fromStdString(sourcePath);
+		m_sourcePath = QString::fromStdWString(sourcePath.wstr());
 	}
 
 	updateProgress(progress);

src/lib_gui/qt/window/QtIndexingDialog.h

@@ -51,7 +51,7 @@ public:
 	std::string getMessage() const;
 	void updateProgress(size_t progress);
 	size_t getProgress() const;
-	void updateIndexingProgress(size_t fileCount, size_t totalFileCount, std::string sourcePath);
+	void updateIndexingProgress(size_t fileCount, size_t totalFileCount, const FilePath& sourcePath);
 	void updateErrorCount(size_t errorCount, size_t fatalCount);
 
 protected:

src/lib_gui/qt/window/QtMainWindow.cpp

@@ -925,10 +925,10 @@ void QtMainWindow::setupBookmarksMenu()
 	for (size_t i = 0; i < m_bookmarks.size(); i++)
 	{
 		Bookmark* bookmark = m_bookmarks[i].get();
-		std::string name = utility::elide(bookmark->getName(), utility::ELIDE_RIGHT, 50);
+		std::wstring name = utility::elide(bookmark->getName(), utility::ELIDE_RIGHT, 50);
 
 		QAction* action = new QAction();
-		action->setText(name.c_str());
+		action->setText(QString::fromStdWString(name));
 		action->setData(QVariant(int(i)));
 
 		connect(action, &QAction::triggered, this, &QtMainWindow::activateBookmarkAction);