projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Encodings are now honored for both sending and receiving. Cleaned up encode/decode
[quassel.git]
/
src
/
core
/
networkconnection.h
diff --git
a/src/core/networkconnection.h
b/src/core/networkconnection.h
index
9b9c43b
..
a7aa1fd
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"
@@
-48,6
+49,7
@@
public:
NetworkId networkId() const;
QString networkName() const;
Network *network() const;
NetworkId networkId() const;
QString networkName() const;
Network *network() const;
+ Identity *identity() const;
CoreSession *coreSession() const;
bool isConnected() const;
CoreSession *coreSession() const;
bool isConnected() const;
@@
-82,10
+84,10
@@
public slots:
// void setServerOptions();
void connectToIrc();
void disconnectFromIrc();
// void setServerOptions();
void connectToIrc();
void disconnectFromIrc();
- void userInput(
QString buffer
, QString msg);
+ 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()
);
private slots:
private slots:
@@
-96,7
+98,7
@@
signals:
void recvRawServerMsg(QString);
void displayStatusMsg(QString);
//void displayMsg(Message msg);
void recvRawServerMsg(QString);
void displayStatusMsg(QString);
//void displayMsg(Message msg);
- void displayMsg(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
+ void displayMsg(Message::Type,
BufferInfo::Type,
QString target, QString text, QString sender = "", quint8 flags = Message::None);
void connected(NetworkId networkId); ///< Emitted after receipt of 001 to indicate that we can now send data to the IRC server
void disconnected(NetworkId networkId);
void connectionStateChanged(Network::ConnectionState);
void connected(NetworkId networkId); ///< Emitted after receipt of 001 to indicate that we can now send data to the IRC server
void disconnected(NetworkId networkId);
void connectionStateChanged(Network::ConnectionState);
@@
-113,7
+115,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;
@@
-126,9
+128,6
@@
private:
UserInputHandler *_userInputHandler;
CtcpHandler *_ctcpHandler;
UserInputHandler *_userInputHandler;
CtcpHandler *_ctcpHandler;
- QVariantMap networkSettings;
- QVariantMap identity;
-
QVariant _previousState;
class ParseError : public Exception {
QVariant _previousState;
class ParseError : public Exception {