X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.cpp;h=da7d0371c7b27641af450d3a4ab13985de25863a;hp=7973785e1b332b9237c9fff4570c9d9ff9183b6a;hb=d57c91811b8f989bcaa4d5a238c65e9ffcc3b1d4;hpb=e50ae7a06fc4e5d3a911c361d30953410deab609

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 7973785e..da7d0371 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -45,9 +45,9 @@
 * The TreeView showing the Buffers
 *****************************************/
 // Please be carefull when reimplementing methods which are used to inform the view about changes to the data
-// to be on the safe side: call QTreeView's method aswell
+// to be on the safe side: call QTreeView's method aswell (or TreeViewTouch's)
 BufferView::BufferView(QWidget *parent)
-    : QTreeView(parent)
+    : TreeViewTouch(parent)
 {
     connect(this, SIGNAL(collapsed(const QModelIndex &)), SLOT(storeExpandedState(const QModelIndex &)));
     connect(this, SIGNAL(expanded(const QModelIndex &)), SLOT(storeExpandedState(const QModelIndex &)));
@@ -104,7 +104,7 @@ void BufferView::setModel(QAbstractItemModel *model)
 {
     delete selectionModel();
 
-    QTreeView::setModel(model);
+    TreeViewTouch::setModel(model);
     init();
     // remove old Actions
     QList<QAction *> oldactions = header()->actions();
@@ -158,21 +158,6 @@ void BufferView::setFilteredModel(QAbstractItemModel *model_, BufferViewConfig *
 }
 
 
-void BufferView::setSelectionModel(QItemSelectionModel *selectionModel)
-{
-    if (QTreeView::selectionModel())
-        disconnect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
-            model(), SIGNAL(checkPreviousCurrentForRemoval(QModelIndex, QModelIndex)));
-
-    QTreeView::setSelectionModel(selectionModel);
-    BufferViewFilter *filter = qobject_cast<BufferViewFilter *>(model());
-    if (filter) {
-        connect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
-            filter, SLOT(checkPreviousCurrentForRemoval(QModelIndex, QModelIndex)));
-    }
-}
-
-
 void BufferView::setConfig(BufferViewConfig *config)
 {
     if (_config == config)
@@ -232,7 +217,7 @@ void BufferView::keyPressEvent(QKeyEvent *event)
         event->accept();
         removeSelectedBuffers();
     }
-    QTreeView::keyPressEvent(event);
+    TreeViewTouch::keyPressEvent(event);
 }
 
 
@@ -247,27 +232,23 @@ void BufferView::dropEvent(QDropEvent *event)
     const int margin = 2;
     if (cursorPos.y() - indexRect.top() < margin
         || indexRect.bottom() - cursorPos.y() < margin)
-        return QTreeView::dropEvent(event);
+        return TreeViewTouch::dropEvent(event);
 
     QList<QPair<NetworkId, BufferId> > bufferList = Client::networkModel()->mimeDataToBufferList(event->mimeData());
     if (bufferList.count() != 1)
-        return QTreeView::dropEvent(event);
+        return TreeViewTouch::dropEvent(event);
 
-    NetworkId networkId = bufferList[0].first;
     BufferId bufferId2 = bufferList[0].second;
 
     if (index.data(NetworkModel::ItemTypeRole) != NetworkModel::BufferItemType)
-        return QTreeView::dropEvent(event);
+        return TreeViewTouch::dropEvent(event);
 
     if (index.data(NetworkModel::BufferTypeRole) != BufferInfo::QueryBuffer)
-        return QTreeView::dropEvent(event);
-
-    if (index.data(NetworkModel::NetworkIdRole).value<NetworkId>() != networkId)
-        return QTreeView::dropEvent(event);
+        return TreeViewTouch::dropEvent(event);
 
     BufferId bufferId1 = index.data(NetworkModel::BufferIdRole).value<BufferId>();
     if (bufferId1 == bufferId2)
-        return QTreeView::dropEvent(event);
+        return TreeViewTouch::dropEvent(event);
 
     int res = QMessageBox::question(0, tr("Merge buffers permanently?"),
         tr("Do you want to merge the buffer \"%1\" permanently into buffer \"%2\"?\n This cannot be reversed!").arg(Client::networkModel()->bufferName(bufferId2)).arg(Client::networkModel()->bufferName(bufferId1)),
@@ -307,7 +288,7 @@ void BufferView::removeSelectedBuffers(bool permanently)
 
 void BufferView::rowsInserted(const QModelIndex &parent, int start, int end)
 {
-    QTreeView::rowsInserted(parent, start, end);
+    TreeViewTouch::rowsInserted(parent, start, end);
 
     // ensure that newly inserted network nodes are expanded per default
     if (parent.data(NetworkModel::ItemTypeRole) != NetworkModel::NetworkItemType)
@@ -395,11 +376,11 @@ void BufferView::setExpandedState(const QModelIndex &networkIdx)
 #if QT_VERSION < 0x050000
 void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
 {
-    QTreeView::dataChanged(topLeft, bottomRight);
+    TreeViewTouch::dataChanged(topLeft, bottomRight);
 #else
 void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles)
 {
-    QTreeView::dataChanged(topLeft, bottomRight, roles);
+    TreeViewTouch::dataChanged(topLeft, bottomRight, roles);
 #endif
 
     // determine how many items have been changed and if any of them is a networkitem
@@ -539,7 +520,7 @@ void BufferView::changeBuffer(Direction direction)
 void BufferView::wheelEvent(QWheelEvent *event)
 {
     if (ItemViewSettings().mouseWheelChangesBuffer() == (bool)(event->modifiers() & Qt::AltModifier))
-        return QTreeView::wheelEvent(event);
+        return TreeViewTouch::wheelEvent(event);
 
     int rowDelta = (event->delta() > 0) ? -1 : 1;
     changeBuffer((Direction)rowDelta);
@@ -570,10 +551,10 @@ void BufferView::hideCurrentBuffer()
 
 QSize BufferView::sizeHint() const
 {
-    return QTreeView::sizeHint();
+    return TreeViewTouch::sizeHint();
 
     if (!model())
-        return QTreeView::sizeHint();
+        return TreeViewTouch::sizeHint();
 
     if (model()->rowCount() == 0)
         return QSize(120, 50);