X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fbufferview.h;h=aaafd615517cbbd556909751995a306295f24bcd;hb=7582027d5f569c8487d17959d6aa9e6ca6d2aa33;hp=ce7483e11443bd6466fdb02e11201b2b82d2526a;hpb=04315f46a16fc3627218377071e008b6b9744992;p=quassel.git

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index ce7483e1..aaafd615 100644
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 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  *
@@ -52,7 +52,6 @@ public:
 
     void setModel(QAbstractItemModel *model);
     void setFilteredModel(QAbstractItemModel *model, BufferViewConfig *config);
-    virtual void setSelectionModel(QItemSelectionModel *selectionModel);
 
     void setConfig(BufferViewConfig *config);
     inline BufferViewConfig *config() { return _config; }
@@ -76,11 +75,19 @@ protected:
     virtual void keyPressEvent(QKeyEvent *);
     virtual void dropEvent(QDropEvent *event);
     virtual void rowsInserted(const QModelIndex &parent, int start, int end);
-    virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
     virtual void wheelEvent(QWheelEvent *);
     virtual QSize sizeHint() const;
     virtual void focusInEvent(QFocusEvent *event) { QAbstractScrollArea::focusInEvent(event); }
     virtual void contextMenuEvent(QContextMenuEvent *event);
+	virtual bool event(QEvent *event);
+	virtual void mouseMoveEvent(QMouseEvent *event);
+	virtual void mousePressEvent(QMouseEvent *event);
+
+#if QT_VERSION < 0x050000
+    virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
+#else
+    virtual void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles);
+#endif
 
 private slots:
     void joinChannel(const QModelIndex &index);
@@ -96,6 +103,8 @@ private slots:
 
 private:
     QPointer<BufferViewConfig> _config;
+	qint64 _lastTouchStart = 0;
+	bool _touchScrollInProgress = false;
 
     enum ExpandedState {
         WasExpanded = 0x01,