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
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
+3 -3
View File
@@ -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);