X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fnetworkconnection.h;h=c28da180a58383ad3ae88b594d1243bd82a80634;hp=0745e9ef77bf912fe62b3bfcdb30b4fced7b110b;hb=07171f8337e7236c3ac3432352b41ad3c53e077b;hpb=f3fc0324c8860dff6af722dafbeb05fcb69a0c41

diff --git a/src/core/networkconnection.h b/src/core/networkconnection.h
index 0745e9ef..c28da180 100644
--- a/src/core/networkconnection.h
+++ b/src/core/networkconnection.h
@@ -86,7 +86,7 @@ public:
   inline QString channelKey(const QString &channel) const { return _channelKeys.value(channel.toLower(), QString()); }
   inline QStringList persistentChannels() const { return _channelKeys.keys(); }
 
-  inline bool isAutoWhoInProgress(const QString &channel) const { return _autoWhoInProgress.contains(channel); }
+  inline bool isAutoWhoInProgress(const QString &channel) const { return _autoWhoInProgress.value(channel.toLower(), 0); }
 
 public slots:
   // void setServerOptions();
@@ -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,14 +171,19 @@ 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;
 
   bool _autoWhoEnabled;
   QStringList _autoWhoQueue;
-  QSet<QString> _autoWhoInProgress;
+  QHash<QString, int> _autoWhoInProgress;
   int _autoWhoInterval;
   int _autoWhoNickLimit;
   int _autoWhoDelay;