From 29aa6e9d15a28e9a384d6a70585a43888745d34b Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Wed, 17 Feb 2010 13:46:40 +0100
Subject: Prevent renaming the bookmarks menu root item, it's just a
 placeholder.

Reviewed-by: ck
---
 tools/assistant/tools/assistant/bookmarkdialog.cpp | 20 ++++++++++++++++----
 tools/assistant/tools/assistant/bookmarkdialog.h   |  1 +
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/tools/assistant/tools/assistant/bookmarkdialog.cpp b/tools/assistant/tools/assistant/bookmarkdialog.cpp
index c053b62..8b195c1 100644
--- a/tools/assistant/tools/assistant/bookmarkdialog.cpp
+++ b/tools/assistant/tools/assistant/bookmarkdialog.cpp
@@ -105,6 +105,11 @@ BookmarkDialog::~BookmarkDialog()
     TRACE_OBJ
 }
 
+bool BookmarkDialog::isRootItem(const QModelIndex &index) const
+{
+    return !bookmarkTreeModel->parent(index).isValid();
+}
+
 bool BookmarkDialog::eventFilter(QObject *object, QEvent *event)
 {
     TRACE_OBJ
@@ -115,9 +120,12 @@ bool BookmarkDialog::eventFilter(QObject *object, QEvent *event)
         QKeyEvent *ke = static_cast<QKeyEvent*>(event);
         switch (ke->key()) {
             case Qt::Key_F2: {
-                bookmarkModel->setItemsEditable(true);
-                ui.treeView->edit(ui.treeView->currentIndex());
-                bookmarkModel->setItemsEditable(false);
+                const QModelIndex &index = ui.treeView->currentIndex();
+                if (!isRootItem(index)) {
+                    bookmarkModel->setItemsEditable(true);
+                    ui.treeView->edit(index);
+                    bookmarkModel->setItemsEditable(false);
+                }
             }   break;
             default: break;
         }
@@ -212,13 +220,17 @@ void BookmarkDialog::textChanged(const QString& text)
 void BookmarkDialog::customContextMenuRequested(const QPoint &point)
 {
     TRACE_OBJ
+    const QModelIndex &index = ui.treeView->currentIndex();
+    if (isRootItem(index))
+        return; // check if we go to rename the "Bookmarks Menu", bail
+
     QMenu menu(QLatin1String(""), this);
     QAction *renameItem = menu.addAction(tr("Rename Folder"));
 
     QAction *picked = menu.exec(ui.treeView->mapToGlobal(point));
     if (picked == renameItem) {
         bookmarkModel->setItemsEditable(true);
-        ui.treeView->edit(ui.treeView->currentIndex());
+        ui.treeView->edit(index);
         bookmarkModel->setItemsEditable(false);
     }
 }
diff --git a/tools/assistant/tools/assistant/bookmarkdialog.h b/tools/assistant/tools/assistant/bookmarkdialog.h
index ba38c7a..e177af6 100644
--- a/tools/assistant/tools/assistant/bookmarkdialog.h
+++ b/tools/assistant/tools/assistant/bookmarkdialog.h
@@ -58,6 +58,7 @@ public:
     ~BookmarkDialog();
 
 private:
+    bool isRootItem(const QModelIndex &index) const;
     bool eventFilter(QObject *object, QEvent *event);
 
 private slots:
-- 
cgit v0.12