X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffermodel.h;h=c1567a06d6f7af83278874d5e384e63acd105175;hp=80f1ec0ab33e701c5aff00bd2478540edf657cb8;hb=c4f9c122f56d2c58296c6a8663f79d605b033ae2;hpb=770b7ef54b03f3ebd1e29a58b4757505e1809b2d

diff --git a/src/client/buffermodel.h b/src/client/buffermodel.h
index 80f1ec0a..c1567a06 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-2012 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #ifndef BUFFERMODEL_H
@@ -23,40 +23,58 @@
 
 #include <QSortFilterProxyModel>
 #include <QItemSelectionModel>
+#include <QPair>
 
+#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 {
-  Q_OBJECT
+class BufferModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
 
 public:
-  BufferModel(NetworkModel *parent = 0);
-  virtual ~BufferModel();
+    BufferModel(NetworkModel *parent = 0);
 
-  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(); }
+    bool filterAcceptsRow(int sourceRow, const QModelIndex &parent) const;
 
-  void synchronizeSelectionModel(MappedSelectionModel *selectionModel);
-  void synchronizeView(QAbstractItemView *view);
-  void mapProperty(int column, int role, QObject *target, const QByteArray &property);
+    inline const SelectionModelSynchronizer *selectionModelSynchronizer() const { return &_selectionModelSynchronizer; }
+    inline QItemSelectionModel *standardSelectionModel() const { return _selectionModelSynchronizer.selectionModel(); }
 
-  QModelIndex currentIndex();
+    inline void synchronizeSelectionModel(QItemSelectionModel *selectionModel) { _selectionModelSynchronizer.synchronizeSelectionModel(selectionModel); }
+    void synchronizeView(QAbstractItemView *view);
+
+    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, bool isQuery = false);
+    void switchToOrStartQuery(NetworkId network, const QString &nick)
+    {
+        switchToOrJoinBuffer(network, nick, true);
+    }
+
+
+    void switchToBufferAfterCreation(NetworkId network, const QString &name);
 
 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);
+    void newBuffers(const QModelIndex &parent, int start, int end);
+
 private:
-  SelectionModelSynchronizer _selectionModelSynchronizer;
-  ModelPropertyMapper _propertyMapper;
+    void newBuffer(BufferId bufferId);
+
+    SelectionModelSynchronizer _selectionModelSynchronizer;
+    QPair<NetworkId, QString> _bufferToSwitchTo;
 };
 
+
 #endif // BUFFERMODEL_H