X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fbufferviewfilter.h;h=ba3778a43a7382c2b919e4666789883cfb538a8a;hp=06503fdc9d6193d43cfd809d5bb08dc21a707468;hb=bbff8b7b37e35f61279b1e8b06a97969fe87f2a6;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c

diff --git a/src/uisupport/bufferviewfilter.h b/src/uisupport/bufferviewfilter.h
index 06503fdc..ba3778a4 100644
--- a/src/uisupport/bufferviewfilter.h
+++ b/src/uisupport/bufferviewfilter.h
@@ -22,7 +22,6 @@
 #define BUFFERVIEWFILTER_H_
 
 #include <QAction>
-#include <QColor>
 #include <QDropEvent>
 #include <QFlags>
 #include <QPixmap>
@@ -59,7 +58,7 @@ public:
 
   QVariant data(const QModelIndex &index, int role) const;
   QVariant icon(const QModelIndex &index) const;
-  QVariant foreground(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);
@@ -97,12 +96,8 @@ private:
   QPointer<BufferViewConfig> _config;
   Qt::SortOrder _sortOrder;
 
-  QColor _FgColorInactiveActivity;
-  QColor _FgColorNoActivity;
-  QColor _FgColorHighlightActivity;
-  QColor _FgColorNewMessageActivity;
-  QColor _FgColorOtherActivity;
-
+  QPixmap _channelJoinedIcon;
+  QPixmap _channelPartedIcon;
   QPixmap _userOfflineIcon;
   QPixmap _userAwayIcon;
   QPixmap _userOnlineIcon;
@@ -114,11 +109,10 @@ private:
   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)