projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
types.h: add missing include
[quassel.git]
/
src
/
core
/
coresession.cpp
diff --git
a/src/core/coresession.cpp
b/src/core/coresession.cpp
index
fb0aad8
..
d7a330a
100644
(file)
--- a/
src/core/coresession.cpp
+++ b/
src/core/coresession.cpp
@@
-37,7
+37,7
@@
#include "coreusersettings.h"
#include "ctcpparser.h"
#include "eventstringifier.h"
#include "coreusersettings.h"
#include "ctcpparser.h"
#include "eventstringifier.h"
-#include "internal
connection
.h"
+#include "internal
peer
.h"
#include "ircchannel.h"
#include "ircparser.h"
#include "ircuser.h"
#include "ircchannel.h"
#include "ircparser.h"
#include "ircuser.h"
@@
-46,7
+46,7
@@
#include "storage.h"
#include "util.h"
#include "storage.h"
#include "util.h"
-#include "protocols/legacy/legacy
connection
.h"
+#include "protocols/legacy/legacy
peer
.h"
class ProcessMessagesEvent : public QEvent
{
class ProcessMessagesEvent : public QEvent
{
@@
-79,7
+79,7
@@
CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
p->setHeartBeatInterval(30);
p->setMaxHeartBeatCount(60); // 30 mins until we throw a dead socket out
p->setHeartBeatInterval(30);
p->setMaxHeartBeatCount(60); // 30 mins until we throw a dead socket out
- connect(p, SIGNAL(peerRemoved(
SignalProxy::AbstractPeer*)), SLOT(removeClient(SignalProxy::Abstract
Peer*)));
+ connect(p, SIGNAL(peerRemoved(
Peer*)), SLOT(removeClient(
Peer*)));
connect(p, SIGNAL(connected()), SLOT(clientsConnected()));
connect(p, SIGNAL(disconnected()), SLOT(clientsDisconnected()));
connect(p, SIGNAL(connected()), SLOT(clientsConnected()));
connect(p, SIGNAL(disconnected()), SLOT(clientsDisconnected()));
@@
-206,28
+206,28
@@
void CoreSession::restoreSessionState()
}
}
-void CoreSession::addClient(Remote
Connection *connection
)
+void CoreSession::addClient(Remote
Peer *peer
)
{
QVariantMap reply;
reply["MsgType"] = "SessionInit";
reply["SessionState"] = sessionState();
{
QVariantMap reply;
reply["MsgType"] = "SessionInit";
reply["SessionState"] = sessionState();
-
connection
->writeSocketData(reply);
- signalProxy()->addPeer(
connection
);
+
peer
->writeSocketData(reply);
+ signalProxy()->addPeer(
peer
);
}
}
-void CoreSession::addClient(Internal
Connection *connection
)
+void CoreSession::addClient(Internal
Peer *peer
)
{
{
- signalProxy()->addPeer(
connection
);
+ signalProxy()->addPeer(
peer
);
emit sessionState(sessionState());
}
emit sessionState(sessionState());
}
-void CoreSession::removeClient(
SignalProxy::Abstract
Peer *peer)
+void CoreSession::removeClient(Peer *peer)
{
{
- Remote
Connection *connection = qobject_cast<RemoteConnection
*>(peer);
- if (
connection
)
- quInfo() << qPrintable(tr("Client")) <<
connection
->description() << qPrintable(tr("disconnected (UserId: %1).").arg(user().toInt()));
+ Remote
Peer *p = qobject_cast<RemotePeer
*>(peer);
+ if (
p
)
+ quInfo() << qPrintable(tr("Client")) <<
p
->description() << qPrintable(tr("disconnected (UserId: %1).").arg(user().toInt()));
}
}
@@
-350,7
+350,7
@@
void CoreSession::processMessages()
// recheck if there exists a buffer to store a redirected message in
for (int i = 0; i < redirectedMessages.count(); i++) {
// recheck if there exists a buffer to store a redirected message in
for (int i = 0; i < redirectedMessages.count(); i++) {
- const RawMessage &rawMsg =
_messageQueue
.at(i);
+ const RawMessage &rawMsg =
redirectedMessages
.at(i);
if (bufferInfoCache.contains(rawMsg.networkId) && bufferInfoCache[rawMsg.networkId].contains(rawMsg.target)) {
bufferInfo = bufferInfoCache[rawMsg.networkId][rawMsg.target];
}
if (bufferInfoCache.contains(rawMsg.networkId) && bufferInfoCache[rawMsg.networkId].contains(rawMsg.target)) {
bufferInfo = bufferInfoCache[rawMsg.networkId][rawMsg.target];
}