X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=2a342a69c15b7550ea5e4d5f8f7ecdfb5c025929;hp=861d07cf81008993eb5ccaf10ba7b6557530cf75;hb=1066294489c2469323a2813b63ae4653d148bbc7;hpb=e9f87d7542d4a9fe0e9c63dec96e93d270667ecd

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 861d07cf..2a342a69 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -72,7 +72,7 @@ public:
   bool isActive() const;
 
   inline Buffer::ActivityLevel activityLevel() const { return _activity; }
-  bool setActivityLevel(Buffer::ActivityLevel level);
+  void setActivityLevel(Buffer::ActivityLevel level);
   void updateActivityLevel(Buffer::ActivityLevel level);
 
   void setLastMsgInsert(QDateTime msgDate);
@@ -100,7 +100,7 @@ private:
   QString _bufferName;
   Buffer::ActivityLevel _activity;
 
-  QPointer<IrcChannel> _ircChannel;
+  IrcChannel *_ircChannel;
 };
 
 
@@ -146,12 +146,12 @@ private:
 *****************************************/
 class UserCategoryItem : public PropertyMapItem {
   Q_OBJECT
-  Q_PROPERTY(QString categoryId READ categoryId)
+  Q_PROPERTY(QString categoryName READ categoryName)
     
 public:
   UserCategoryItem(int category, AbstractTreeItem *parent);
 
-  QString categoryId();
+  QString categoryName() const;
   virtual quint64 id() const;
   virtual QVariant data(int column, int role) const;
   
@@ -163,13 +163,7 @@ public:
 private:
   int _category;
 
-  struct Category {
-    QChar mode;
-    QString displayString;
-    inline Category(QChar mode_, QString displayString_) : mode(mode_), displayString(displayString_) {};
-  };
-
-  static const QList<Category> categories;
+  static const QList<QChar> categories;
 };
 
 /*****************************************
@@ -208,7 +202,7 @@ class NetworkModel : public TreeModel {
 
 public:
   enum myRoles {
-    BufferTypeRole = Qt::UserRole,
+    BufferTypeRole = TreeModel::UserRole,
     ItemActiveRole,
     BufferActivityRole,
     BufferIdRole,