X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.h;h=0d8d837af8151e596bafc888571dd5de599ca6e7;hp=16bfccc4223e92c919960784e80713907ad1cd32;hb=fc81975a545211f3ccd3d25e266477adad2c9445;hpb=72d23cc04e32bfc166720f9b7ecaf4f53e63ec5e

diff --git a/src/core/networkconnection.h b/src/core/networkconnection.h
index 16bfccc4..0d8d837a 100644
--- a/src/core/networkconnection.h
+++ b/src/core/networkconnection.h
@@ -26,7 +26,7 @@
 #include <QStringList>
 #include <QTimer>
 
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
 # include <QSslSocket>
 # include <QSslError>
 #else
@@ -39,8 +39,6 @@
 #include "network.h"
 #include "signalproxy.h"
 
-class Network;
-
 class IrcServerHandler;
 class UserInputHandler;
 class CtcpHandler;
@@ -95,7 +93,8 @@ public slots:
   void userInput(BufferInfo bufferInfo, QString msg);
 
   void putRawLine(QByteArray input);
-  void putCmd(const QString &cmd, const QVariantList &params, const QByteArray &prefix = QByteArray());
+  int lastParamOverrun(const QString &cmd, const QList<QByteArray> &params);
+  void putCmd(const QString &cmd, const QList<QByteArray> &params, const QByteArray &prefix = QByteArray());
 
   void setChannelJoined(const QString &channel);
   void setChannelParted(const QString &channel);
@@ -139,11 +138,12 @@ private slots:
   void sendPerform();
   void autoReconnectSettingsChanged();
   void doAutoReconnect();
+  void sendPing();
   void sendAutoWho();
   void startAutoWhoCycle();
   void nickChanged(const QString &newNick, const QString &oldNick); // this signal is inteded to rename query buffers in the storage backend
 
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
   void socketEncrypted();
   void sslErrors(const QList<QSslError> &errors);
 #endif
@@ -151,7 +151,7 @@ private slots:
   void fillBucketAndProcessQueue();
 
 private:
-#ifndef QT_NO_OPENSSL
+#ifdef HAVE_SSL
   QSslSocket socket;
 #else
   QTcpSocket socket;
@@ -175,11 +175,16 @@ private:
 
   QTimer _socketCloseTimer;
 
+  /* this flag triggers quitRequested() once the socket is closed
+   * it is needed to determine whether or not the connection needs to be
+   *in the automatic session restore. */
   bool _quitRequested;
 
   bool _previousConnectionAttemptFailed;
   int _lastUsedServerlistIndex;
 
+  QTimer _pingTimer;
+  
   bool _autoWhoEnabled;
   QStringList _autoWhoQueue;
   QHash<QString, int> _autoWhoInProgress;
@@ -194,12 +199,8 @@ private:
   int _tokenBucket; // the virtual bucket that holds the tokens
   QList<QByteArray> _msgQueue;
 
-  int _maxMsgSize;
-
   void writeToSocket(QByteArray s);
 
-
-
   class ParseError : public Exception {
   public:
     ParseError(QString cmd, QString prefix, QStringList params);