projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stage 3
[quassel.git]
/
src
/
core
/
core.cpp
diff --git
a/src/core/core.cpp
b/src/core/core.cpp
index
5159f93
..
7b57661
100644
(file)
--- a/
src/core/core.cpp
+++ b/
src/core/core.cpp
@@
-25,7
+25,7
@@
Core *Core::instanceptr = 0;
Core *Core::instanceptr = 0;
-Core *
Core::instance() {
+Core *Core::instance() {
if(instanceptr) return instanceptr;
instanceptr = new Core();
instanceptr->init();
if(instanceptr) return instanceptr;
instanceptr = new Core();
instanceptr->init();
@@
-38,7
+38,6
@@
void Core::destroy() {
}
Core::Core() {
}
Core::Core() {
-
}
void Core::init() {
}
void Core::init() {
@@
-121,7
+120,7
@@
void Core::clientHasData() {
return;
}
}
return;
}
}
- blockSizes[socket] = bsize = 0; // FIXME blockSizes aufr
ä
um0rn!
+ blockSizes[socket] = bsize = 0; // FIXME blockSizes aufr
ä
um0rn!
}
// FIXME: no longer called, since connection handling is now in SignalProxy
}
// FIXME: no longer called, since connection handling is now in SignalProxy
@@
-163,10
+162,10
@@
void Core::processClientInit(QTcpSocket *socket, const QVariant &v) {
QVariant Core::initSession(UserId uid) {
// Find or create session for validated user
CoreSession *sess;
QVariant Core::initSession(UserId uid) {
// Find or create session for validated user
CoreSession *sess;
- if(sessions.contains(uid)) sess = sessions[uid];
- else {
+ if(sessions.contains(uid))
+ sess = sessions[uid];
+ else
sess = createSession(uid);
sess = createSession(uid);
- }
QVariantMap reply;
reply["SessionState"] = sess->sessionState();
return reply;
QVariantMap reply;
reply["SessionState"] = sess->sessionState();
return reply;