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

diff --git a/src/client/client.h b/src/client/client.h
index 342f8d0f..33347920 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -31,7 +31,7 @@ class BufferInfo;
 class Message;
 
 class Identity;
-class NetworkInfo;
+class Network;
 
 
 class AbstractUi;
@@ -51,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);
@@ -102,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();
@@ -175,8 +171,7 @@ private slots:
   void layoutMsg();
 
   void bufferDestroyed();
-  void networkInfoDestroyed();
-  void ircChannelAdded(QString);
+  void networkDestroyed();
   void coreIdentityCreated(const Identity &);
   void coreIdentityRemoved(IdentityId);
 
@@ -202,7 +197,7 @@ private:
 
   QVariantMap coreConnectionInfo;
   QHash<BufferId, Buffer *> _buffers;
-  QHash<NetworkId, NetworkInfo *> _networkInfo;
+  QHash<NetworkId, Network *> _network;
   QHash<IdentityId, Identity *> _identities;
 
   QTimer *layoutTimer;