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

QmlProfiler: Merge SortedTimelineModel into AbstractTimelineModel

Browse Source 
In order to provide a stable interface we need most of
SortedTimelineModel to be private. There is no real benefit in keeping
a distinction between AbstractTimelineModel and SortedTimelineModel as
SortedTimelineModel isn't very useful on its own.

Change-Id: Ibc6945e2740320f430f2634f95c7807d6b460123
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2014-10-27 18:42:39 +01:00
committed by Ulf Hermann
parent a42e07beba
commit b7742f79b6
10 changed files with 353 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,7 @@ int QmlProfilerNotesModel::get(int timelineModel, int timelineIndex) const
int QmlProfilerNotesModel::add(int timelineModel, int timelineIndex, const QString &text)
{
const AbstractTimelineModel *model = m_timelineModels[timelineModel];
int typeId = model->range(timelineIndex).typeId;
int typeId = model->typeId(timelineIndex);
Note note = { text, timelineModel, timelineIndex };
m_data << note;
m_modified = true;
@@ -167,9 +167,8 @@ int QmlProfilerNotesModel::add(int typeId, qint64 start, qint64 duration, const
for (int i = model->firstIndex(start); i <= model->lastIndex(start + duration); ++i) {
if (i < 0)
continue;
const SortedTimelineModel::Range &timelineRange = model->range(i);
if (timelineRange.typeId == typeId && timelineRange.start == start &&
timelineRange.duration == duration) {
if (model->typeId(i) == typeId && model->startTime(i) == start &&
model->duration(i) == duration) {
timelineModel = model->modelId();
timelineIndex = i;
break;
@@ -218,9 +217,10 @@ void QmlProfilerNotesModel::saveData()
if (it == m_timelineModels.end())
continue;
const SortedTimelineModel::Range &noteRange = it.value()->range(note.timelineIndex);
const AbstractTimelineModel *model = it.value();
QmlProfilerDataModel::QmlEventNoteData save = {
noteRange.typeId, noteRange.start, noteRange.duration, note.text
model->typeId(note.timelineIndex), model->startTime(note.timelineIndex),
model->duration(note.timelineIndex), note.text
};
notes.append(save);
}