QmlProfiler: Don't register a model ID for the QML model

We never do anything useful with it. This relieves us from the need to
keep the manager around in the QML model and decouples them.

Change-Id: If58fc147b86b07f533aeaaa896f3416d4c0ef6bb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Ulf Hermann
2016-12-28 16:48:07 +01:00
parent 827d48db6e
commit 1cf40ae647
2 changed files with 2 additions and 7 deletions

View File

@@ -48,9 +48,6 @@ public:
int resolveStackTop();
QVector<QmlEventType> eventTypes;
QmlProfilerModelManager *modelManager;
int modelId;
Internal::QmlProfilerDetailsRewriter *detailsRewriter;
Utils::TemporaryFile file;
@@ -94,14 +91,12 @@ QString getInitialDetails(const QmlEventType &event)
return details;
}
QmlProfilerDataModel::QmlProfilerDataModel(QmlProfilerModelManager *parent) :
QmlProfilerDataModel::QmlProfilerDataModel(QObject *parent) :
QObject(parent), d_ptr(new QmlProfilerDataModelPrivate)
{
Q_D(QmlProfilerDataModel);
Q_ASSERT(parent);
d->detailsRewriter = new QmlProfilerDetailsRewriter(this);
d->modelManager = parent;
d->modelId = d->modelManager->registerModelProxy();
connect(d->detailsRewriter, &QmlProfilerDetailsRewriter::rewriteDetailsString,
this, &QmlProfilerDataModel::detailsChanged);
connect(d->detailsRewriter, &QmlProfilerDetailsRewriter::eventDetailsChanged,

View File

@@ -40,7 +40,7 @@ class QMLPROFILER_EXPORT QmlProfilerDataModel : public QObject
{
Q_OBJECT
public:
explicit QmlProfilerDataModel(QmlProfilerModelManager *parent);
explicit QmlProfilerDataModel(QObject *parent = nullptr);
~QmlProfilerDataModel();
const QmlEventType &eventType(int typeId) const;