X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fmessagefilter.h;h=d231030935de84d11dbfad1652f640a34b3fc013;hb=7857ea0a520226e856af8d275550b76627f59c56;hp=9d17ddb11dbe18108d7ec8bd52f673545c7cb837;hpb=402f690fb8ca07adc2c063ba550d7e8fc0159ada;p=quassel.git

diff --git a/src/client/messagefilter.h b/src/client/messagefilter.h
index 9d17ddb1..d2310309 100644
--- a/src/client/messagefilter.h
+++ b/src/client/messagefilter.h
@@ -24,7 +24,9 @@
 #include <QSortFilterProxyModel>
 
 #include "bufferinfo.h"
+#include "client.h"
 #include "messagemodel.h"
+#include "networkmodel.h"
 #include "types.h"
 
 class MessageFilter : public QSortFilterProxyModel {
@@ -41,24 +43,37 @@ public:
   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 messageRedirectionChanged();
   void requestBacklog();
 
 protected:
-  const QString &bufferName() const;
-  BufferInfo::Type bufferType() const;
+  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();
 
   QSet<BufferId> _validBuffers;
-  QSet<uint> _filteredQuitMsgs;
+  mutable QSet<MsgId> _redirectedMsgs;
+  QMultiHash<QString, uint> _filteredQuitMsgs;
   int _messageTypeFilter;
 
-  QString _bufferName;
-  BufferInfo::Type _bufferType;
+  bool _userNoticesInDefaultBuffer;
+  bool _userNoticesInStatusBuffer;
+  bool _userNoticesInCurrentBuffer;
+
+  bool _serverNoticesInDefaultBuffer;
+  bool _serverNoticesInStatusBuffer;
+  bool _serverNoticesInCurrentBuffer;
+
+  bool _errorMsgsInDefaultBuffer;
+  bool _errorMsgsInStatusBuffer;
+  bool _errorMsgsInCurrentBuffer;
 };
 
 #endif