X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=9359ad39d731cfb8f8420500439e2f3f3eeec6eb;hp=634c402e121f87cdf36f1b074ec64e83b386749e;hb=cb6520b432302dc6579a8e99cb9cd249a6effb9d;hpb=4ba498c04b9aefee2e3ab9d2eb0645f86e5d1968

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 634c402e..9359ad39 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -33,12 +33,49 @@ class BufferInfo;
 #include "selectionmodelsynchronizer.h"
 #include "modelpropertymapper.h"
 #include "clientsettings.h"
+#include "ircuser.h"
 
 class MappedSelectionModel;
 class QAbstractItemView;
 class Network;
 class IrcChannel;
-class IrcUser;
+
+/*****************************************
+ *  Network Items
+ *****************************************/
+class NetworkItem : public PropertyMapItem {
+  Q_OBJECT
+  Q_PROPERTY(QString networkName READ networkName)
+  Q_PROPERTY(QString currentServer READ currentServer)
+  Q_PROPERTY(int nickCount READ nickCount)
+    
+public:
+  NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
+
+  virtual quint64 id() const;
+  virtual QVariant data(int column, int row) const;
+
+  bool isActive() const;
+
+  inline const NetworkId &networkId() const { return _networkId; }
+  QString networkName() const;
+  QString currentServer() const;
+  int nickCount() const;
+
+  virtual QString toolTip(int column) const;
+
+public slots:
+  void setNetworkName(const QString &networkName);
+  void setCurrentServer(const QString &serverName);
+
+  void attachNetwork(Network *network);
+  void attachIrcChannel(const QString &channelName);
+
+private:
+  NetworkId _networkId;
+
+  QPointer<Network> _network;
+};
 
 /*****************************************
  *  Fancy Buffer Items
@@ -72,7 +109,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);
@@ -103,44 +140,6 @@ private:
   IrcChannel *_ircChannel;
 };
 
-
-/*****************************************
- *  Network Items
- *****************************************/
-class NetworkItem : public PropertyMapItem {
-  Q_OBJECT
-  Q_PROPERTY(QString networkName READ networkName)
-  Q_PROPERTY(QString currentServer READ currentServer)
-  Q_PROPERTY(int nickCount READ nickCount)
-    
-public:
-  NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
-
-  virtual quint64 id() const;
-  virtual QVariant data(int column, int row) const;
-
-  bool isActive() const;
-
-  inline const NetworkId &networkId() const { return _networkId; }
-  QString networkName() const;
-  QString currentServer() const;
-  int nickCount() const;
-
-  virtual QString toolTip(int column) const;
-
-public slots:
-  void setNetworkName(const QString &networkName);
-  void setCurrentServer(const QString &serverName);
-
-  void attachNetwork(Network *network);
-  void attachIrcChannel(const QString &channelName);
-
-private:
-  NetworkId _networkId;
-
-  QPointer<Network> _network;
-};
-
 /*****************************************
 *  User Category Items (like @vh etc.)
 *****************************************/
@@ -179,8 +178,8 @@ public:
   QString nickName() const;
   bool isActive() const;
 
-  IrcUser *ircUser();
-  virtual quint64 id() const;
+  inline IrcUser *ircUser() { return _ircUser; }
+  inline virtual quint64 id() const { return _id; }
   virtual QVariant data(int column, int role) const;
   virtual QString toolTip(int column) const;
 
@@ -211,12 +210,13 @@ public:
     ItemTypeRole
   };
 
-  enum itemTypes {
-    NetworkItemType,
-    BufferItemType,
-    UserCategoryItemType,
-    IrcUserItemType
+  enum itemType {
+    NetworkItemType = 0x01,
+    BufferItemType = 0x02,
+    UserCategoryItemType = 0x04,
+    IrcUserItemType = 0x08
   };
+  Q_DECLARE_FLAGS(itemTypes, itemType);
 
   NetworkModel(QObject *parent = 0);
   static QList<QVariant> defaultHeader();
@@ -232,6 +232,7 @@ public:
 
   bool isBufferIndex(const QModelIndex &) const;
   //Buffer *getBufferByIndex(const QModelIndex &) const;
+  QModelIndex networkIndex(NetworkId networkId);
   QModelIndex bufferIndex(BufferId bufferId);
 
   const Network *networkByIndex(const QModelIndex &index) const;
@@ -245,12 +246,12 @@ public slots:
   void networkRemoved(const NetworkId &networkId);
   
 private:
-  QModelIndex networkIndex(NetworkId networkId);
   NetworkItem *networkItem(NetworkId networkId);
   NetworkItem *existsNetworkItem(NetworkId networkId);
   BufferItem *bufferItem(const BufferInfo &bufferInfo);
   BufferItem *existsBufferItem(const BufferInfo &bufferInfo);
 
 };
+Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::itemTypes);
 
 #endif // NETWORKMODEL_H