From 1f46fca3058560afc21e3f106fb17be78b0795a3 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@digia.com>
Date: Tue, 8 Jul 2014 12:49:56 +0200
Subject: [PATCH] QmlProfiler: Remove getState() methods
A numerical representation of "state" is not so useful after all.
Change-Id: I7fc3ae08a2fd44000b5543f4ba25730a8d79358d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---
src/plugins/qmlprofiler/abstracttimelinemodel.cpp | 6 ------
src/plugins/qmlprofiler/abstracttimelinemodel.h | 1 -
src/plugins/qmlprofiler/qml/MainView.qml | 7 +------
src/plugins/qmlprofiler/timelinemodelaggregator.cpp | 6 ------
src/plugins/qmlprofiler/timelinemodelaggregator.h | 1 -
5 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/src/plugins/qmlprofiler/abstracttimelinemodel.cpp b/src/plugins/qmlprofiler/abstracttimelinemodel.cpp
index 7597cc8e586..2fa63948c5a 100644
--- a/src/plugins/qmlprofiler/abstracttimelinemodel.cpp
+++ b/src/plugins/qmlprofiler/abstracttimelinemodel.cpp
@@ -190,12 +190,6 @@ qint64 AbstractTimelineModel::traceDuration() const
return d->modelManager->traceTime()->duration();
}
-int AbstractTimelineModel::getState() const
-{
- Q_D(const AbstractTimelineModel);
- return (int)d->modelManager->state();
-}
-
const QVariantMap AbstractTimelineModel::getEventLocation(int index) const
{
Q_UNUSED(index);
diff --git a/src/plugins/qmlprofiler/abstracttimelinemodel.h b/src/plugins/qmlprofiler/abstracttimelinemodel.h
index 360118179a9..7fae5adb38e 100644
--- a/src/plugins/qmlprofiler/abstracttimelinemodel.h
+++ b/src/plugins/qmlprofiler/abstracttimelinemodel.h
@@ -62,7 +62,6 @@ public:
Q_INVOKABLE qint64 traceStartTime() const;
Q_INVOKABLE qint64 traceEndTime() const;
Q_INVOKABLE qint64 traceDuration() const;
- Q_INVOKABLE int getState() const;
Q_INVOKABLE qint64 getDuration(int index) const;
Q_INVOKABLE qint64 getStartTime(int index) const;
Q_INVOKABLE qint64 getEndTime(int index) const;
diff --git a/src/plugins/qmlprofiler/qml/MainView.qml b/src/plugins/qmlprofiler/qml/MainView.qml
index d9c60d08396..4059bf640f7 100644
--- a/src/plugins/qmlprofiler/qml/MainView.qml
+++ b/src/plugins/qmlprofiler/qml/MainView.qml
@@ -76,12 +76,6 @@ Rectangle {
Connections {
target: qmlProfilerModelProxy
- onStateChanged: {
- // Clear if model is empty.
- if (qmlProfilerModelProxy.getState() === 0)
- root.clear();
- backgroundMarks.requestPaint()
- }
onDataAvailable: {
view.clearData();
zoomControl.setRange(qmlProfilerModelProxy.traceStartTime(),
@@ -89,6 +83,7 @@ Rectangle {
qmlProfilerModelProxy.traceDuration()/10);
view.requestPaint();
}
+ onStateChanged: backgroundMarks.requestPaint()
onExpandedChanged: backgroundMarks.requestPaint()
onRowHeightChanged: backgroundMarks.requestPaint()
}
diff --git a/src/plugins/qmlprofiler/timelinemodelaggregator.cpp b/src/plugins/qmlprofiler/timelinemodelaggregator.cpp
index 8744892455d..19111dd64f2 100644
--- a/src/plugins/qmlprofiler/timelinemodelaggregator.cpp
+++ b/src/plugins/qmlprofiler/timelinemodelaggregator.cpp
@@ -286,11 +286,5 @@ qint64 TimelineModelAggregator::traceDuration() const
return d->modelManager->traceTime()->duration();
}
-int TimelineModelAggregator::getState() const
-{
- return (int)d->modelManager->state();
-}
-
-
} // namespace Internal
} // namespace QmlProfiler
diff --git a/src/plugins/qmlprofiler/timelinemodelaggregator.h b/src/plugins/qmlprofiler/timelinemodelaggregator.h
index 90a18fc198a..cfb6f6f0dea 100644
--- a/src/plugins/qmlprofiler/timelinemodelaggregator.h
+++ b/src/plugins/qmlprofiler/timelinemodelaggregator.h
@@ -54,7 +54,6 @@ public:
Q_INVOKABLE qint64 traceStartTime() const;
Q_INVOKABLE qint64 traceEndTime() const;
Q_INVOKABLE qint64 traceDuration() const;
- Q_INVOKABLE int getState() const;
bool isEmpty() const;
--
GitLab