X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagefilter.h;h=81fa3ff6bcb01c1664de4ff2acbe8e0820204a99;hp=d2ce699619ab633f9b290a2dd6a051102e26535e;hb=ee8b9f55860e340c1600188fddcfd557c7489f66;hpb=fb011e52bc6613198a65e037f0752f6361339aeb

diff --git a/src/client/messagefilter.h b/src/client/messagefilter.h
index d2ce6996..81fa3ff6 100644
--- a/src/client/messagefilter.h
+++ b/src/client/messagefilter.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,40 +15,61 @@
  *   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 MESSAGEFILTER_H_
 #define MESSAGEFILTER_H_
 
 #include <QSortFilterProxyModel>
+#include <set>
 
+#include "bufferinfo.h"
+#include "client.h"
 #include "messagemodel.h"
+#include "networkmodel.h"
 #include "types.h"
 
-class MessageFilter : public QSortFilterProxyModel {
-  Q_OBJECT
+class MessageFilter : public QSortFilterProxyModel
+{
+    Q_OBJECT
 
 protected:
-  MessageFilter(QAbstractItemModel *source, QObject *parent = 0);
+    MessageFilter(QAbstractItemModel *source, QObject *parent = 0);
 
 public:
-  MessageFilter(MessageModel *, const QList<BufferId> &buffers = QList<BufferId>(), QObject *parent = 0);
+    MessageFilter(MessageModel *, const QList<BufferId> &buffers = QList<BufferId>(), QObject *parent = 0);
 
-  virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
-  virtual QString idString() const;
-  inline bool isSingleBufferFilter() const { return _validBuffers.count() == 1; }
-  inline bool containsBuffer(const BufferId &id) const { return _validBuffers.contains(id); }
+    virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
+    virtual QString idString() const;
+    inline bool isSingleBufferFilter() const { return _validBuffers.count() == 1; }
+    BufferId singleBufferId() const { return *(_validBuffers.constBegin()); }
+    inline bool containsBuffer(const BufferId &id) const { return _validBuffers.contains(id); }
+    inline QSet<BufferId> containedBuffers() const { return _validBuffers; }
 
 public slots:
-  void messageTypeFilterChanged();
-  void requestBacklog();
+    void messageTypeFilterChanged();
+    void messageRedirectionChanged();
+    void requestBacklog();
+    // redefined as public slot
+    void invalidateFilter() { QSortFilterProxyModel::invalidateFilter(); }
+
+protected:
+    QString bufferName() const { return Client::networkModel()->bufferName(singleBufferId()); }
+    BufferInfo::Type bufferType() const { return Client::networkModel()->bufferType(singleBufferId()); }
+    NetworkId networkId() const { return Client::networkModel()->networkId(singleBufferId()); }
 
 private:
-  void init();
+    void init();
 
-  QSet<BufferId> _validBuffers;
-  int _messageTypeFilter;
+    QSet<BufferId> _validBuffers;
+    std::set<qint64> _filteredQuitMsgTime; ///< Timestamps (ms) of already forwarded quit messages
+    int _messageTypeFilter;
+
+    int _userNoticesTarget;
+    int _serverNoticesTarget;
+    int _errorMsgsTarget;
 };
 
+
 #endif