QmlProfiler: Integrate QmlProfilerDataModel into model manager

There is no need to keep them separate as the data model is not
accessed from the outside anymore. This removes a lot of indirection.

Change-Id: I91da4dfa816295300c8cfcca22430d5c5b3298c0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

src/plugins/qmlprofiler/qmlprofiler.pro

@@ -21,7 +21,6 @@ SOURCES += \
     qmlprofilerbindingloopsrenderpass.cpp \
     qmlprofilerclientmanager.cpp \
     qmlprofilerconfigwidget.cpp \
-    qmlprofilerdatamodel.cpp \
     qmlprofilerdetailsrewriter.cpp \
     qmlprofilermodelmanager.cpp \
     qmlprofilernotesmodel.cpp \
@@ -65,7 +64,6 @@ HEADERS += \
     qmlprofilerclientmanager.h \
     qmlprofilerconfigwidget.h \
     qmlprofilerconstants.h \
-    qmlprofilerdatamodel.h \
     qmlprofilerdetailsrewriter.h \
     qmlprofilereventsview.h \
     qmlprofilereventtypes.h \

src/plugins/qmlprofiler/qmlprofiler.qbs

@@ -38,7 +38,6 @@ QtcPlugin {
             "qmlprofilerclientmanager.cpp", "qmlprofilerclientmanager.h",
             "qmlprofilerconfigwidget.cpp", "qmlprofilerconfigwidget.h",
             "qmlprofilerconfigwidget.ui", "qmlprofilerconstants.h",
-            "qmlprofilerdatamodel.cpp", "qmlprofilerdatamodel.h",
             "qmlprofilerdetailsrewriter.cpp", "qmlprofilerdetailsrewriter.h",
             "qmlprofilereventsview.h",
             "qmlprofilereventtypes.h",

src/plugins/qmlprofiler/qmlprofilerdatamodel.h

-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** 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 The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-****************************************************************************/
-
-#pragma once
-
-#include "qmlprofilermodelmanager.h"
-#include "qmlprofilereventtypes.h"
-#include "qmleventlocation.h"
-#include "qmleventtype.h"
-#include "qmlevent.h"
-
-#include <utils/fileinprojectfinder.h>
-#include <projectexplorer/runconfiguration.h>
-
-namespace QmlProfiler {
-
-class QMLPROFILER_EXPORT QmlProfilerDataModel : public QObject
-{
-    Q_OBJECT
-public:
-    explicit QmlProfilerDataModel(QObject *parent = nullptr);
-    ~QmlProfilerDataModel();
-
-    const QmlEventType &eventType(int typeId) const;
-    const QVector<QmlEventType> &eventTypes() const;
-    void addEventTypes(const QVector<QmlEventType> &types);
-    void addEventType(const QmlEventType &type);
-
-    void populateFileFinder(const ProjectExplorer::RunConfiguration *runConfiguration = nullptr);
-    QString findLocalFile(const QString &remoteFile);
-
-    void clear();
-    bool isEmpty() const;
-    void addEvent(const QmlEvent &event);
-    void addEvents(const QVector<QmlEvent> &events);
-    bool replayEvents(qint64 startTime, qint64 endTime,
-                      QmlProfilerModelManager::EventLoader loader) const;
-    void finalize();
-
-signals:
-    void allTypesLoaded();
-    void traceFileError();
-
-protected slots:
-    void detailsChanged(int typeId, const QString &newString);
-
-private:
-    class QmlProfilerDataModelPrivate;
-    QmlProfilerDataModelPrivate *d_ptr;
-    Q_DECLARE_PRIVATE(QmlProfilerDataModel)
-};
-
-} // namespace QmlProfiler

src/plugins/qmlprofiler/qmlprofilermodelmanager.h

@@ -115,7 +115,7 @@ public:
     void addEventType(const QmlEventType &type);
     const QVector<QmlEventType> &eventTypes() const;
 
-    bool replayEvents(qint64 startTime, qint64 endTime, EventLoader loader) const;
+    bool replayEvents(qint64 rangeStart, qint64 rangeEnd, EventLoader loader) const;
 
     quint64 availableFeatures() const;
     quint64 visibleFeatures() const;
@@ -155,6 +155,7 @@ public slots:
 
 private:
     void setState(State state);
+    void detailsChanged(int typeId, const QString &newString);
 
 private:
     class QmlProfilerModelManagerPrivate;