From b12617961183096b234f2cf9fd67a8653fe72e08 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 16 Sep 2014 18:55:32 +0300 Subject: [PATCH] QmlDesigner: Fix compiler warnings navigatorview.cpp:297: warning: unused parameter 'oldIndex' navigatortreemodel.cpp:344: warning: 'void QmlDesigner::findTargetItem(. ..)' defined but not used Change-Id: I02183215f766a31fea63da15c7d79c1dd563d840 Reviewed-by: Thomas Hartmann Reviewed-by: Tim Jenssen --- .../navigator/navigatortreemodel.cpp | 22 ------------------- .../components/navigator/navigatorview.cpp | 2 +- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index 9dc880c099..bd65c22dca 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -341,28 +341,6 @@ void NavigatorTreeModel::updateItemRow(const ModelNode &node) updateItemRow(node, itemRowForNode(node)); } -static void findTargetItem(const NodeListProperty &listProperty, - const ItemRow ¤tItemRow, - NavigatorTreeModel *navigatorTreeModel, - int *newRowNumber, - QStandardItem **targetItem) -{ - Q_UNUSED(newRowNumber); - if (navigatorTreeModel->isInTree(listProperty.parentModelNode())) { - ItemRow parentRow = navigatorTreeModel->itemRowForNode(listProperty.parentModelNode()); - if (parentRow.propertyItems.contains(listProperty.name())) { - *targetItem = parentRow.propertyItems.value(listProperty.name()); - } else { // default property - *targetItem = parentRow.idItem; -#ifndef DISABLE_VISIBLE_PROPERTIES - newRowNumber += visibleProperties(listProperty.parentModelNode()).count(); -#endif - } - } else { - *targetItem = currentItemRow.idItem->parent(); - } -} - static void handleWrongId(QStandardItem *item, const ModelNode &modelNode, const QString &errorTitle, const QString &errorMessage, NavigatorTreeModel *treeModel) { QMessageBox::warning(Core::ICore::dialogParent(), errorTitle, errorMessage); diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index 4e3a517ade..77dcc2c1a3 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -294,7 +294,7 @@ void NavigatorView::instancesToken(const QString &/*tokenName*/, int /*tokenNumb } -void NavigatorView::nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &node, int oldIndex) +void NavigatorView::nodeOrderChanged(const NodeListProperty &listProperty, const ModelNode &node, int /*oldIndex*/) { if (m_treeModel->isInTree(node)) { m_treeModel->removeSubTree(listProperty.parentModelNode()); -- GitLab