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

QmlProfiler: Split AbstractTimelineModel in two classes

Browse Source 
We need a general purpose TimelineModel and a specialized
QmlProfilerTimelineModel.

Change-Id: I2da02d65efa11e160cab5fa9f8a21075beb0e2bf
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2014-10-28 19:01:43 +01:00
committed by Ulf Hermann
parent af84726c51
commit 10d942e268
22 changed files with 797 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,7 @@ public:
// mapping of modelId assigned by manager to index in our list
QList <int> modelManagerIndexMapping;
QList <AbstractTimelineModel *> modelList;
QList <QmlProfilerTimelineModel *> modelList;
QmlProfilerModelManager *modelManager;
};
@@ -80,7 +80,7 @@ void TimelineModelAggregator::setModelManager(QmlProfilerModelManager *modelMana
connect(modelManager,SIGNAL(dataAvailable()),this,SIGNAL(dataAvailable()));
// external models pushed on top
foreach (AbstractTimelineModel *timelineModel,
foreach (QmlProfilerTimelineModel *timelineModel,
QmlProfilerPlugin::instance->getModels(modelManager)) {
addModel(timelineModel);
}
@@ -96,7 +96,7 @@ void TimelineModelAggregator::setModelManager(QmlProfilerModelManager *modelMana
this, SIGNAL(notesChanged(int,int,int)));
}
void TimelineModelAggregator::addModel(AbstractTimelineModel *m)
void TimelineModelAggregator::addModel(QmlProfilerTimelineModel *m)
{
while (d->modelManagerIndexMapping.size() <= m->modelId())
d->modelManagerIndexMapping.append(-1);
@@ -110,7 +110,7 @@ void TimelineModelAggregator::addModel(AbstractTimelineModel *m)
emit modelsChanged(d->modelList.length(), d->modelList.length());
}
const AbstractTimelineModel *TimelineModelAggregator::model(int modelIndex) const
const QmlProfilerTimelineModel *TimelineModelAggregator::model(int modelIndex) const
{
return d->modelList[modelIndex];
}
@@ -118,7 +118,7 @@ const AbstractTimelineModel *TimelineModelAggregator::model(int modelIndex) cons
QVariantList TimelineModelAggregator::models() const
{
QVariantList ret;
foreach (AbstractTimelineModel *model, d->modelList)
foreach (QmlProfilerTimelineModel *model, d->modelList)
ret << QVariant::fromValue(model);
return ret;
}
@@ -140,7 +140,7 @@ int TimelineModelAggregator::count(int modelIndex) const
bool TimelineModelAggregator::isEmpty() const
{
foreach (const AbstractTimelineModel *modelProxy, d->modelList)
foreach (const QmlProfilerTimelineModel *modelProxy, d->modelList)
if (!modelProxy->isEmpty())
return false;
return true;
@@ -297,8 +297,8 @@ int TimelineModelAggregator::selectionIdForLocation(int modelIndex, const QStrin
void TimelineModelAggregator::swapModels(int modelIndex1, int modelIndex2)
{
AbstractTimelineModel *&model1 = d->modelList[modelIndex1];
AbstractTimelineModel *&model2 = d->modelList[modelIndex2];
QmlProfilerTimelineModel *&model1 = d->modelList[modelIndex1];
QmlProfilerTimelineModel *&model2 = d->modelList[modelIndex2];
std::swap(d->modelManagerIndexMapping[model1->modelId()],
d->modelManagerIndexMapping[model2->modelId()]);
std::swap(model1, model2);