X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.h;h=c28da180a58383ad3ae88b594d1243bd82a80634;hb=0b25f3d02a72ebe2953441f36fd6595bb9fb4e22;hp=8654bd85366ba75ebfe4f1d7eb19d90193eaa1cc;hpb=0f2de52ddceb138686d2f53c694531744d70f596;p=quassel.git

diff --git a/src/core/networkconnection.h b/src/core/networkconnection.h
index 8654bd85..c28da180 100644
--- a/src/core/networkconnection.h
+++ b/src/core/networkconnection.h
@@ -95,7 +95,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);
@@ -130,6 +131,7 @@ private slots:
   void socketError(QAbstractSocket::SocketError);
   void socketConnected();
   void socketInitialized();
+  void socketCloseTimeout();
   void socketDisconnected();
   void socketStateChanged(QAbstractSocket::SocketState);
   void setConnectionState(Network::ConnectionState);
@@ -169,8 +171,13 @@ private:
   QHash<QString, QString> _channelKeys;  // stores persistent channels and their passwords, if any
 
   QTimer _autoReconnectTimer;
+  
   int _autoReconnectCount;
 
+  QTimer _socketCloseTimer;
+
+  bool _quitRequested;
+
   bool _previousConnectionAttemptFailed;
   int _lastUsedServerlistIndex;
 
@@ -188,8 +195,6 @@ private:
   int _tokenBucket; // the virtual bucket that holds the tokens
   QList<QByteArray> _msgQueue;
 
-  int _maxMsgSize;
-
   void writeToSocket(QByteArray s);