X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fnickview.cpp;h=34fb554ec39bde4ac6915013e77af92acd4a77bc;hb=a4251618e99c35f727c526f8480055d5a9c5e41f;hp=11b40c72b3bde2267a15fc9e73019b017c4f9843;hpb=f0502bc0352f04ba9146601f802ddeed8a9b907b;p=quassel.git

diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp
index 11b40c72..34fb554e 100644
--- a/src/uisupport/nickview.cpp
+++ b/src/uisupport/nickview.cpp
@@ -44,7 +44,6 @@ NickView::NickView(QWidget *parent)
   : QTreeView(parent)
 {
   setIndentation(10);
-  setAnimated(true);
   header()->hide();
   setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
   setSortingEnabled(true);
@@ -53,6 +52,10 @@ NickView::NickView(QWidget *parent)
   setContextMenuPolicy(Qt::CustomContextMenu);
   setSelectionMode(QAbstractItemView::ExtendedSelection);
 
+  // breaks with Qt 4.8
+  if(QString("4.8.0") > qVersion()) // FIXME breaks with Qt versions >= 4.10!
+    setAnimated(true);
+
   connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), SLOT(showContextMenu(const QPoint&)));
 
 #if defined Q_WS_QWS || defined Q_WS_X11
@@ -124,11 +127,7 @@ void NickView::startQuery(const QModelIndex &index) {
   if(!ircUser || !networkId.isValid())
     return;
 
-  BufferId bufId = Client::networkModel()->bufferId(networkId, ircUser->nick());
-  if(bufId.isValid())
-    Client::bufferModel()->switchToBuffer(bufId);
-  else
-    Client::userInput(index.data(NetworkModel::BufferInfoRole).value<BufferInfo>(), QString("/QUERY %1").arg(ircUser->nick()));
+  Client::bufferModel()->switchToOrStartQuery(networkId, ircUser->nick());
 }
 
 void NickView::customEvent(QEvent *event) {