feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Valgrind: Replace QDir::separator with slash

Browse Source 
Change-Id: I8f8192dc065702cb1c6bb218b8d992bb9775cd10
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-01-31 22:07:42 +02:00
committed by hjk
parent 1bcfa137a3
commit 349f415067
7 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp
View File

@@ -113,7 +113,7 @@ QString ErrorListModel::Private::formatAbsoluteFilePath(const Error &error) cons
{
const Frame f = findRelevantFrame(error);
if (!f.directory().isEmpty() && !f.file().isEmpty())
return QString(f.directory() + QDir::separator() + f.file());
return f.directory() + QLatin1Char('/') + f.file();
return QString();
}

2
src/plugins/valgrind/xmlprotocol/modelhelpers.cpp
View File

@@ -44,7 +44,7 @@ QString toolTipForFrame(const Frame &frame)
{
QString location;
if (!frame.file().isEmpty()) {
location = frame.directory() + QDir::separator() + frame.file();
location = frame.directory() + QLatin1Char('/') + frame.file();
if (frame.line() > 0)
location += QLatin1Char(':') + QString::number(frame.line());
}

4
src/plugins/valgrind/xmlprotocol/stackmodel.cpp
View File

@@ -65,8 +65,8 @@ static QString makeName(const Frame &frame)
if (!fn.isEmpty())
return fn;
if (!d.isEmpty() && !f.isEmpty())
return frame.line() > 0 ? QString::fromLatin1("%1%2%3:%4").arg(d, QDir::separator(), f, QString::number(frame.line()))
: QString::fromLatin1("%1%2%3").arg(d, QDir::separator(), f);
return frame.line() > 0 ? QString::fromLatin1("%1/%2:%3").arg(d, f).arg(frame.line())
: QString::fromLatin1("%1/%2").arg(d, f);
return frame.object();
}