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

QmlProfiler: Make members of QmlNote private

Browse Source 
The only member that can change after initialization is the text.

Change-Id: I6958f510e67c9fd6fe1f109c2676f80d93e7fd0c
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-06-07 13:54:23 +02:00
parent 0c0cb4b043
commit 52ee1141a8
4 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmlprofiler/qmlnote.cpp
View File

@@ -30,12 +30,12 @@ namespace QmlProfiler {
QDataStream &operator>>(QDataStream &stream, QmlNote &note) QDataStream &operator>>(QDataStream &stream, QmlNote &note)
{ {
return stream >> note.typeIndex >> note.startTime >> note.duration >> note.text; return stream >> note.m_typeIndex >> note.m_startTime >> note.m_duration >> note.m_text;
} }
QDataStream &operator<<(QDataStream &stream, const QmlNote &note) QDataStream &operator<<(QDataStream &stream, const QmlNote &note)
{ {
return stream << note.typeIndex << note.startTime << note.duration << note.text; return stream << note.m_typeIndex << note.m_startTime << note.m_duration << note.m_text;
} }
} // namespace QmlProfiler } // namespace QmlProfiler

25
src/plugins/qmlprofiler/qmlnote.h
View File

@@ -29,16 +29,29 @@
namespace QmlProfiler { namespace QmlProfiler {
struct QmlNote { class QmlNote {
public:
QmlNote(int typeIndex = -1, qint64 startTime = -1, qint64 duration = -1, QmlNote(int typeIndex = -1, qint64 startTime = -1, qint64 duration = -1,
const QString &text = QString()) : const QString &text = QString()) :
typeIndex(typeIndex), startTime(startTime), duration(duration), text(text) m_typeIndex(typeIndex), m_startTime(startTime), m_duration(duration), m_text(text)
{} {}
int typeIndex; int typeIndex() const { return m_typeIndex; }
qint64 startTime; qint64 startTime() const { return m_startTime; }
qint64 duration; qint64 duration() const { return m_duration; }
QString text; QString text() const { return m_text; }
void setText(const QString &text) { m_text = text; }
private:
friend QDataStream &operator>>(QDataStream &stream, QmlNote &note);
friend QDataStream &operator<<(QDataStream &stream, const QmlNote &note);
int m_typeIndex;
qint64 m_startTime;
qint64 m_duration;
QString m_text;
}; };
QDataStream &operator>>(QDataStream &stream, QmlNote &note); QDataStream &operator>>(QDataStream &stream, QmlNote &note);

2
src/plugins/qmlprofiler/qmlprofilernotesmodel.cpp
View File

@@ -67,7 +67,7 @@ void QmlProfilerNotesModel::loadData()
TimelineNotesModel::clear(); TimelineNotesModel::clear();
for (int i = 0; i != m_notes.size(); ++i) { for (int i = 0; i != m_notes.size(); ++i) {
const QmlNote &note = m_notes[i]; const QmlNote &note = m_notes[i];
addQmlNote(note.typeIndex, note.startTime, note.duration, note.text); addQmlNote(note.typeIndex(), note.startTime(), note.duration(), note.text());
} }
resetModified(); resetModified();
blockSignals(false); blockSignals(false);

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

@@ -525,14 +525,14 @@ void QmlProfilerFileReader::loadNotes(QXmlStreamReader &stream)
if (elementName == _("note")) { if (elementName == _("note")) {
updateProgress(stream.device()); updateProgress(stream.device());
QXmlStreamAttributes attrs = stream.attributes(); QXmlStreamAttributes attrs = stream.attributes();
currentNote.startTime = attrs.value(_("startTime")).toLongLong(); currentNote = QmlNote(attrs.value(_("eventIndex")).toInt(),
currentNote.duration = attrs.value(_("duration")).toLongLong(); attrs.value(_("startTime")).toLongLong(),
currentNote.typeIndex = attrs.value(_("eventIndex")).toInt(); attrs.value(_("duration")).toLongLong());
} }
break; break;
} }
case QXmlStreamReader::Characters: { case QXmlStreamReader::Characters: {
currentNote.text = stream.text().toString(); currentNote.setText(stream.text().toString());
break; break;
} }
case QXmlStreamReader::EndElement: { case QXmlStreamReader::EndElement: {
@@ -747,10 +747,10 @@ void QmlProfilerFileWriter::saveQtd(QIODevice *device)
const QmlNote &note = m_notes[noteIndex]; const QmlNote &note = m_notes[noteIndex];
stream.writeStartElement(_("note")); stream.writeStartElement(_("note"));
stream.writeAttribute(_("startTime"), QString::number(note.startTime)); stream.writeAttribute(_("startTime"), QString::number(note.startTime()));
stream.writeAttribute(_("duration"), QString::number(note.duration)); stream.writeAttribute(_("duration"), QString::number(note.duration()));
stream.writeAttribute(_("eventIndex"), QString::number(note.typeIndex)); stream.writeAttribute(_("eventIndex"), QString::number(note.typeIndex()));
stream.writeCharacters(note.text); stream.writeCharacters(note.text());
stream.writeEndElement(); // note stream.writeEndElement(); // note
incrementProgress(); incrementProgress();
} }