As preparation for revamping the whole networking stuff, I did two renames:

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

diff --git a/src/client/client.h b/src/client/client.h
index 60aa7c1..53ad0b5 100644 (file)
--- 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,8 +51,8 @@ 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();
@@ -82,6 +83,7 @@ public:
   static void removeIdentity(IdentityId id);
 
   static NetworkModel *networkModel();
+  static BufferModel *bufferModel();
   static SignalProxy *signalProxy();
 
   static AbstractUiMsg *layoutMsg(const Message &);
@@ -173,7 +175,7 @@ private slots:
   void layoutMsg();
 
   void bufferDestroyed();
-  void networkInfoDestroyed();
+  void networkDestroyed();
   void ircChannelAdded(QString);
   void coreIdentityCreated(const Identity &);
   void coreIdentityRemoved(IdentityId);
@@ -191,6 +193,7 @@ private:
   QPointer<SignalProxy> _signalProxy;
   QPointer<AbstractUi> mainUi;
   QPointer<NetworkModel> _networkModel;
+  QPointer<BufferModel> _bufferModel;
 
   ClientMode clientMode;
 
@@ -199,7 +202,7 @@ private:
 
   QVariantMap coreConnectionInfo;
   QHash<BufferId, Buffer *> _buffers;
-  QHash<NetworkId, NetworkInfo *> _networkInfo;
+  QHash<NetworkId, Network *> _network;
   QHash<IdentityId, Identity *> _identities;
 
   QTimer *layoutTimer;