Greatly simplify the wrap point computation

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

diff --git a/src/client/buffermodel.h b/src/client/buffermodel.h
index 80f1ec0..d863dc9 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  *
@@ -24,12 +24,11 @@
 #include <QSortFilterProxyModel>
 #include <QItemSelectionModel>
 
+#include "network.h"
+#include "networkmodel.h"
 #include "types.h"
 #include "selectionmodelsynchronizer.h"
-#include "modelpropertymapper.h"
 
-class NetworkModel;
-class MappedSelectionModel;
 class QAbstractItemView;
 
 class BufferModel : public QSortFilterProxyModel {
@@ -37,26 +36,31 @@ class BufferModel : public QSortFilterProxyModel {
 
 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(); }
+  inline QItemSelectionModel *standardSelectionModel() const { return _selectionModelSynchronizer.selectionModel(); }
 
-  void synchronizeSelectionModel(MappedSelectionModel *selectionModel);
+  inline void synchronizeSelectionModel(QItemSelectionModel *selectionModel) { _selectionModelSynchronizer.synchronizeSelectionModel(selectionModel); }
   void synchronizeView(QAbstractItemView *view);
-  void mapProperty(int column, int role, QObject *target, const QByteArray &property);
 
-  QModelIndex currentIndex();
+  inline QModelIndex currentIndex() { return standardSelectionModel()->currentIndex(); }
+  inline BufferId currentBuffer() { return currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>(); }
+
+public slots:
+  void setCurrentIndex(const QModelIndex &newCurrent);
+  void switchToBuffer(const BufferId &bufferId);
+  void switchToBufferIndex(const QModelIndex &bufferIdx);
+  void switchToOrJoinBuffer(NetworkId network, const QString &bufferName);
 
 private slots:
-  void currentChanged(const QModelIndex &current, const QModelIndex &previous);
-  
+  void debug_currentChanged(QModelIndex current, QModelIndex previous);
+  void newNetwork(NetworkId id);
+  void networkConnectionChanged(Network::ConnectionState state);
+
 private:
   SelectionModelSynchronizer _selectionModelSynchronizer;
-  ModelPropertyMapper _propertyMapper;
 };
 
 #endif // BUFFERMODEL_H