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

src: replaced some usages of string by wstring in filepath

Browse Source
This commit is contained in:
mlangkabel
2018-02-26 15:03:28 +01:00
parent 6d82e9265a
commit bae6bd73d6
15 changed files with 66 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/element/QtLocationPicker.cpp
+2 -2
View File
@@ -120,9 +120,9 @@ void QtLocationPicker::handleButtonPress()
{
if (!m_relativeRootDirectory.empty())
{
const FilePath path(fileName.toStdString());
const FilePath path(fileName.toStdWString());
const FilePath relPath = path.getRelativeTo(m_relativeRootDirectory);
if (relPath.str().size() < path.str().size())
if (relPath.wstr().size() < path.wstr().size())
{
fileName = QString::fromStdWString(relPath.wstr());
}
src/lib_gui/qt/element/QtStatusBar.cpp
+1 -1
View File
@@ -13,7 +13,7 @@ QtStatusBar::QtStatusBar()
{
addWidget(new QWidget()); // add some space
m_movie = std::make_shared<QMovie>((ResourcePaths::getGuiPath().str() + "statusbar_view/loader.gif").c_str());
m_movie = std::make_shared<QMovie>(QString::fromStdWString(ResourcePaths::getGuiPath().concatenate(L"statusbar_view/loader.gif").wstr()));
// if movie doesn't loop forever, force it to.
if (m_movie->loopCount() != -1)
{
src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp
+1 -1
View File
@@ -697,7 +697,7 @@ void QtProjectWizzardContentPathsHeaderSearch::showDetectedIncludesResult(const
if (!relativeRoot.empty())
{
const FilePath relPath = path.getRelativeTo(relativeRoot);
if (relPath.str().size() < path.str().size())
if (relPath.wstr().size() < path.wstr().size())
{
detailedText += relPath.wstr() + L"\n";
}