X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=cae4f9f86ea8e8146f750a13ea1c911fd7e26ad1;hb=a86c3a08e57e0a23b3e57d0b9ee9d27cc5113d21;hp=f3ac138e5ebd4baa0221501cef23678158d0f718;hpb=97d674034551438238c568e8b42efb08e1ba7354;p=quassel.git

diff --git a/src/client/client.h b/src/client/client.h
index f3ac138e..cae4f9f8 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -5,7 +5,7 @@
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -35,7 +35,7 @@ class NetworkInfo;
 
 class AbstractUi;
 class AbstractUiMsg;
-class BufferTreeModel;
+class NetworkModel;
 class SignalProxy;
 
 class QTimer;
@@ -51,7 +51,7 @@ public:
 
   static QList<NetworkInfo *> networkInfos();
   static NetworkInfo *networkInfo(uint networkid);
-  
+
   static QList<BufferInfo> allBufferInfos();
   static QList<Buffer *> buffers();
   static Buffer *buffer(uint bufferUid);
@@ -59,7 +59,7 @@ public:
   static BufferInfo statusBufferInfo(QString net);
   static BufferInfo bufferInfo(QString net, QString buf);
 
-  static BufferTreeModel *bufferModel();
+  static NetworkModel *networkModel();
   static SignalProxy *signalProxy();
 
   static AbstractUiMsg *layoutMsg(const Message &);
@@ -68,7 +68,7 @@ public:
 
   static void fakeInput(uint bufferUid, QString message);
   static void fakeInput(BufferInfo bufferInfo, QString message);
-  
+
   static void storeSessionData(const QString &key, const QVariant &data);
   static QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
   static QStringList sessionDataKeys();
@@ -89,7 +89,7 @@ signals:
   void coreConnectionError(QString errorMsg);
   void coreConnectionMsg(const QString &msg);
   void coreConnectionProgress(uint part, uint total);
-    
+
   void showConfigWizard(const QVariantMap &coredata);
 
   void connected();
@@ -104,7 +104,7 @@ public slots:
   //void connectToLocalCore();
   void connectToCore(const QVariantMap &);
   void disconnectFromCore();
-    
+
   void setCoreConfiguration(const QVariantMap &settings);
 
 private slots:
@@ -115,7 +115,6 @@ private slots:
   void coreHasData();
   void coreSocketConnected();
   void coreSocketDisconnected();
-  void coreSocketStateChanged(QAbstractSocket::SocketState);
 
   void userInput(BufferInfo, QString);
 
@@ -128,30 +127,32 @@ private slots:
   void recvBacklogData(BufferInfo, QVariantList, bool);
   void updateBufferInfo(BufferInfo);
 
+  void layoutMsg();
+
+private slots:
   void bufferDestroyed();
   void networkInfoDestroyed();
-
-  void layoutMsg();
+  void ircChannelAdded(QString);
 
 private:
   Client(QObject *parent = 0);
   virtual ~Client();
   void init();
-  
+
   void syncToCore(const QVariant &coreState);
 
   static QPointer<Client> instanceptr;
-  
+
   QPointer<QIODevice> socket;
   QPointer<SignalProxy> _signalProxy;
   QPointer<AbstractUi> mainUi;
-  QPointer<BufferTreeModel> _bufferModel;
+  QPointer<NetworkModel> _networkModel;
 
   ClientMode clientMode;
 
   quint32 blockSize;
   bool connectedToCore;
-  
+
   QVariantMap coreConnectionInfo;
   QHash<uint, Buffer *> _buffers;
   QHash<uint, NetworkInfo*> _networkInfo;