From 39b7faa11081387d859e531163cfbe3d0967d6fd Mon Sep 17 00:00:00 2001
From: dt_ <qtc-committer@nokia.com>
Date: Thu, 9 Jun 2011 17:43:41 +0200
Subject: [PATCH] Fix first rename after creating a new project
Change-Id: Iec997ba24a11a5035d3f70ce5818d44142f3c5a6
Task-Nr: QTCREATORBUG-5116
Reviewed-on: http://codereview.qt.nokia.com/440
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
---
src/plugins/projectexplorer/projectexplorer.cpp | 2 +-
src/plugins/projectexplorer/projecttreewidget.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 392a75b43be..bfea5520a88 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -2569,7 +2569,7 @@ void ProjectExplorerPlugin::renameFile()
ProjectTreeWidget *treeWidget = qobject_cast<ProjectTreeWidget*>(focusWidget);
if (treeWidget) {
treeWidget->editCurrentItem();
- break;
+ return;
}
focusWidget = focusWidget->parentWidget();
}
diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp
index 37c0e1446e7..2e326022cc6 100644
--- a/src/plugins/projectexplorer/projecttreewidget.cpp
+++ b/src/plugins/projectexplorer/projecttreewidget.cpp
@@ -273,8 +273,8 @@ void ProjectTreeWidget::setAutoSynchronization(bool sync, bool syncNow)
void ProjectTreeWidget::editCurrentItem()
{
- if (!m_view->selectionModel()->selectedIndexes().isEmpty())
- m_view->edit(m_view->selectionModel()->selectedIndexes().first());
+ if (m_view->selectionModel()->currentIndex().isValid())
+ m_view->edit(m_view->selectionModel()->currentIndex());
}
void ProjectTreeWidget::setCurrentItem(Node *node, Project *project)
--
GitLab