forked from qt-creator/qt-creator
Derive from AbstractTimelineModel instead of SingleCategoryTimelineModel
Change-Id: I720f067956417519e58fac9d92292edd7968356d Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
@@ -20,7 +20,7 @@
|
||||
#include "qmldebug/qmlprofilereventtypes.h"
|
||||
#include "qmlprofiler/qmlprofilermodelmanager.h"
|
||||
#include "qmlprofiler/sortedtimelinemodel.h"
|
||||
#include "qmlprofiler/singlecategorytimelinemodel_p.h"
|
||||
#include "qmlprofiler/abstracttimelinemodel_p.h"
|
||||
|
||||
#include <QDebug>
|
||||
|
||||
@@ -31,7 +31,7 @@ using namespace QmlProfiler;
|
||||
|
||||
class MemoryUsageModel::MemoryUsageModelPrivate :
|
||||
public SortedTimelineModel<MemoryAllocation,
|
||||
SingleCategoryTimelineModel::SingleCategoryTimelineModelPrivate>
|
||||
AbstractTimelineModel::AbstractTimelineModelPrivate>
|
||||
{
|
||||
public:
|
||||
static QString memoryTypeName(int type);
|
||||
@@ -42,7 +42,7 @@ private:
|
||||
};
|
||||
|
||||
MemoryUsageModel::MemoryUsageModel(QObject *parent)
|
||||
: SingleCategoryTimelineModel(new MemoryUsageModelPrivate(),
|
||||
: AbstractTimelineModel(new MemoryUsageModelPrivate(),
|
||||
QLatin1String("MemoryUsageTimelineModel"),
|
||||
QLatin1String("Memory Usage"), QmlDebug::MemoryAllocation,
|
||||
QmlDebug::MaximumRangeType, parent)
|
||||
|
@@ -20,7 +20,7 @@
|
||||
#define MEMORYUSAGEMODEL_H
|
||||
|
||||
#include "qmlprofiler/qmlprofilertimelinemodelproxy.h"
|
||||
#include "qmlprofiler/singlecategorytimelinemodel.h"
|
||||
#include "qmlprofiler/abstracttimelinemodel.h"
|
||||
#include "qmlprofiler/qmlprofilerdatamodel.h"
|
||||
|
||||
#include <QStringList>
|
||||
@@ -29,7 +29,7 @@
|
||||
namespace QmlProfilerExtension {
|
||||
namespace Internal {
|
||||
|
||||
class MemoryUsageModel : public QmlProfiler::SingleCategoryTimelineModel
|
||||
class MemoryUsageModel : public QmlProfiler::AbstractTimelineModel
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
@@ -20,7 +20,7 @@
|
||||
#include "qmldebug/qmlprofilereventtypes.h"
|
||||
#include "qmlprofiler/qmlprofilermodelmanager.h"
|
||||
#include "qmlprofiler/sortedtimelinemodel.h"
|
||||
#include "qmlprofiler/singlecategorytimelinemodel_p.h"
|
||||
#include "qmlprofiler/abstracttimelinemodel_p.h"
|
||||
|
||||
#include <QDebug>
|
||||
#include <QSize>
|
||||
@@ -64,7 +64,7 @@ struct Pixmap {
|
||||
|
||||
class PixmapCacheModel::PixmapCacheModelPrivate :
|
||||
public SortedTimelineModel<PixmapCacheEvent,
|
||||
SingleCategoryTimelineModel::SingleCategoryTimelineModelPrivate>
|
||||
AbstractTimelineModel::AbstractTimelineModelPrivate>
|
||||
{
|
||||
public:
|
||||
void computeMaxCacheSize();
|
||||
@@ -83,7 +83,7 @@ private:
|
||||
};
|
||||
|
||||
PixmapCacheModel::PixmapCacheModel(QObject *parent)
|
||||
: SingleCategoryTimelineModel(new PixmapCacheModelPrivate(),
|
||||
: AbstractTimelineModel(new PixmapCacheModelPrivate(),
|
||||
QLatin1String("PixmapCacheTimeLineModel"),
|
||||
QLatin1String("Pixmap Cache"), QmlDebug::PixmapCacheEvent,
|
||||
QmlDebug::MaximumRangeType, parent)
|
||||
|
@@ -20,7 +20,7 @@
|
||||
#define PIXMAPCACHEMODEL_H
|
||||
|
||||
#include "qmlprofiler/qmlprofilertimelinemodelproxy.h"
|
||||
#include "qmlprofiler/singlecategorytimelinemodel.h"
|
||||
#include "qmlprofiler/abstracttimelinemodel.h"
|
||||
#include "qmlprofiler/qmlprofilerdatamodel.h"
|
||||
|
||||
#include <QStringList>
|
||||
@@ -29,7 +29,7 @@
|
||||
namespace QmlProfilerExtension {
|
||||
namespace Internal {
|
||||
|
||||
class PixmapCacheModel : public QmlProfiler::SingleCategoryTimelineModel
|
||||
class PixmapCacheModel : public QmlProfiler::AbstractTimelineModel
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
@@ -20,7 +20,7 @@
|
||||
#include "qmldebug/qmlprofilereventtypes.h"
|
||||
#include "qmlprofiler/qmlprofilermodelmanager.h"
|
||||
#include "qmlprofiler/sortedtimelinemodel.h"
|
||||
#include "qmlprofiler/singlecategorytimelinemodel_p.h"
|
||||
#include "qmlprofiler/abstracttimelinemodel_p.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QDebug>
|
||||
@@ -54,7 +54,7 @@ enum SceneGraphCategoryType {
|
||||
|
||||
class SceneGraphTimelineModel::SceneGraphTimelineModelPrivate :
|
||||
public SortedTimelineModel<SceneGraphTimelineModel::SceneGraphEvent,
|
||||
SingleCategoryTimelineModel::SingleCategoryTimelineModelPrivate>
|
||||
AbstractTimelineModel::AbstractTimelineModelPrivate>
|
||||
{
|
||||
public:
|
||||
void addVP(QVariantList &l, QString label, qint64 time) const;
|
||||
@@ -63,7 +63,7 @@ private:
|
||||
};
|
||||
|
||||
SceneGraphTimelineModel::SceneGraphTimelineModel(QObject *parent)
|
||||
: SingleCategoryTimelineModel(new SceneGraphTimelineModelPrivate,
|
||||
: AbstractTimelineModel(new SceneGraphTimelineModelPrivate,
|
||||
QLatin1String("SceneGraphTimeLineModel"), tr("Scene Graph"),
|
||||
QmlDebug::SceneGraphFrame, QmlDebug::MaximumRangeType, parent)
|
||||
{
|
||||
@@ -150,7 +150,7 @@ const QVariantList SceneGraphTimelineModel::getEventDetails(int index) const
|
||||
Q_D(const SceneGraphTimelineModel);
|
||||
QVariantList result;
|
||||
const SortedTimelineModel<SceneGraphEvent,
|
||||
SingleCategoryTimelineModel::SingleCategoryTimelineModelPrivate>::Range *ev =
|
||||
AbstractTimelineModel::AbstractTimelineModelPrivate>::Range *ev =
|
||||
&d->range(index);
|
||||
|
||||
{
|
||||
|
@@ -19,7 +19,7 @@
|
||||
#ifndef SCENEGRAPHTIMELINEMODEL_H
|
||||
#define SCENEGRAPHTIMELINEMODEL_H
|
||||
|
||||
#include "qmlprofiler/singlecategorytimelinemodel.h"
|
||||
#include "qmlprofiler/abstracttimelinemodel.h"
|
||||
#include "qmlprofiler/qmlprofilermodelmanager.h"
|
||||
#include "qmlprofiler/qmlprofilerdatamodel.h"
|
||||
|
||||
@@ -31,7 +31,7 @@ namespace Internal {
|
||||
|
||||
#define timingFieldCount 16
|
||||
|
||||
class SceneGraphTimelineModel : public QmlProfiler::SingleCategoryTimelineModel
|
||||
class SceneGraphTimelineModel : public QmlProfiler::AbstractTimelineModel
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
Reference in New Issue
Block a user