Fixing BR #147. Needs core update.

[quassel.git] / src / client / networkmodel.h

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 2a342a6..8dceb5a 100644 (file)
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -33,12 +33,12 @@ class BufferInfo;
 #include "selectionmodelsynchronizer.h"
 #include "modelpropertymapper.h"
 #include "clientsettings.h"
+#include "ircuser.h"
 
 class MappedSelectionModel;
 class QAbstractItemView;
 class Network;
 class IrcChannel;
-class IrcUser;
 
 /*****************************************
  *  Fancy Buffer Items
@@ -179,8 +179,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 +211,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 +233,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 +247,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