another tiny commit: made keyboardselections in the buffermodel to span over the...

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

diff --git a/src/client/client.h b/src/client/client.h
index 342f8d0..d99534b 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -31,13 +31,14 @@ class BufferInfo;
 class Message;
 
 class Identity;
-class NetworkInfo;
+class Network;
 
 
 class AbstractUi;
 class AbstractUiMsg;
 class NetworkModel;
 class BufferModel;
+class NickModel;
 class SignalProxy;
 
 class QTimer;
@@ -51,15 +52,13 @@ public:
   static void destroy();
   static void init(AbstractUi *);
 
-  static QList<NetworkInfo *> networkInfos();
-  static NetworkInfo *networkInfo(uint networkid);
+  static QList<Network *> networks();
+  static Network *network(uint networkid);
 
   static QList<BufferInfo> allBufferInfos();
   static QList<Buffer *> buffers();
   static Buffer *buffer(uint bufferUid);
   static Buffer *buffer(BufferInfo);
-  static BufferInfo statusBufferInfo(QString net);
-  static BufferInfo bufferInfo(QString net, QString buf);
 
   static QList<IdentityId> identityIds();
   static const Identity * identity(IdentityId);
@@ -84,6 +83,7 @@ public:
 
   static NetworkModel *networkModel();
   static BufferModel *bufferModel();
+  static NickModel *nickModel();
   static SignalProxy *signalProxy();
 
   static AbstractUiMsg *layoutMsg(const Message &);
@@ -102,9 +102,7 @@ public:
 signals:
   void sendInput(BufferInfo, QString message);
   void showBuffer(Buffer *);
-  void bufferSelected(Buffer *);
-  void bufferUpdated(Buffer *);
-  void bufferActivity(Buffer::ActivityLevel, Buffer *);
+  void bufferUpdated(BufferInfo bufferInfo);
   void backlogReceived(Buffer *, QList<Message>);
   void requestBacklog(BufferInfo, QVariant, QVariant);
   void requestNetworkStates();
@@ -175,8 +173,7 @@ private slots:
   void layoutMsg();
 
   void bufferDestroyed();
-  void networkInfoDestroyed();
-  void ircChannelAdded(QString);
+  void networkDestroyed();
   void coreIdentityCreated(const Identity &);
   void coreIdentityRemoved(IdentityId);
 
@@ -194,6 +191,7 @@ private:
   QPointer<AbstractUi> mainUi;
   QPointer<NetworkModel> _networkModel;
   QPointer<BufferModel> _bufferModel;
+  QPointer<NickModel> _nickModel;
 
   ClientMode clientMode;
 
@@ -202,7 +200,7 @@ private:
 
   QVariantMap coreConnectionInfo;
   QHash<BufferId, Buffer *> _buffers;
-  QHash<NetworkId, NetworkInfo *> _networkInfo;
+  QHash<NetworkId, Network *> _network;
   QHash<IdentityId, Identity *> _identities;
 
   QTimer *layoutTimer;