X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=840f1aa2a2a3ebf26c751735365584fc6faf74b5;hp=0ffc0a0da0de5067a6dff9c59baa42e802ee5502;hb=f824db0e31b54969e0b7fa0b5405b1e9173d482c;hpb=188b778bd62a10521ab721a212f8ea2f62fd636a

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 0ffc0a0d..840f1aa2 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,25 +21,12 @@
 #ifndef NETWORKMODEL_H
 #define NETWORKMODEL_H
 
-#include <QtCore>
-
-#include "treemodel.h"
 #include "bufferinfo.h"
-
-#include <QPointer>
-
-class BufferInfo;
-
-#include "selectionmodelsynchronizer.h"
-#include "modelpropertymapper.h"
 #include "clientsettings.h"
-#include "ircchannel.h"
-#include "ircuser.h"
 #include "message.h"
 #include "network.h"
+#include "treemodel.h"
 
-class MappedSelectionModel;
-class QAbstractItemView;
 class BufferItem;
 
 /*****************************************
@@ -77,6 +64,9 @@ public slots:
   void attachIrcChannel(IrcChannel *channel);
   void attachIrcUser(IrcUser *ircUser);
 
+signals:
+  void networkDataChanged(int column = -1);
+
 private:
   NetworkId _networkId;
 
@@ -102,7 +92,7 @@ public:
   inline BufferId bufferId() const { return _bufferInfo.bufferId(); }
   inline BufferInfo::Type bufferType() const { return _bufferInfo.type(); }
 
-  void setBufferName(const QString &name);
+  virtual void setBufferName(const QString &name);
   virtual inline QString bufferName() const { return _bufferInfo.bufferName(); }
   virtual inline QString topic() const { return QString(); }
   virtual inline int nickCount() const { return 0; }
@@ -153,12 +143,16 @@ public:
   QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent);
 
   virtual QVariant data(int column, int role) const;
+  virtual bool setData(int column, const QVariant &value, int role);
+
   virtual inline bool isActive() const { return (bool)_ircUser; }
   virtual QString toolTip(int column) const;
 
+  virtual void setBufferName(const QString &name);
+
 public slots:
-  void attachIrcUser(IrcUser *ircUser);
-  void ircUserDestroyed();
+  void setIrcUser(IrcUser *ircUser);
+  void removeIrcUser();
 
 private:
   IrcUser *_ircUser;
@@ -175,6 +169,7 @@ class ChannelBufferItem : public BufferItem {
 public:
   ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeItem *parent);
 
+  virtual QVariant data(int column, int role) const;
   virtual inline bool isActive() const { return (bool)_ircChannel; }
   virtual QString toolTip(int column) const;
 
@@ -194,7 +189,7 @@ public slots:
   void userModeChanged(IrcUser *ircUser);
 
 private slots:
-  void ircChannelDestroyed();
+  void ircChannelParted();
 
 private:
   IrcChannel *_ircChannel;
@@ -245,7 +240,7 @@ public:
   virtual QString toolTip(int column) const;
 
 private slots:
-  inline void ircUserDestroyed() { parent()->removeChild(this); }
+  inline void ircUserQuited() { parent()->removeChild(this); }
 
 private:
   QPointer<IrcUser> _ircUser;
@@ -268,7 +263,8 @@ public:
     BufferInfoRole,
     ItemTypeRole,
     UserAwayRole,
-    IrcUserRole
+    IrcUserRole,
+    IrcChannelRole
   };
 
   enum ItemType {
@@ -287,7 +283,6 @@ public:
 
   virtual QStringList mimeTypes() const;
   virtual QMimeData *mimeData(const QModelIndexList &) const;
-  virtual bool dropMimeData(const QMimeData *, Qt::DropAction, int, int, const QModelIndex &);
 
   void attachNetwork(Network *network);
 
@@ -317,6 +312,8 @@ public:
   QString networkName(BufferId bufferId) const;
 
   inline QList<BufferId> allBufferIds() const { return _bufferItemCache.keys(); }
+  QList<BufferId> allBufferIdsSorted() const;
+  void sortBufferIds(QList<BufferId> &bufferIds) const;
 
 public slots:
   void bufferUpdated(BufferInfo bufferInfo);
@@ -342,6 +339,8 @@ private:
   BufferItem *findBufferItem(BufferId bufferId) const;
   BufferItem *bufferItem(const BufferInfo &bufferInfo);
 
+  static bool bufferItemLessThan(const BufferItem *left, const BufferItem *right);
+
   QHash<BufferId, BufferItem *> _bufferItemCache;
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::ItemTypes)