X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.h;h=16c516d70762e1d8a086e82498231ebb11cc67d8;hp=8f370483bbb83e3ea69a356f79dbadd2b40df143;hb=01922b87be01cd5c9844d2a273acd9a71aee8e96;hpb=671e451cf1c10a6e3f442af82b58bfc4de0cb5a2

diff --git a/src/client/clientsyncer.h b/src/client/clientsyncer.h
index 8f370483..16c516d7 100644
--- a/src/client/clientsyncer.h
+++ b/src/client/clientsyncer.h
@@ -25,14 +25,15 @@
 #include <QString>
 #include <QVariantMap>
 
-#ifndef QT_NO_OPENSSL
-#include <QSslSocket>
+#ifdef HAVE_SSL
+#  include <QSslSocket>
 #else
-#include <QTcpSocket>
+#  include <QTcpSocket>
 #endif
 
 class IrcUser;
 class IrcChannel;
+class SignalProxy;
 
 class ClientSyncer : public QObject {
   Q_OBJECT
@@ -40,7 +41,7 @@ class ClientSyncer : public QObject {
 public:
   ClientSyncer(QObject *parent = 0);
   ~ClientSyncer();
-  
+
 signals:
   void recvPartialItem(quint32 avail, quint32 size);
   void connectionError(const QString &errorMsg);
@@ -49,7 +50,7 @@ signals:
   void networksProgress(quint32 part, quint32 total);
   void socketStateChanged(QAbstractSocket::SocketState);
   void socketDisconnected();
-  
+
   void startLogin();
   void loginFailed(const QString &error);
   void loginSuccess();
@@ -57,14 +58,17 @@ signals:
   void startCoreSetup(const QVariantList &);
   void coreSetupSuccess();
   void coreSetupFailed(const QString &error);
-  
+
   void encrypted(bool);
-		      
+
+  void connectToInternalCore(SignalProxy *proxy);
+
 public slots:
   void connectToCore(const QVariantMap &);
   void loginToCore(const QString &user, const QString &passwd);
   void disconnectFromCore();
-			   
+  void useInternalCore();
+
 private slots:
   void coreSocketError(QAbstractSocket::SocketError);
   void coreHasData();
@@ -72,24 +76,25 @@ private slots:
   void coreSocketDisconnected();
 
   void clientInitAck(const QVariantMap &msg);
-  
+
   // for sync progress
   void networkInitDone();
   void checkSyncState();
-  
+
   void syncToCore(const QVariantMap &sessionState);
+  void internalSessionStateReceived(const QVariant &packedState);
   void sessionStateReceived(const QVariantMap &state);
-  
+
   void doCoreSetup(const QVariant &setupData);
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
     void sslErrors(const QList<QSslError> &errors);
 #endif
-  
+
 private:
   QPointer<QIODevice> socket;
   quint32 blockSize;
   QVariantMap coreConnectionInfo;
-  
+
   QSet<QObject *> netsToSync;
   int numNetsToSync;
 };