feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Adapt to renaming in IContext

Browse Source 
Change-Id: I93d59f9a0428fc3cbd7ed5498a208960cf34d78e
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Thomas Hartmann
2019-01-31 15:36:38 +01:00
parent a235d33837
commit 536618b012
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinecontext.cpp
View File

@@ -36,10 +36,10 @@ TimelineContext::TimelineContext(QWidget *widget)
setContext(Core::Context(TimelineConstants::C_QMLTIMELINE)); setContext(Core::Context(TimelineConstants::C_QMLTIMELINE));
} }
void TimelineContext::contextHelpId(const Core::IContext::HelpIdCallback &callback) const void TimelineContext::contextHelp(const Core::IContext::HelpCallback &callback) const
{ {
if (auto *widget = qobject_cast<TimelineWidget *>(m_widget)) if (auto *widget = qobject_cast<TimelineWidget *>(m_widget))
widget->contextHelpId(callback); widget->contextHelp(callback);
} }
} // namespace QmlDesigner } // namespace QmlDesigner

2
src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinecontext.h
View File

@@ -37,7 +37,7 @@ class TimelineContext : public Core::IContext
public: public:
explicit TimelineContext(QWidget *widget); explicit TimelineContext(QWidget *widget);
void contextHelpId(const Core::IContext::HelpIdCallback &callback) const override; void contextHelp(const HelpCallback &callback) const override;
}; };
} // namespace QmlDesigner } // namespace QmlDesigner

6
src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinewidget.cpp
View File

@@ -315,12 +315,12 @@ void TimelineWidget::setTimelineRecording(bool value)
graphicsScene()->invalidateRecordButtonsStatus(); graphicsScene()->invalidateRecordButtonsStatus();
} }
void TimelineWidget::contextHelpId(const Core::IContext::HelpIdCallback &callback) const void TimelineWidget::contextHelp(const Core::IContext::HelpCallback &callback) const
{ {
if (timelineView()) if (timelineView())
timelineView()->contextHelpId(callback); timelineView()->contextHelp(callback);
else else
callback(QString()); callback({});
} }
void TimelineWidget::init() void TimelineWidget::init()

2
src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinewidget.h
View File

@@ -54,7 +54,7 @@ class TimelineWidget : public QWidget
public: public:
explicit TimelineWidget(TimelineView *view); explicit TimelineWidget(TimelineView *view);
void contextHelpId(const Core::IContext::HelpIdCallback &callback) const; void contextHelp(const Core::IContext::HelpCallback &callback) const;
TimelineGraphicsScene *graphicsScene() const; TimelineGraphicsScene *graphicsScene() const;
TimelineView *timelineView() const; TimelineView *timelineView() const;