diff --git a/src/plugins/qmljstools/qmlconsoleview.cpp b/src/plugins/qmljstools/qmlconsoleview.cpp index 4df384161ed..6752c32de67 100644 --- a/src/plugins/qmljstools/qmlconsoleview.cpp +++ b/src/plugins/qmljstools/qmlconsoleview.cpp @@ -79,7 +79,7 @@ public: /////////////////////////////////////////////////////////////////////// QmlConsoleView::QmlConsoleView(QWidget *parent) : - QTreeView(parent) + Utils::TreeView(parent) { setFrameStyle(QFrame::NoFrame); setHeaderHidden(true); @@ -160,28 +160,18 @@ void QmlConsoleView::mousePressEvent(QMouseEvent *event) } } if (!handled) - QTreeView::mousePressEvent(event); + Utils::TreeView::mousePressEvent(event); } else { selectionModel()->setCurrentIndex(model()->index(model()->rowCount() - 1, 0), QItemSelectionModel::ClearAndSelect); } } -void QmlConsoleView::keyPressEvent(QKeyEvent *e) -{ - if (!e->modifiers() && e->key() == Qt::Key_Return) { - emit activated(currentIndex()); - e->accept(); - return; - } - QTreeView::keyPressEvent(e); -} - void QmlConsoleView::resizeEvent(QResizeEvent *e) { static_cast(itemDelegate())->emitSizeHintChanged( selectionModel()->currentIndex()); - QTreeView::resizeEvent(e); + Utils::TreeView::resizeEvent(e); } void QmlConsoleView::drawBranches(QPainter *painter, const QRect &rect, @@ -189,7 +179,7 @@ void QmlConsoleView::drawBranches(QPainter *painter, const QRect &rect, { static_cast(itemDelegate())->drawBackground(painter, rect, index, false); - QTreeView::drawBranches(painter, rect, index); + Utils::TreeView::drawBranches(painter, rect, index); } void QmlConsoleView::contextMenuEvent(QContextMenuEvent *event) diff --git a/src/plugins/qmljstools/qmlconsoleview.h b/src/plugins/qmljstools/qmlconsoleview.h index 41db4f0c018..ccba7ae47f7 100644 --- a/src/plugins/qmljstools/qmlconsoleview.h +++ b/src/plugins/qmljstools/qmlconsoleview.h @@ -30,12 +30,12 @@ #ifndef QMLCONSOLEVIEW_H #define QMLCONSOLEVIEW_H -#include +#include namespace QmlJSTools { namespace Internal { -class QmlConsoleView : public QTreeView +class QmlConsoleView : public Utils::TreeView { Q_OBJECT public: @@ -46,7 +46,6 @@ public slots: protected: void mousePressEvent(QMouseEvent *event); - void keyPressEvent(QKeyEvent *e); void resizeEvent(QResizeEvent *e); void drawBranches(QPainter *painter, const QRect &rect, const QModelIndex &index) const;