X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=333479202300ef874c2c11a6abee2eea58b2a304;hp=60aa7c1fdd83b83b2ab7e152c9cdf45b62f99795;hb=f12dbcd32ef6eff25bd730444e5165935e6b0cf5;hpb=c6bc07febff322910675a1eb60c44f6be209a934

diff --git a/src/client/client.h b/src/client/client.h
index 60aa7c1f..33347920 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -31,12 +31,13 @@ class BufferInfo;
 class Message;
 
 class Identity;
-class NetworkInfo;
+class Network;
 
 
 class AbstractUi;
 class AbstractUiMsg;
 class NetworkModel;
+class BufferModel;
 class SignalProxy;
 
 class QTimer;
@@ -50,15 +51,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);
@@ -82,6 +81,7 @@ public:
   static void removeIdentity(IdentityId id);
 
   static NetworkModel *networkModel();
+  static BufferModel *bufferModel();
   static SignalProxy *signalProxy();
 
   static AbstractUiMsg *layoutMsg(const Message &);
@@ -100,9 +100,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();
@@ -173,8 +171,7 @@ private slots:
   void layoutMsg();
 
   void bufferDestroyed();
-  void networkInfoDestroyed();
-  void ircChannelAdded(QString);
+  void networkDestroyed();
   void coreIdentityCreated(const Identity &);
   void coreIdentityRemoved(IdentityId);
 
@@ -191,6 +188,7 @@ private:
   QPointer<SignalProxy> _signalProxy;
   QPointer<AbstractUi> mainUi;
   QPointer<NetworkModel> _networkModel;
+  QPointer<BufferModel> _bufferModel;
 
   ClientMode clientMode;
 
@@ -199,7 +197,7 @@ private:
 
   QVariantMap coreConnectionInfo;
   QHash<BufferId, Buffer *> _buffers;
-  QHash<NetworkId, NetworkInfo *> _networkInfo;
+  QHash<NetworkId, Network *> _network;
   QHash<IdentityId, Identity *> _identities;
 
   QTimer *layoutTimer;