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

QmlProfiler: Make members of QmlEventLocation private

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qmlprofiler/qmlprofilertracefile.cpp
View File

@@ -300,6 +300,9 @@ void QmlProfilerFileReader::loadEventTypes(QXmlStreamReader &stream)
};
const QmlEventType defaultEvent = type;
QString filename;
int line = 0, column = 0;
while (!stream.atEnd() && !stream.hasError()) {
if (isCanceled())
return;
@@ -342,17 +345,17 @@ void QmlProfilerFileReader::loadEventTypes(QXmlStreamReader &stream)
}
if (elementName == _("filename")) {
type.location.filename = readData;
filename = readData;
break;
}
if (elementName == _("line")) {
type.location.line = readData.toInt();
line = readData.toInt();
break;
}
if (elementName == _("column")) {
type.location.column = readData.toInt();
column = readData.toInt();
break;
}
@@ -392,6 +395,9 @@ void QmlProfilerFileReader::loadEventTypes(QXmlStreamReader &stream)
if (typeIndex >= 0) {
if (typeIndex >= m_eventTypes.size())
m_eventTypes.resize(typeIndex + 1);
type.location = QmlEventLocation(filename, line, column);
filename.clear();
line = column = 0;
m_eventTypes[typeIndex] = type;
ProfileFeature feature = type.feature();
if (feature != MaximumProfileFeature)
@@ -620,10 +626,10 @@ void QmlProfilerFileWriter::saveQtd(QIODevice *device)
stream.writeAttribute(_("index"), QString::number(typeIndex));
stream.writeTextElement(_("displayname"), type.displayName);
stream.writeTextElement(_("type"), qmlTypeAsString(type.message, type.rangeType));
if (!type.location.filename.isEmpty()) {
stream.writeTextElement(_("filename"), type.location.filename);
stream.writeTextElement(_("line"), QString::number(type.location.line));
stream.writeTextElement(_("column"), QString::number(type.location.column));
if (!type.location.filename().isEmpty()) {
stream.writeTextElement(_("filename"), type.location.filename());
stream.writeTextElement(_("line"), QString::number(type.location.line()));
stream.writeTextElement(_("column"), QString::number(type.location.column()));
}
if (!type.data.isEmpty())