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 53ad0b5..d99534b 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -38,6 +38,7 @@ class AbstractUi;
 class AbstractUiMsg;
 class NetworkModel;
 class BufferModel;
+class NickModel;
 class SignalProxy;
 
 class QTimer;
@@ -58,8 +59,6 @@ public:
   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();
@@ -176,7 +174,6 @@ private slots:
 
   void bufferDestroyed();
   void networkDestroyed();
-  void ircChannelAdded(QString);
   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;