From 137c0ca673a115b414449862ae0c4c215184a354 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 23 Apr 2020 13:40:59 +0200 Subject: [PATCH] QmlDesigner: Fix clang warning src/plugins/qmldesigner/components/curveeditor/detail/selectionmodel.h: 62: warning: 'DesignTools::SelectionModel::select' hides overloaded virtual function [-Woverloaded-virtual] void select(const std::vector &selection); ^ Change-Id: I68266a4281dca62c1c07940a981cfd1aff870ec8 Reviewed-by: Thomas Hartmann --- .../qmldesigner/components/curveeditor/curveeditormodel.cpp | 2 +- .../components/curveeditor/detail/selectionmodel.cpp | 2 +- .../qmldesigner/components/curveeditor/detail/selectionmodel.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditormodel.cpp b/src/plugins/qmldesigner/components/curveeditor/curveeditormodel.cpp index 2d87bd76d9c..5c2796016df 100644 --- a/src/plugins/qmldesigner/components/curveeditor/curveeditormodel.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/curveeditormodel.cpp @@ -111,7 +111,7 @@ void CurveEditorModel::reset(const std::vector &items) graphicsView()->reset(pinned); if (SelectionModel *sm = selectionModel()) - sm->select(sel); + sm->selectPaths(sel); } } // End namespace DesignTools. diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/selectionmodel.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/selectionmodel.cpp index 74b765843fd..d35b0c31422 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/selectionmodel.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/selectionmodel.cpp @@ -98,7 +98,7 @@ std::vector SelectionModel::selectedPropertyItems() const return items; } -void SelectionModel::select(const std::vector &selection) +void SelectionModel::selectPaths(const std::vector &selection) { for (auto &&path : selection) { if (auto *treeModel = qobject_cast(model())) { diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/selectionmodel.h b/src/plugins/qmldesigner/components/curveeditor/detail/selectionmodel.h index 80b32db995d..5a9a52ba072 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/selectionmodel.h +++ b/src/plugins/qmldesigner/components/curveeditor/detail/selectionmodel.h @@ -59,7 +59,7 @@ public: std::vector selectedPropertyItems() const; - void select(const std::vector &selection); + void selectPaths(const std::vector &selection); private: void changeSelection(const QItemSelection &selected, const QItemSelection &deselected);