X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=452bed07f7d91adf80fbb4b2c4caf160470ef409;hp=3c6b56f91f8d26c14d4da22dab0ea26f4aa5a921;hb=8c3b7e4773e9f20ad9ea264cbaafaa52485bdf86;hpb=15ee1478137bc748e27b0b06537973d8df04b9d7

diff --git a/src/client/client.h b/src/client/client.h
index 3c6b56f9..452bed07 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -18,36 +18,43 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _GUI_H_
-#define _GUI_H_
+#ifndef _CLIENT_H_
+#define _CLIENT_H_
 
-#include <QtCore>
-#include <QtGui>
-#include <QtNetwork>
+#include <QAbstractSocket>
+#include <QTcpSocket>
+#include <QList>
 
-#include "global.h"
 #include "buffer.h"
 #include "message.h"
-#include "clientproxy.h"
-//#include "bufferviewwidget.h"
+#include "proxy_common.h"
 
-class MainWin;
+class AbstractUi;
 class ClientProxy;
 class BufferTreeModel;
+class QtGui;
+
+class QTimer;
 
 class Client : public QObject {
   Q_OBJECT
 
   public:
     static Client *instance();
+    static void init(AbstractUi *);
     static void destroy();
 
+    static QList<BufferId> allBufferIds();
     static Buffer *buffer(BufferId);
     static BufferId statusBufferId(QString net);
     static BufferId bufferId(QString net, QString buf);
 
     static BufferTreeModel *bufferModel();
 
+    static AbstractUiMsg *layoutMsg(const Message &);
+
+    static bool isConnected();
+
   signals:
     void sendInput(BufferId, QString message);
     void showBuffer(Buffer *);
@@ -57,13 +64,18 @@ class Client : public QObject {
     void bufferDestroyed(Buffer *);
     void backlogReceived(Buffer *, QList<Message>);
     void requestBacklog(BufferId, QVariant, QVariant);
+    void requestNetworkStates();
 
     void recvPartialItem(quint32 avail, quint32 size);
     void coreConnectionError(QString errorMsg);
 
+    void connected();
+    void disconnected();
+
   public slots:
     //void selectBuffer(Buffer *);
-    void connectToCore(QString host, quint16 port);
+    //void connectToLocalCore();
+    void connectToCore(const VarMap &);
     void disconnectFromCore();
 
   private slots:
@@ -80,7 +92,7 @@ class Client : public QObject {
     void networkConnected(QString);
     void networkDisconnected(QString);
     void recvNetworkState(QString, QVariant);
-    void recvMessage(Message message);
+    void recvMessage(const Message &message);
     void recvStatusMsg(QString network, QString message);
     void setTopic(QString net, QString buf, QString);
     void addNick(QString net, QString nick, VarMap props);
@@ -88,7 +100,7 @@ class Client : public QObject {
     void renameNick(QString net, QString oldnick, QString newnick);
     void updateNick(QString net, QString nick, VarMap props);
     void setOwnNick(QString net, QString nick);
-    void recvBacklogData(BufferId, QList<QVariant>, bool);
+    void recvBacklogData(BufferId, const QList<QVariant> &, bool);
     void updateBufferId(BufferId);
 
     void layoutMsg();
@@ -100,26 +112,28 @@ class Client : public QObject {
     static Client *instanceptr;
 
     void syncToCore();
+    QVariant connectToLocalCore(QString user, QString passwd);  // defined in main.cpp
+    void disconnectFromLocalCore();                             // defined in main.cpp
 
     enum ClientMode { LocalCore, RemoteCore };
     static ClientMode clientMode;
 
-    MainWin *mainWin;
+    AbstractUi *mainUi;
     ClientProxy *clientProxy;
     BufferTreeModel *_bufferModel;
 
     QTcpSocket socket;
     quint32 blockSize;
 
+    static bool connectedToCore;
     static QHash<BufferId, Buffer *> buffers;
     static QHash<uint, BufferId> bufferIds;
     static QHash<QString, QHash<QString, VarMap> > nicks;
-    static QHash<QString, bool> connected;
+    static QHash<QString, bool> netConnected;
     static QHash<QString, QString> ownNick;
-    static QList<BufferId> coreBuffers;
 
     QTimer *layoutTimer;
-    QList<Message> layoutQueue;
+    QList<Buffer *> layoutQueue;
 };
 
 #endif