QmlProfiler: Unify QML and V8 data models

There is no real reason for the existence of a QmlProfilerSimpleModel. Change-Id: I6419973cfad5564913bf92f17fdcf7e529af4b01 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-02-18 17:32:20 +01:00
parent 133199a033
commit 58e3c9ed05
29 changed files with 246 additions and 403 deletions
--- a/src/plugins/qmlprofiler/qmlprofilerdatamodel.h
+++ b/src/plugins/qmlprofiler/qmlprofilerdatamodel.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef QMLPROFILERDATAMODEL_H
+#define QMLPROFILERDATAMODEL_H
+
+#include "qmlprofilerbasemodel.h"
+
+namespace QmlProfiler {
+
+class QMLPROFILER_EXPORT QmlProfilerDataModel : public QmlProfilerBaseModel
+{
+    Q_OBJECT
+public:
+    struct QmlEventData {
+        QString displayName;
+        int eventType;
+        int bindingType;
+        qint64 startTime;
+        qint64 duration;
+        QStringList data;
+        QmlDebug::QmlEventLocation location;
+        qint64 numericData1;
+        qint64 numericData2;
+        qint64 numericData3;
+        qint64 numericData4;
+        qint64 numericData5;
+    };
+
+    explicit QmlProfilerDataModel(Utils::FileInProjectFinder *fileFinder, QmlProfilerModelManager *parent = 0);
+
+    const QVector<QmlEventData> &getEvents() const;
+    int count() const;
+    virtual void clear();
+    virtual bool isEmpty() const;
+    virtual void complete();
+    void addQmlEvent(int type, int bindingType, qint64 startTime, qint64 duration,
+                     const QStringList &data, const QmlDebug::QmlEventLocation &location,
+                     qint64 ndata1, qint64 ndata2, qint64 ndata3, qint64 ndata4, qint64 ndata5);
+    static QString getHashString(const QmlProfilerDataModel::QmlEventData &event);
+    qint64 lastTimeMark() const;
+
+protected slots:
+    void detailsChanged(int requestId, const QString &newString);
+
+private:
+    QVector<QmlEventData> m_eventList;
+};
+
+}
+
+#endif