projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This should fix duplicate messages that would occur when new messages arrived while...
[quassel.git]
/
src
/
core
/
networkconnection.h
diff --git
a/src/core/networkconnection.h
b/src/core/networkconnection.h
index
c5694ca
..
57fd9d2
100644
(file)
--- a/
src/core/networkconnection.h
+++ b/
src/core/networkconnection.h
@@
-27,6
+27,7
@@
#include <QTcpSocket>
#include <QTimer>
#include <QTcpSocket>
#include <QTimer>
+#include "identity.h"
#include "message.h"
#include "network.h"
#include "signalproxy.h"
#include "message.h"
#include "network.h"
#include "signalproxy.h"
@@
-42,12
+43,13
@@
class NetworkConnection : public QObject {
Q_OBJECT
public:
Q_OBJECT
public:
- NetworkConnection(Network *network, CoreSession *session
, const QVariant &previousState = QVariant()
);
+ NetworkConnection(Network *network, CoreSession *session);
~NetworkConnection();
NetworkId networkId() const;
QString networkName() const;
Network *network() const;
~NetworkConnection();
NetworkId networkId() const;
QString networkName() const;
Network *network() const;
+ Identity *identity() const;
CoreSession *coreSession() const;
bool isConnected() const;
CoreSession *coreSession() const;
bool isConnected() const;
@@
-57,39
+59,44
@@
public:
UserInputHandler *userInputHandler() const;
CtcpHandler *ctcpHandler() const;
UserInputHandler *userInputHandler() const;
CtcpHandler *ctcpHandler() const;
- //! Return data necessary to restore the connection state upon core restart
- QVariant state() const;
-
//! Decode a string using the server (network) decoding.
QString serverDecode(const QByteArray &string) const;
//! Decode a string using the server (network) decoding.
QString serverDecode(const QByteArray &string) const;
- //! Decode a string using a
buffer-specific encoding if one is set (and use the server
encoding else).
- QString
bufferDecode(const QString &buffer
Name, const QByteArray &string) const;
+ //! Decode a string using a
channel-specific encoding if one is set (and use the standard
encoding else).
+ QString
channelDecode(const QString &channel
Name, const QByteArray &string) const;
- //! Decode a string using a
IrcUser specific encoding, if one exists (using the server
encoding else).
+ //! Decode a string using a
n IrcUser-specific encoding, if one exists (using the standaed
encoding else).
QString userDecode(const QString &userNick, const QByteArray &string) const;
//! Encode a string using the server (network) encoding.
QByteArray serverEncode(const QString &string) const;
QString userDecode(const QString &userNick, const QByteArray &string) const;
//! Encode a string using the server (network) encoding.
QByteArray serverEncode(const QString &string) const;
- //! Encode a string using the
buffer-specific encoding, if set, and use the server
encoding else.
- QByteArray
bufferEncode(const QString &buffer
Name, const QString &string) const;
+ //! Encode a string using the
channel-specific encoding, if set, and use the standard
encoding else.
+ QByteArray
channelEncode(const QString &channel
Name, const QString &string) const;
- //! Encode a string using the user-specific encoding, if set, and use the s
erver
encoding else.
+ //! Encode a string using the user-specific encoding, if set, and use the s
tandard
encoding else.
QByteArray userEncode(const QString &userNick, const QString &string) const;
QByteArray userEncode(const QString &userNick, const QString &string) const;
+ inline QString channelKey(const QString &channel) const { return _channelKeys.value(channel, QString()); }
+
public slots:
// void setServerOptions();
public slots:
// void setServerOptions();
- void connectToIrc();
+ void connectToIrc(
bool reconnecting = false
);
void disconnectFromIrc();
void userInput(BufferInfo bufferInfo, QString msg);
void disconnectFromIrc();
void userInput(BufferInfo bufferInfo, QString msg);
- void putRawLine(Q
String
input);
- void putCmd(
QString cmd, QStringList params, QString prefix = 0
);
+ void putRawLine(Q
ByteArray
input);
+ void putCmd(
const QString &cmd, const QVariantList ¶ms, const QByteArray &prefix = QByteArray()
);
+ void addChannelKey(const QString &channel, const QString &key);
+ void removeChannelKey(const QString &channel);
private slots:
void sendPerform();
private slots:
void sendPerform();
+ void autoReconnectSettingsChanged();
+ void doAutoReconnect();
+ void sendWho();
+ void nickChanged(const QString &newNick, const QString &oldNick); // this signal is inteded to rename query buffers in the storage backend
signals:
// #void networkState(QString net, QVariantMap data);
signals:
// #void networkState(QString net, QVariantMap data);
@@
-103,8
+110,10
@@
signals:
void connectionInitialized(); ///< Emitted after receipt of 001 to indicate that we can now send data to the IRC server
void connectionError(const QString &errorMsg);
void connectionInitialized(); ///< Emitted after receipt of 001 to indicate that we can now send data to the IRC server
void connectionError(const QString &errorMsg);
-
//void queryRequested(QString network, QString nick
);
+
void quitRequested(NetworkId networkId
);
+ //void queryRequested(QString network, QString nick);
+ void nickChanged(const NetworkId &networkId, const QString &newNick, const QString &oldNick); // this signal is inteded to rename query buffers in the storage backend
private slots:
void socketHasData();
private slots:
void socketHasData();
@@
-113,7
+122,7
@@
private slots:
void socketDisconnected();
void socketStateChanged(QAbstractSocket::SocketState);
void setConnectionState(Network::ConnectionState);
void socketDisconnected();
void socketStateChanged(QAbstractSocket::SocketState);
void setConnectionState(Network::ConnectionState);
- void networkInitialized();
+ void networkInitialized(
const QString ¤tServer
);
private:
QTcpSocket socket;
private:
QTcpSocket socket;
@@
-121,15
+130,17
@@
private:
Network *_network;
CoreSession *_coreSession;
Network *_network;
CoreSession *_coreSession;
+ BufferInfo _statusBufferInfo;
IrcServerHandler *_ircServerHandler;
UserInputHandler *_userInputHandler;
CtcpHandler *_ctcpHandler;
IrcServerHandler *_ircServerHandler;
UserInputHandler *_userInputHandler;
CtcpHandler *_ctcpHandler;
- QVariantMap networkSettings;
- QVariantMap identity;
+ QHash<QString, QString> _channelKeys;
+ QTimer _autoReconnectTimer;
+ int _autoReconnectCount;
- Q
Variant _previousState
;
+ Q
Timer _whoTimer
;
class ParseError : public Exception {
public:
class ParseError : public Exception {
public:
@@
-140,7
+151,6
@@
private:
public:
UnknownCmdError(QString cmd, QString prefix, QStringList params);
};
public:
UnknownCmdError(QString cmd, QString prefix, QStringList params);
};
-
};
#endif
};
#endif