QmlProfiler: Make members of QmlEventLocation private

You should not change them independently as that is error-prone.

Change-Id: I07890a29b045492fe804b9537094dea763bc1b8d
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-06-06 18:04:53 +02:00
parent a41593c395
commit 472745fb2e
14 changed files with 100 additions and 68 deletions

View File

@@ -121,11 +121,12 @@ void QmlProfilerDetailsRewriter::requestDetailsForLocation(int requestId,
const QmlEventLocation &location)
{
QString localFile;
if (!d->m_filesCache.contains(location.filename)) {
localFile = d->m_projectFinder->findFile(location.filename);
d->m_filesCache[location.filename] = localFile;
const QString locationFile = location.filename();
if (!d->m_filesCache.contains(locationFile)) {
localFile = d->m_projectFinder->findFile(locationFile);
d->m_filesCache[locationFile] = localFile;
} else {
localFile = d->m_filesCache[location.filename];
localFile = d->m_filesCache[locationFile];
}
QFileInfo fileInfo(localFile);
if (!fileInfo.exists() || !fileInfo.isReadable())
@@ -166,7 +167,7 @@ void QmlProfilerDetailsRewriter::rewriteDetailsForLocation(QTextStream &textDoc,
QmlJS::Document::Ptr doc, int requestId, const QmlEventLocation &location)
{
PropertyVisitor propertyVisitor;
QmlJS::AST::Node *node = propertyVisitor(doc->ast(), location.line, location.column);
QmlJS::AST::Node *node = propertyVisitor(doc->ast(), location.line(), location.column());
if (!node)
return;