X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffermodel.h;h=05d4dad5e3ebdd7e285d8da528dcb709cbdd4980;hp=4fb610db53743e727ffc72d4be65d70759a59e75;hb=HEAD;hpb=2f05c5d7e94d5e96d2b4bae59140fd3b60a7a62f

diff --git a/src/client/buffermodel.h b/src/client/buffermodel.h
index 4fb610db..05d4dad5 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-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,53 +15,63 @@
  *   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
-#define BUFFERMODEL_H
+#pragma once
+
+#include "client-export.h"
 
-#include <QSortFilterProxyModel>
 #include <QItemSelectionModel>
-#include <QPointer>
+#include <QPair>
+#include <QSortFilterProxyModel>
 
-class NetworkModel;
-//class SelectionModelSynchronizer;
+#include "network.h"
+#include "networkmodel.h"
 #include "selectionmodelsynchronizer.h"
-//class ModelPropertyMapper;
-#include "modelpropertymapper.h"
-class MappedSelectionModel;
+#include "types.h"
+
 class QAbstractItemView;
-class Buffer;
 
-class BufferModel : public QSortFilterProxyModel {
-  Q_OBJECT
+class CLIENT_EXPORT BufferModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
 
 public:
-  BufferModel(NetworkModel *parent = 0);
-  virtual ~BufferModel();
+    BufferModel(NetworkModel* parent = nullptr);
+
+    bool filterAcceptsRow(int sourceRow, const QModelIndex& parent) const override;
 
-  bool filterAcceptsRow(int sourceRow, const QModelIndex &parent) const;
-  
-  inline SelectionModelSynchronizer *selectionModelSynchronizer() { return _selectionModelSynchronizer; }
-  inline ModelPropertyMapper *propertyMapper() { return _propertyMapper; }
+    inline const SelectionModelSynchronizer* selectionModelSynchronizer() const { return &_selectionModelSynchronizer; }
+    inline QItemSelectionModel* standardSelectionModel() const { return _selectionModelSynchronizer.selectionModel(); }
 
-  void synchronizeSelectionModel(MappedSelectionModel *selectionModel);
-  void synchronizeView(QAbstractItemView *view);
-  void mapProperty(int column, int role, QObject *target, const QByteArray &property);
+    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 &index, QItemSelectionModel::SelectionFlags command);
-  void selectBuffer(Buffer *buffer);
+    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 bufferSelected(Buffer *);
-  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;
-  Buffer *currentBuffer;
-};
+    void newBuffer(BufferId bufferId);
 
-#endif // BUFFERMODEL_H
+    SelectionModelSynchronizer _selectionModelSynchronizer;
+    QPair<NetworkId, QString> _bufferToSwitchTo;
+};