X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=d891dd0e0013de9928b9c3afb9a9af396cc4073f;hp=a9a108d215604c008edb7ff306f647641dc9cb65;hb=b2cf1b73760eadbeb3452d8d2260e1dc876e6fe5;hpb=f37791b92e3bf6e78b93036c0669926eeba3347b

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index a9a108d2..d891dd0e 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -114,7 +114,7 @@ class NetworkItem : public PropertyMapItem {
   Q_PROPERTY(int nickCount READ nickCount)
     
 public:
-  NetworkItem(const uint &netid, const QString &, AbstractTreeItem *parent = 0);
+  NetworkItem(const NetworkId &netid, AbstractTreeItem *parent = 0);
 
   virtual QVariant data(int column, int row) const;
   virtual quint64 id() const;
@@ -133,8 +133,7 @@ public slots:
   void attachIrcChannel(const QString &channelName);
   
 private:
-  uint _networkId;
-  QString _networkName;
+  NetworkId _networkId;
 
   QPointer<Network> _network;
 };
@@ -156,9 +155,6 @@ public:
 
   static int categoryFromModes(const QString &modes);
 
-private slots:
-  void checkNoChilds();
-
 private:
   int _category;
 
@@ -181,13 +177,14 @@ class IrcUserItem : public PropertyMapItem {
 public:
   IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent);
 
-  QString nickName();
+  QString nickName() const;
   IrcUser *ircUser();
   virtual quint64 id() const;
 
+  virtual QVariant data(int column, int role) const;
+
 private slots:
   void setNick(QString newNick);
-  void ircUserDestroyed();
 
 private:
   IrcUser *_ircUser;
@@ -221,7 +218,7 @@ public:
   static QList<QVariant> defaultHeader();
 
   static bool mimeContainsBufferList(const QMimeData *mimeData);
-  static QList< QPair<uint, uint> > mimeDataToBufferList(const QMimeData *mimeData);
+  static QList< QPair<NetworkId, BufferId> > mimeDataToBufferList(const QMimeData *mimeData);
 
   virtual QStringList mimeTypes() const;
   virtual QMimeData *mimeData(const QModelIndexList &) const;
@@ -230,7 +227,7 @@ public:
   void attachNetwork(Network *network);
 
   bool isBufferIndex(const QModelIndex &) const;
-  Buffer *getBufferByIndex(const QModelIndex &) const;
+  //Buffer *getBufferByIndex(const QModelIndex &) const;
   QModelIndex bufferIndex(BufferId bufferId);
 
 public slots:
@@ -238,12 +235,11 @@ public slots:
   void bufferActivity(BufferItem::ActivityLevel, BufferInfo bufferInfo);
 
 private:
-  QModelIndex networkIndex(uint networkId);
-  NetworkItem *network(uint networkId);
-  NetworkItem *newNetwork(uint networkId, const QString &networkName);
-  
-  BufferItem *buffer(BufferInfo bufferInfo);
-  BufferItem *newBuffer(BufferInfo bufferInfo);
+  QModelIndex networkIndex(NetworkId networkId);
+  NetworkItem *networkItem(NetworkId networkId);
+  NetworkItem *existsNetworkItem(NetworkId networkId);
+  BufferItem *bufferItem(const BufferInfo &bufferInfo);
+  BufferItem *existsBufferItem(const BufferInfo &bufferInfo);
 
 };