From: Manuel Nickschas Date: Sun, 11 Jan 2009 13:47:12 +0000 (+0100) Subject: Revert "Properly focus BufferView on first click" X-Git-Tag: 0.4.0~242 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=0abe45a62eb5d9c8e1d8c0e783d77e07e705235b Revert "Properly focus BufferView on first click" Turns out that the side effect of the input line losing focus on bufferswitch seems to be more confusing than the issue fixed by this commit, so I revert this. This reverts commit a35e9270e608bfbc5b21ba47d49b3139f06b13e9. --- diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h index 2d80e641..1419652c 100644 --- a/src/qtui/mainwin.h +++ b/src/qtui/mainwin.h @@ -67,7 +67,6 @@ class MainWin BufferView *allBuffersView() const; inline QSystemTrayIcon *systemTrayIcon() const; - inline BufferWidget *bufferWidget() const; virtual bool event(QEvent *event); @@ -170,8 +169,4 @@ QSystemTrayIcon *MainWin::systemTrayIcon() const { return _trayIcon; } -BufferWidget *MainWin::bufferWidget() const { - return _bufferWidget; -} - #endif diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp index 74552696..c06e7d20 100644 --- a/src/uisupport/bufferview.cpp +++ b/src/uisupport/bufferview.cpp @@ -86,7 +86,6 @@ BufferView::BufferView(QWidget *parent) { connect(this, SIGNAL(collapsed(const QModelIndex &)), SLOT(on_collapse(const QModelIndex &))); connect(this, SIGNAL(expanded(const QModelIndex &)), SLOT(on_expand(const QModelIndex &))); - connect(this, SIGNAL(clicked(const QModelIndex &)), SLOT(on_clicked(const QModelIndex &))); setSelectionMode(QAbstractItemView::ExtendedSelection); @@ -355,11 +354,6 @@ void BufferView::on_configChanged() { return; } -void BufferView::on_clicked(const QModelIndex &index) { - Q_UNUSED(index); - setFocus(Qt::MouseFocusReason); -} - void BufferView::on_collapse(const QModelIndex &index) { storeExpandedState(index.data(NetworkModel::NetworkIdRole).value(), false); } diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h index 12bb9024..4e83369e 100644 --- a/src/uisupport/bufferview.h +++ b/src/uisupport/bufferview.h @@ -78,7 +78,6 @@ private slots: void on_collapse(const QModelIndex &index); void on_expand(const QModelIndex &index); - void on_clicked(const QModelIndex &index); void on_configChanged(); private: