X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffermodel.h;h=cb9ffc43c787db257c20d178d15d96c6ffab7081;hp=4eb22308d380d4fce7c8991e368708390a640588;hb=46d75f41de7c1aaee605c096da28d4b0d8abf138;hpb=2a04cb443a50e37165fc2d5447cc705a813efd3e

diff --git a/src/client/buffermodel.h b/src/client/buffermodel.h
index 4eb22308..cb9ffc43 100644
--- 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  *
@@ -23,45 +23,39 @@
 
 #include <QSortFilterProxyModel>
 #include <QItemSelectionModel>
-#include <QPointer>
 
 #include "types.h"
+#include "selectionmodelsynchronizer.h"
 
 class NetworkModel;
-#include "selectionmodelsynchronizer.h"
-#include "modelpropertymapper.h"
-class MappedSelectionModel;
 class QAbstractItemView;
-class Buffer;
 
 class BufferModel : public QSortFilterProxyModel {
   Q_OBJECT
 
 public:
   BufferModel(NetworkModel *parent = 0);
-  virtual ~BufferModel();
 
   bool filterAcceptsRow(int sourceRow, const QModelIndex &parent) const;
   
   inline const SelectionModelSynchronizer *selectionModelSynchronizer() const { return &_selectionModelSynchronizer; }
-  inline const ModelPropertyMapper *propertyMapper() const { return &_propertyMapper; }
-  inline QItemSelectionModel *standardSelectionModel() const { return _propertyMapper.selectionModel(); }
-
-  void synchronizeSelectionModel(MappedSelectionModel *selectionModel);
+  inline QItemSelectionModel *standardSelectionModel() const { return _selectionModelSynchronizer.selectionModel(); }
+  
+  inline void synchronizeSelectionModel(QItemSelectionModel *selectionModel) { _selectionModelSynchronizer.synchronizeSelectionModel(selectionModel); }
   void synchronizeView(QAbstractItemView *view);
-  void mapProperty(int column, int role, QObject *target, const QByteArray &property);
 
-public slots:
-  QModelIndex currentIndex();
-  void setCurrentIndex(const QModelIndex &index, QItemSelectionModel::SelectionFlags command);
+  inline QModelIndex currentIndex() { return standardSelectionModel()->currentIndex(); }
 
-signals:
-  void selectionChanged(const QModelIndex &);
+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);
+    
 private:
   SelectionModelSynchronizer _selectionModelSynchronizer;
-  ModelPropertyMapper _propertyMapper;
-  BufferId currentBuffer;
 };
 
 #endif // BUFFERMODEL_H