Reset the BufferViewFilter after setting a new config

[quassel.git] / src / uisupport / bufferviewfilter.h

diff --git a/src/uisupport/bufferviewfilter.h b/src/uisupport/bufferviewfilter.h
index 5016521..d1483d3 100644 (file)
--- a/src/uisupport/bufferviewfilter.h
+++ b/src/uisupport/bufferviewfilter.h
@@ -24,7 +24,6 @@
 #include <QAction>
 #include <QDropEvent>
 #include <QFlags>
-#include <QPixmap>
 #include <QPointer>
 #include <QSet>
 #include <QSortFilterProxyModel>
@@ -57,8 +56,6 @@ public:
   virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);
 
   QVariant data(const QModelIndex &index, int role) const;
-  QVariant icon(const QModelIndex &index) const;
-//   QVariant foreground(const QModelIndex &index) const;
   QVariant checkedState(const QModelIndex &index) const;
 
   bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
@@ -89,18 +86,14 @@ signals:
 
 private slots:
   void configInitialized();
-  void showUserStateIconsChanged();
   void enableEditMode(bool enable);
+  void showServerQueriesChanged();
 
 private:
-  QPointer<BufferViewConfig> _config;
+  QPointer<BufferViewConfig> _config, _tmpConfig;
   Qt::SortOrder _sortOrder;
 
-  QPixmap _userOfflineIcon;
-  QPixmap _userAwayIcon;
-  QPixmap _userOnlineIcon;
-  bool _showUserStateIcons;
-
+  bool _showServerQueries;
   bool _editMode;
   QAction _enableEditMode;
   QSet<BufferId> _toAdd;
@@ -109,7 +102,8 @@ private:
 
   bool filterAcceptBuffer(const QModelIndex &) const;
   bool filterAcceptNetwork(const QModelIndex &) const;
-  void addBuffer(const BufferId &) const;
+  void addBuffer(const BufferId &bufferId) const;
+  void addBuffers(const QList<BufferId> &bufferIds) const;
   static bool bufferIdLessThan(const BufferId &, const BufferId &);
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(BufferViewFilter::Modes)