X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffermodel.h;h=d1390c9b75347d22a74d0329d1c323172da7cf91;hp=e45c60e656ce10a2b8322f948f5b25432c93243f;hb=86bd6b1ffb870e65af6d830a2ea16471c348ed5a;hpb=50706d89d4d60e258ebb6873d3778383621898e4

diff --git a/src/client/buffermodel.h b/src/client/buffermodel.h
index e45c60e6..d1390c9b 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,44 +23,53 @@
 
 #include <QSortFilterProxyModel>
 #include <QItemSelectionModel>
-#include <QPointer>
+#include <QPair>
 
+#include "network.h"
+#include "networkmodel.h"
 #include "types.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 SelectionModelSynchronizer *selectionModelSynchronizer() { return _selectionModelSynchronizer; }
-  inline ModelPropertyMapper *propertyMapper() { return _propertyMapper; }
 
-  void synchronizeSelectionModel(MappedSelectionModel *selectionModel);
+  inline const SelectionModelSynchronizer *selectionModelSynchronizer() const { return &_selectionModelSynchronizer; }
+  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);
+
+  inline QModelIndex currentIndex() { return standardSelectionModel()->currentIndex(); }
+  inline BufferId currentBuffer() { return currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>(); }
 
 public slots:
-  QModelIndex currentIndex();
-  void setCurrentIndex(const QModelIndex &index, QItemSelectionModel::SelectionFlags command);
+  void setCurrentIndex(const QModelIndex &newCurrent);
+  void switchToBuffer(const BufferId &bufferId);
+  void switchToBufferIndex(const QModelIndex &bufferIdx);
+  void switchToOrJoinBuffer(NetworkId network, const QString &bufferName, bool isQuery = false);
+  void switchToOrStartQuery(NetworkId network, const QString &nick) {
+    switchToOrJoinBuffer(network, nick, true);
+  }
+  void switchToBufferAfterCreation(NetworkId network, const QString &name);
 
-signals:
-  void selectionChanged(const QModelIndex &);
+private slots:
+  void debug_currentChanged(QModelIndex current, QModelIndex previous);
+  void newNetwork(NetworkId id);
+  void networkConnectionChanged(Network::ConnectionState state);
+  void newBuffers(const QModelIndex &parent, int start, int end);
 
 private:
-  QPointer<SelectionModelSynchronizer> _selectionModelSynchronizer;
-  QPointer<ModelPropertyMapper> _propertyMapper;
-  BufferId currentBuffer;
+  void newBuffer(BufferId bufferId);
+
+  SelectionModelSynchronizer _selectionModelSynchronizer;
+  QPair<NetworkId, QString> _bufferToSwitchTo;
 };
 
 #endif // BUFFERMODEL_H