projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
another try to fix those win/linux crashes :)
[quassel.git]
/
src
/
client
/
clientsyncer.h
diff --git
a/src/client/clientsyncer.h
b/src/client/clientsyncer.h
index
9501d8d
..
44e3373
100644
(file)
--- a/
src/client/clientsyncer.h
+++ b/
src/client/clientsyncer.h
@@
-23,9
+23,14
@@
#include <QPointer>
#include <QString>
#include <QPointer>
#include <QString>
-#include <QTcpSocket>
#include <QVariantMap>
#include <QVariantMap>
+#ifndef QT_NO_OPENSSL
+#include <QSslSocket>
+#else
+#include <QTcpSocket>
+#endif
+
class IrcUser;
class IrcChannel;
class IrcUser;
class IrcChannel;
@@
-51,7
+56,11
@@
class ClientSyncer : public QObject {
void loginFailed(const QString &error);
void loginSuccess();
void syncFinished();
void loginFailed(const QString &error);
void loginSuccess();
void syncFinished();
+ void startCoreSetup(const QVariantList &);
+ void coreSetupSuccess();
+ void coreSetupFailed(const QString &error);
+ void encrypted(bool);
public slots:
void connectToCore(const QVariantMap &);
public slots:
void connectToCore(const QVariantMap &);
@@
-79,6
+88,11
@@
class ClientSyncer : public QObject {
void syncToCore(const QVariantMap &sessionState);
void sessionStateReceived(const QVariantMap &state);
void syncToCore(const QVariantMap &sessionState);
void sessionStateReceived(const QVariantMap &state);
+ void doCoreSetup(const QVariant &setupData);
+#ifndef QT_NO_OPENSSL
+ void sslErrors(const QList<QSslError> &errors);
+#endif
+
private:
QPointer<QIODevice> socket;
quint32 blockSize;
private:
QPointer<QIODevice> socket;
quint32 blockSize;