projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
taming and reenabling the irc timeout detection
[quassel.git]
/
src
/
core
/
corenetwork.h
diff --git
a/src/core/corenetwork.h
b/src/core/corenetwork.h
index
f088707
..
42ad12d
100644
(file)
--- a/
src/core/corenetwork.h
+++ b/
src/core/corenetwork.h
@@
-91,7
+91,7
@@
public slots:
virtual void setAutoReconnectRetries(quint16);
void connectToIrc(bool reconnecting = false);
virtual void setAutoReconnectRetries(quint16);
void connectToIrc(bool reconnecting = false);
- void disconnectFromIrc(bool requested = true, const QString &reason = QString());
+ void disconnectFromIrc(bool requested = true, const QString &reason = QString()
, bool withReconnect = false
);
void userInput(BufferInfo bufferInfo, QString msg);
void putRawLine(QByteArray input);
void userInput(BufferInfo bufferInfo, QString msg);
void putRawLine(QByteArray input);
@@
-106,6
+106,8
@@
public slots:
Server usedServer() const;
Server usedServer() const;
+ inline void resetPingTimeout() { _lastPingTime = 0; }
+
signals:
void recvRawServerMsg(QString);
void displayStatusMsg(QString);
signals:
void recvRawServerMsg(QString);
void displayStatusMsg(QString);
@@
-129,8
+131,11
@@
private slots:
void networkInitialized();
void sendPerform();
void networkInitialized();
void sendPerform();
+ void restoreUserModes();
void doAutoReconnect();
void sendPing();
void doAutoReconnect();
void sendPing();
+ void enablePingTimeout();
+ void disablePingTimeout();
void sendAutoWho();
void startAutoWhoCycle();
void sendAutoWho();
void startAutoWhoCycle();
@@
-166,11
+171,13
@@
private:
* it is needed to determine whether or not the connection needs to be
* in the automatic session restore. */
bool _quitRequested;
* it is needed to determine whether or not the connection needs to be
* in the automatic session restore. */
bool _quitRequested;
+ QString _quitReason;
bool _previousConnectionAttemptFailed;
int _lastUsedServerIndex;
QTimer _pingTimer;
bool _previousConnectionAttemptFailed;
int _lastUsedServerIndex;
QTimer _pingTimer;
+ uint _lastPingTime;
bool _autoWhoEnabled;
QStringList _autoWhoQueue;
bool _autoWhoEnabled;
QStringList _autoWhoQueue;