projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added a convenience method: Client::bufferModel()->switchToBuffer(bufferId)
[quassel.git]
/
src
/
core
/
networkconnection.h
diff --git
a/src/core/networkconnection.h
b/src/core/networkconnection.h
index
cebf837
..
111ffe7
100644
(file)
--- a/
src/core/networkconnection.h
+++ b/
src/core/networkconnection.h
@@
-39,8
+39,6
@@
#include "network.h"
#include "signalproxy.h"
#include "network.h"
#include "signalproxy.h"
-class Network;
-
class IrcServerHandler;
class UserInputHandler;
class CtcpHandler;
class IrcServerHandler;
class UserInputHandler;
class CtcpHandler;
@@
-140,6
+138,7
@@
private slots:
void sendPerform();
void autoReconnectSettingsChanged();
void doAutoReconnect();
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
void sendAutoWho();
void startAutoWhoCycle();
void nickChanged(const QString &newNick, const QString &oldNick); // this signal is inteded to rename query buffers in the storage backend
@@
-176,11
+175,16
@@
private:
QTimer _socketCloseTimer;
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;
bool _quitRequested;
bool _previousConnectionAttemptFailed;
int _lastUsedServerlistIndex;
+ QTimer _pingTimer;
+
bool _autoWhoEnabled;
QStringList _autoWhoQueue;
QHash<QString, int> _autoWhoInProgress;
bool _autoWhoEnabled;
QStringList _autoWhoQueue;
QHash<QString, int> _autoWhoInProgress;
@@
-195,12
+199,8
@@
private:
int _tokenBucket; // the virtual bucket that holds the tokens
QList<QByteArray> _msgQueue;
int _tokenBucket; // the virtual bucket that holds the tokens
QList<QByteArray> _msgQueue;
- int _maxMsgSize;
-
void writeToSocket(QByteArray s);
void writeToSocket(QByteArray s);
-
-
class ParseError : public Exception {
public:
ParseError(QString cmd, QString prefix, QStringList params);
class ParseError : public Exception {
public:
ParseError(QString cmd, QString prefix, QStringList params);