From 7a4d4c2c0e875eb64388995e5cb2cc04d2d2af68 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 19 Mar 2019 17:11:51 +0100 Subject: [PATCH] QmlDesigner.Timeline: Change method name The name setRecording() was missleading. The mehtod sets if a timeline is generally active or not. Change-Id: I3e7369ad21a06a032e231e71e838b3e531cfe848 Reviewed-by: Tim Jenssen --- .../qmldesignerextension/timelineeditor/timelinewidget.cpp | 6 +++--- .../qmldesignerextension/timelineeditor/timelinewidget.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinewidget.cpp b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinewidget.cpp index 14780137e1d..8a58eb7dcf5 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinewidget.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinewidget.cpp @@ -260,7 +260,7 @@ void TimelineWidget::connectToolbar() } } - setRecording(false); + setTimelineActive(false); } int TimelineWidget::adjacentFrame(const std::function &, qreal)> &fun) const @@ -393,7 +393,7 @@ void TimelineWidget::setupScrollbar(int min, int max, int current) void TimelineWidget::setTimelineId(const QString &id) { - setRecording(!m_timelineView->getTimelines().isEmpty()); + setTimelineActive(!m_timelineView->getTimelines().isEmpty()); if (m_timelineView->isAttached()) { m_toolbar->setCurrentTimeline(m_timelineView->modelNodeForId(id)); m_toolbar->setCurrentState(m_timelineView->currentState().name()); @@ -401,7 +401,7 @@ void TimelineWidget::setTimelineId(const QString &id) } } -void TimelineWidget::setRecording(bool b) +void TimelineWidget::setTimelineActive(bool b) { if (b) { m_toolbar->setVisible(true); diff --git a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinewidget.h b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinewidget.h index 8ee43098809..3fd299a88a7 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinewidget.h +++ b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinewidget.h @@ -68,7 +68,7 @@ public: void setupScrollbar(int min, int max, int current); void setTimelineId(const QString &id); - void setRecording(bool b); + void setTimelineActive(bool b); public slots: void selectionChanged();