From c55dbf2e7a6412df815ac8b2462c8268b8438d1c Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@digia.com>
Date: Tue, 18 Feb 2014 18:34:43 +0100
Subject: [PATCH] Adapt to unified data models in creator
Change-Id: I08991a79d5cc70bb374ecaa8d5b707962403cee7
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---
plugins/qmlprofilerextension/pixmapcachemodel.cpp | 6 +++---
plugins/qmlprofilerextension/pixmapcachemodel.h | 2 +-
plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp | 6 +++---
plugins/qmlprofilerextension/scenegraphtimelinemodel.h | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.cpp b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
index 95a126208ff..def302e4755 100644
--- a/plugins/qmlprofilerextension/pixmapcachemodel.cpp
+++ b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
@@ -155,7 +155,7 @@ void PixmapCacheModel::PixmapCacheModelPrivate::addVP(QVariantList &l, QString l
{
if (time > 0) {
QVariantMap res;
- res.insert(label, QVariant(QmlProfilerSimpleModel::formatTime(time)));
+ res.insert(label, QVariant(QmlProfilerBaseModel::formatTime(time)));
l << res;
}
}
@@ -207,7 +207,7 @@ void PixmapCacheModel::loadData()
{
Q_D(PixmapCacheModel);
clear();
- QmlProfilerSimpleModel *simpleModel = d->modelManager->simpleModel();
+ QmlProfilerDataModel *simpleModel = d->modelManager->qmlModel();
if (simpleModel->isEmpty())
return;
@@ -216,7 +216,7 @@ void PixmapCacheModel::loadData()
QVector < int > pixmapStartPoints;
QVector < int > pixmapCachePoints;
- foreach (const QmlProfilerSimpleModel::QmlEventData &event, simpleModel->getEvents()) {
+ foreach (const QmlProfilerDataModel::QmlEventData &event, simpleModel->getEvents()) {
if (!eventAccepted(event))
continue;
diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.h b/plugins/qmlprofilerextension/pixmapcachemodel.h
index 9fba4beb60f..e1bafd65527 100644
--- a/plugins/qmlprofilerextension/pixmapcachemodel.h
+++ b/plugins/qmlprofilerextension/pixmapcachemodel.h
@@ -21,7 +21,7 @@
#include "qmlprofiler/qmlprofilertimelinemodelproxy.h"
#include "qmlprofiler/singlecategorytimelinemodel.h"
-#include "qmlprofiler/qmlprofilersimplemodel.h"
+#include "qmlprofiler/qmlprofilerdatamodel.h"
#include <QStringList>
#include <QColor>
diff --git a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
index ac05dfe585b..26fc5ed7c19 100644
--- a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
+++ b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
@@ -141,7 +141,7 @@ void SceneGraphTimelineModel::SceneGraphTimelineModelPrivate::addVP(QVariantList
{
if (time > 0) {
QVariantMap res;
- res.insert(label, QVariant(QmlProfilerSimpleModel::formatTime(time)));
+ res.insert(label, QVariant(QmlProfilerBaseModel::formatTime(time)));
l << res;
}
}
@@ -195,14 +195,14 @@ void SceneGraphTimelineModel::loadData()
{
Q_D(SceneGraphTimelineModel);
clear();
- QmlProfilerSimpleModel *simpleModel = d->modelManager->simpleModel();
+ QmlProfilerDataModel *simpleModel = d->modelManager->qmlModel();
if (simpleModel->isEmpty())
return;
int lastRenderEvent = -1;
// combine the data of several eventtypes into two rows
- foreach (const QmlProfilerSimpleModel::QmlEventData &event, simpleModel->getEvents()) {
+ foreach (const QmlProfilerDataModel::QmlEventData &event, simpleModel->getEvents()) {
if (!eventAccepted(event))
continue;
diff --git a/plugins/qmlprofilerextension/scenegraphtimelinemodel.h b/plugins/qmlprofilerextension/scenegraphtimelinemodel.h
index 1c1cd2b523a..50e46193533 100644
--- a/plugins/qmlprofilerextension/scenegraphtimelinemodel.h
+++ b/plugins/qmlprofilerextension/scenegraphtimelinemodel.h
@@ -21,7 +21,7 @@
#include "qmlprofiler/singlecategorytimelinemodel.h"
#include "qmlprofiler/qmlprofilermodelmanager.h"
-#include "qmlprofiler/qmlprofilersimplemodel.h"
+#include "qmlprofiler/qmlprofilerdatamodel.h"
#include <QStringList>
#include <QColor>
--
GitLab