From 2e5d91d9de97f41858cb38393252c60fd4f142f3 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 11 May 2017 20:38:39 +0200 Subject: [PATCH] QmlDesigner: Fix function name Change-Id: Ie32583be28bca622c668de7a89a206aeca745683 Reviewed-by: Tim Jenssen --- .../qmldesigner/components/navigator/navigatortreemodel.cpp | 4 ++-- .../qmldesigner/components/navigator/navigatorview.cpp | 2 +- src/plugins/qmldesigner/components/navigator/navigatorview.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index f8899de8c8f..f745b5fa0fa 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -210,7 +210,7 @@ QVariant NavigatorTreeModel::data(const QModelIndex &index, int role) const return QVariant(); if (role == ItemIsVisibleRole) //independent of column - return m_view->isNodeVisible(modelNode) ? Qt::Unchecked : Qt::Checked; + return m_view->isNodeInvisible(modelNode) ? Qt::Unchecked : Qt::Checked; if (index.column() == 0) { if (role == Qt::DisplayRole) { @@ -245,7 +245,7 @@ QVariant NavigatorTreeModel::data(const QModelIndex &index, int role) const "This is independent of the visibility property in QML."); } else if (index.column() == 2) { //visible if (role == Qt::CheckStateRole) - return m_view->isNodeVisible(modelNode) ? Qt::Unchecked : Qt::Checked; + return m_view->isNodeInvisible(modelNode) ? Qt::Unchecked : Qt::Checked; else if (role == Qt::ToolTipRole) return tr("Toggles whether this item is exported as an " "alias property of the root item."); diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index 88ff67aa0ce..3db86f70091 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -197,7 +197,7 @@ void NavigatorView::handleChangedExport(const ModelNode &modelNode, bool exporte } } -bool NavigatorView::isNodeVisible(const ModelNode &modelNode) const +bool NavigatorView::isNodeInvisible(const ModelNode &modelNode) const { return modelNode.auxiliaryData("invisible").toBool(); } diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.h b/src/plugins/qmldesigner/components/navigator/navigatorview.h index 2bb5f37bfaa..24c65f2eeb8 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.h +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.h @@ -85,7 +85,7 @@ public: void bindingPropertiesChanged(const QList &propertyList, PropertyChangeFlags) override; void handleChangedExport(const ModelNode &modelNode, bool exported); - bool isNodeVisible(const ModelNode &modelNode) const; + bool isNodeInvisible(const ModelNode &modelNode) const; private: ModelNode modelNodeForIndex(const QModelIndex &modelIndex) const;