X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.h;h=83ea6f313a4c34d3453650522747122b88111b3f;hp=d6d1830686de5a0d1245cfea530bc567637826ee;hb=90ee8b5c90923a3d4a48fc5493ca999e9d0d6a97;hpb=3ed7d3bb6e9123ff0aa77023b264a39d1f63bd90

diff --git a/src/core/networkconnection.h b/src/core/networkconnection.h
index d6d18306..83ea6f31 100644
--- a/src/core/networkconnection.h
+++ b/src/core/networkconnection.h
@@ -24,9 +24,15 @@
 #include <QAbstractSocket>
 #include <QString>
 #include <QStringList>
-#include <QTcpSocket>
 #include <QTimer>
 
+#ifndef QT_NO_OPENSSL
+# include <QSslSocket>
+# include <QSslError>
+#else
+# include <QTcpSocket>
+#endif
+
 #include "identity.h"
 #include "message.h"
 #include "network.h"
@@ -120,17 +126,30 @@ signals:
   void channelJoined(NetworkId, const QString &channel, const QString &key = QString());
   void channelParted(NetworkId, const QString &channel);
 
+  void sslErrors(const QVariant &errorData);
+
 private slots:
   void socketHasData();
   void socketError(QAbstractSocket::SocketError);
   void socketConnected();
+  void socketInitialized();
   void socketDisconnected();
   void socketStateChanged(QAbstractSocket::SocketState);
   void setConnectionState(Network::ConnectionState);
   void networkInitialized(const QString &currentServer);
 
+#ifndef QT_NO_OPENSSL
+  void socketEncrypted();
+  void sslErrors(const QList<QSslError> &errors);
+#endif
+
 private:
+#ifndef QT_NO_OPENSSL
+  QSslSocket socket;
+#else
   QTcpSocket socket;
+#endif
+
   Network::ConnectionState _connectionState;
 
   Network *_network;
@@ -148,6 +167,11 @@ private:
 
   QTimer _whoTimer;
 
+  bool _previousConnectionAttemptFailed;
+  int _lastUsedServerlistIndex;
+  
+  QByteArray lastMsgReceived;  //  FIXME debug
+  
   class ParseError : public Exception {
   public:
     ParseError(QString cmd, QString prefix, QStringList params);