X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=41e5f1d76f4da34464a7c0249abf5c5d73e0975b;hp=c3dbaf472480208f9c80277524240c1cbe9dedaa;hb=8b17f1bad397489b6d1e1fd30b3691c6fdd376ab;hpb=d3ea803d8977692f95bbe31fbaba3686fc2ce5a9

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index c3dbaf47..41e5f1d7 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -63,28 +63,14 @@ public:
   QString topic() const;
   int nickCount() const;
 
-  enum Type {
-    StatusType,
-    ChannelType,
-    QueryType
-  };
-  
   bool isStatusBuffer() const;
-  Type bufferType() const;
+  BufferInfo::Type bufferType() const;
 
   bool isActive() const;
-  
-  enum Activity {
-    NoActivity = 0x00,
-    OtherActivity = 0x01,
-    NewMessage = 0x02,
-    Highlight = 0x40
-  };
-  Q_DECLARE_FLAGS(ActivityLevel, Activity)
 
-  ActivityLevel activity() const;
-  bool setActivity(const ActivityLevel &level);
-  void updateActivity(const ActivityLevel &level);
+  inline Buffer::ActivityLevel activityLevel() const { return _activity; }
+  bool setActivityLevel(Buffer::ActivityLevel level);
+  void updateActivityLevel(Buffer::ActivityLevel level);
 
   void setLastMsgInsert(QDateTime msgDate);
   bool setLastSeen();
@@ -98,21 +84,18 @@ public slots:
   void addUserToCategory(IrcUser *ircUser);
   void removeUserFromCategory(IrcUser *ircUser);
   void userModeChanged(IrcUser *ircUser);
-					 
+
 private slots:
   void ircChannelDestroyed();
   void ircUserDestroyed();
-  
+
 private:
   BufferInfo _bufferInfo;
-  ActivityLevel _activity;
-  Type _type;
-  QDateTime _lastMsgInsert;
-  QDateTime _lastSeen;
+  Buffer::ActivityLevel _activity;
 
   QPointer<IrcChannel> _ircChannel;
 };
-Q_DECLARE_OPERATORS_FOR_FLAGS(BufferItem::ActivityLevel)
+
 
 /*****************************************
  *  Network Items
@@ -127,6 +110,7 @@ public:
   NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
 
   virtual quint64 id() const;
+  inline const NetworkId &networkId() const { return _networkId; }
   virtual QVariant data(int column, int row) const;
 
   bool isActive() const;
@@ -141,8 +125,6 @@ public slots:
 
   void attachNetwork(Network *network);
   void attachIrcChannel(const QString &channelName);
-
-  void setActive(bool connected);
   
 private:
   NetworkId _networkId;
@@ -222,8 +204,7 @@ public:
     BufferIdRole,
     NetworkIdRole,
     BufferInfoRole,
-    ItemTypeRole,
-    LastSeenRole
+    ItemTypeRole
   };
 
   enum itemTypes {
@@ -232,7 +213,7 @@ public:
     UserCategoryItemType,
     IrcUserItemType
   };
-    
+
   NetworkModel(QObject *parent = 0);
   static QList<QVariant> defaultHeader();
 
@@ -251,9 +232,11 @@ public:
 
   const Network *networkByIndex(const QModelIndex &index) const;
 
+  Buffer::ActivityLevel bufferActivity(const BufferInfo &buffer) const;
+
 public slots:
   void bufferUpdated(BufferInfo bufferInfo);
-  void updateBufferActivity(const Message &msg);
+  void setBufferActivity(const BufferInfo &buffer, Buffer::ActivityLevel activity);
   void networkRemoved(const NetworkId &networkId);
   
 private: