X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fmessagefilter.h;h=f883dc98460c8046b49a7febcff38f870474bef8;hb=34e58425ffb5475b210abb484970e674ddb98744;hp=62c24c34aeeddbe84b6af5d2a6788f0b568752f8;hpb=9d54503555534a2c554f09a33df6afa33d6308ec;p=quassel.git

diff --git a/src/client/messagefilter.h b/src/client/messagefilter.h
index 62c24c34..f883dc98 100644
--- a/src/client/messagefilter.h
+++ b/src/client/messagefilter.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 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  *
@@ -18,8 +18,11 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef MESSAGEFILTER_H_
-#define MESSAGEFILTER_H_
+#pragma once
+
+#include "client-export.h"
+
+#include <set>
 
 #include <QSortFilterProxyModel>
 
@@ -29,22 +32,24 @@
 #include "networkmodel.h"
 #include "types.h"
 
-class MessageFilter : public QSortFilterProxyModel
+class CLIENT_EXPORT MessageFilter : public QSortFilterProxyModel
 {
     Q_OBJECT
 
 protected:
-    MessageFilter(QAbstractItemModel *source, QObject *parent = 0);
+    MessageFilter(QAbstractItemModel* source, QObject* parent = nullptr);
 
 public:
-    MessageFilter(MessageModel *, const QList<BufferId> &buffers = QList<BufferId>(), QObject *parent = 0);
+    MessageFilter(MessageModel*, const QList<BufferId>& buffers = QList<BufferId>(), QObject* parent = nullptr);
 
-    virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
     virtual QString idString() const;
-    inline bool isSingleBufferFilter() const { return _validBuffers.count() == 1; }
+
+    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; }
+    bool containsBuffer(const BufferId& id) const { return _validBuffers.contains(id); }
+    QSet<BufferId> containedBuffers() const { return _validBuffers; }
+
+    bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
 
 public slots:
     void messageTypeFilterChanged();
@@ -62,13 +67,10 @@ private:
     void init();
 
     QSet<BufferId> _validBuffers;
-    QMultiHash<QString, uint> _filteredQuitMsgs;
+    std::set<qint64> _filteredQuitMsgTime;  ///< Timestamps (ms) of already forwarded quit messages
     int _messageTypeFilter;
 
     int _userNoticesTarget;
     int _serverNoticesTarget;
     int _errorMsgsTarget;
 };
-
-
-#endif