Prevent ChatView from scrolling up 1px on buffer switch, fixes #544

[quassel.git] / src / client / buffermodel.h

diff --git a/src/client/buffermodel.h b/src/client/buffermodel.h
index 3126f73..cb9ffc4 100644 (file)
--- a/src/client/buffermodel.h
+++ b/src/client/buffermodel.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -28,7 +28,6 @@
 #include "selectionmodelsynchronizer.h"
 
 class NetworkModel;
-class MappedSelectionModel;
 class QAbstractItemView;
 
 class BufferModel : public QSortFilterProxyModel {
@@ -42,15 +41,18 @@ public:
   inline const SelectionModelSynchronizer *selectionModelSynchronizer() const { return &_selectionModelSynchronizer; }
   inline QItemSelectionModel *standardSelectionModel() const { return _selectionModelSynchronizer.selectionModel(); }
   
-  void synchronizeSelectionModel(MappedSelectionModel *selectionModel);
+  inline void synchronizeSelectionModel(QItemSelectionModel *selectionModel) { _selectionModelSynchronizer.synchronizeSelectionModel(selectionModel); }
   void synchronizeView(QAbstractItemView *view);
 
-  QModelIndex currentIndex();
+  inline QModelIndex currentIndex() { return standardSelectionModel()->currentIndex(); }
+
+public slots:
   void setCurrentIndex(const QModelIndex &newCurrent);
+  void switchToBuffer(const BufferId &bufferId);
+  void switchToBufferIndex(const QModelIndex &bufferIdx);
 
 private slots:
   void debug_currentChanged(QModelIndex current, QModelIndex previous);
-  void debug_selectionChanged(QItemSelection current , QItemSelection previous);
     
 private:
   SelectionModelSynchronizer _selectionModelSynchronizer;