From 25e88a161dc9454d38b674c12898b1b4c605815d Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Wed, 9 Apr 2014 16:03:23 +0200
Subject: [PATCH] SideBar: BookmarkView: Support Return/Enter on OS X
Change-Id: Iffbbf345f8ec2ce3152f9be38e6b05e372a7e4b9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
src/plugins/bookmarks/bookmarkmanager.cpp | 6 +++---
src/plugins/bookmarks/bookmarkmanager.h | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp
index 2d9d9133a99..2e779bc4000 100644
--- a/src/plugins/bookmarks/bookmarkmanager.cpp
+++ b/src/plugins/bookmarks/bookmarkmanager.cpp
@@ -212,7 +212,7 @@ void BookmarkDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
}
BookmarkView::BookmarkView(QWidget *parent) :
- QListView(parent),
+ Utils::ListView(parent),
m_bookmarkContext(new BookmarkContext(this)),
m_manager(0)
{
@@ -290,7 +290,7 @@ void BookmarkView::keyPressEvent(QKeyEvent *event)
event->accept();
return;
}
- QListView::keyPressEvent(event);
+ Utils::ListView::keyPressEvent(event);
}
void BookmarkView::removeAll()
@@ -314,7 +314,7 @@ void BookmarkView::setModel(QAbstractItemModel *model)
BookmarkManager *manager = qobject_cast<BookmarkManager *>(model);
QTC_ASSERT(manager, return);
m_manager = manager;
- QListView::setModel(model);
+ Utils::ListView::setModel(model);
setSelectionModel(manager->selectionModel());
setSelectionMode(QAbstractItemView::SingleSelection);
setSelectionBehavior(QAbstractItemView::SelectRows);
diff --git a/src/plugins/bookmarks/bookmarkmanager.h b/src/plugins/bookmarks/bookmarkmanager.h
index 1f1a5fe93a8..61ea756009e 100644
--- a/src/plugins/bookmarks/bookmarkmanager.h
+++ b/src/plugins/bookmarks/bookmarkmanager.h
@@ -30,6 +30,7 @@
#ifndef BOOKMARKMANAGER_H
#define BOOKMARKMANAGER_H
+#include <utils/itemviews.h>
#include <coreplugin/icontext.h>
#include <coreplugin/inavigationwidgetfactory.h>
@@ -137,7 +138,7 @@ private:
QItemSelectionModel *m_selectionModel;
};
-class BookmarkView : public QListView
+class BookmarkView : public Utils::ListView
{
Q_OBJECT
public:
--
GitLab