current highlighted search result is no longer reset when the search string changes...

[quassel.git] / src / client / messagefilter.h

diff --git a/src/client/messagefilter.h b/src/client/messagefilter.h
index 9d17ddb..342fb86 100644 (file)
--- 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 {
@@ -47,18 +49,16 @@ public slots:
   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;
+  QMultiHash<QString, uint> _filteredQuitMsgs;
   int _messageTypeFilter;
-
-  QString _bufferName;
-  BufferInfo::Type _bufferType;
 };
 
 #endif