X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fnickview.cpp;h=5adaf73027aac2d079aeb8f9c4c1a0eb97afe6ac;hp=fa17ad756ebed76965da7bdf2c393fb6088a6c81;hb=e2188dc438be6f3eb0d9cdf47d28821aefe9835e;hpb=e50ae7a06fc4e5d3a911c361d30953410deab609

diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp
index fa17ad75..5adaf730 100644
--- a/src/uisupport/nickview.cpp
+++ b/src/uisupport/nickview.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -36,7 +36,7 @@
 #include "types.h"
 
 NickView::NickView(QWidget *parent)
-    : QTreeView(parent)
+    : TreeViewTouch(parent)
 {
     setIndentation(10);
     header()->hide();
@@ -47,17 +47,15 @@ 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
-    connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(startQuery(QModelIndex)));
-#else
+#if defined Q_OS_MACOS || defined Q_OS_WIN
     // afaik this is better on Mac and Windows
     connect(this, SIGNAL(activated(QModelIndex)), SLOT(startQuery(QModelIndex)));
+#else
+    connect(this, SIGNAL(doubleClicked(QModelIndex)), SLOT(startQuery(QModelIndex)));
 #endif
 }
 
@@ -78,16 +76,16 @@ void NickView::init()
 void NickView::setModel(QAbstractItemModel *model_)
 {
     if (model())
-        disconnect(model(), 0, this, 0);
+        disconnect(model(), nullptr, this, nullptr);
 
-    QTreeView::setModel(model_);
+    TreeViewTouch::setModel(model_);
     init();
 }
 
 
 void NickView::rowsInserted(const QModelIndex &parent, int start, int end)
 {
-    QTreeView::rowsInserted(parent, start, end);
+    TreeViewTouch::rowsInserted(parent, start, end);
     if (model()->data(parent, NetworkModel::ItemTypeRole) == NetworkModel::UserCategoryItemType && !isExpanded(parent)) {
         unanimatedExpandAll();
     }
@@ -104,7 +102,7 @@ void NickView::setRootIndex(const QModelIndex &index)
 
 QModelIndexList NickView::selectedIndexes() const
 {
-    QModelIndexList indexList = QTreeView::selectedIndexes();
+    QModelIndexList indexList = TreeViewTouch::selectedIndexes();
 
     // make sure the item we clicked on is first
     if (indexList.contains(currentIndex())) {
@@ -143,7 +141,7 @@ void NickView::startQuery(const QModelIndex &index)
     if (index.data(NetworkModel::ItemTypeRole) != NetworkModel::IrcUserItemType)
         return;
 
-    IrcUser *ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
+    auto *ircUser = qobject_cast<IrcUser *>(index.data(NetworkModel::IrcUserRole).value<QObject *>());
     NetworkId networkId = index.data(NetworkModel::NetworkIdRole).value<NetworkId>();
     if (!ircUser || !networkId.isValid())
         return;