Merging -r804:811 from trunk to branches/0.3.

[quassel.git] / src / uisupport / bufferview.h

diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index 0f1b502..66ee467 100644 (file)
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -42,10 +42,11 @@ 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; }
-
+                                                              
 public slots:
   void setRootIndexForNetworkId(const NetworkId &networkId);
   
@@ -58,11 +59,13 @@ protected:
   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); }
 
 private slots:
   void joinChannel(const QModelIndex &index);
   void toggleHeader(bool checked);
   void showContextMenu(const QPoint &);
+  void layoutChanged();
 
 private:
   QPointer<BufferViewConfig> _config;