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 06503fd..d1483d3 100644 (file)
--- a/src/uisupport/bufferviewfilter.h
+++ b/src/uisupport/bufferviewfilter.h
@@ -22,10 +22,8 @@
 #define BUFFERVIEWFILTER_H_
 
 #include <QAction>
-#include <QColor>
 #include <QDropEvent>
 #include <QFlags>
-#include <QPixmap>
 #include <QPointer>
 #include <QSet>
 #include <QSortFilterProxyModel>
@@ -58,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);
@@ -90,35 +86,24 @@ signals:
 
 private slots:
   void configInitialized();
-  void showUserStateIconsChanged();
   void enableEditMode(bool enable);
+  void showServerQueriesChanged();
 
 private:
-  QPointer<BufferViewConfig> _config;
+  QPointer<BufferViewConfig> _config, _tmpConfig;
   Qt::SortOrder _sortOrder;
 
-  QColor _FgColorInactiveActivity;
-  QColor _FgColorNoActivity;
-  QColor _FgColorHighlightActivity;
-  QColor _FgColorNewMessageActivity;
-  QColor _FgColorOtherActivity;
-
-  QPixmap _userOfflineIcon;
-  QPixmap _userAwayIcon;
-  QPixmap _userOnlineIcon;
-  bool _showUserStateIcons;
-
+  bool _showServerQueries;
   bool _editMode;
   QAction _enableEditMode;
   QSet<BufferId> _toAdd;
   QSet<BufferId> _toTempRemove;
   QSet<BufferId> _toRemove;
 
-  void loadColors();
-
   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)