aboutsummaryrefslogtreecommitdiff
path: root/connection.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'connection.cpp')
-rw-r--r--connection.cpp16
1 files changed, 6 insertions, 10 deletions
diff --git a/connection.cpp b/connection.cpp
index 7920125d..2c9ee88a 100644
--- a/connection.cpp
+++ b/connection.cpp
@@ -238,7 +238,7 @@ User* Connection::user(const QString& userId)
{
if( d->userMap.contains(userId) )
return d->userMap.value(userId);
- User* user = createUser(userId);
+ auto* user = createUser(this, userId);
d->userMap.insert(userId, user);
return user;
}
@@ -297,7 +297,7 @@ Room* Connection::provideRoom(const QString& id)
return d->roomMap.value(id);
// Not yet in the map, create a new one.
- Room* room = createRoom(id);
+ auto* room = createRoom(this, id);
if (room)
{
d->roomMap.insert( id, room );
@@ -309,15 +309,11 @@ Room* Connection::provideRoom(const QString& id)
return room;
}
-User* Connection::createUser(const QString& userId)
-{
- return new User(userId, this);
-}
+std::function<Room*(Connection*, const QString&)> Connection::createRoom =
+ [](Connection* c, const QString& id) { return new Room(c, id); };
-Room* Connection::createRoom(const QString& roomId)
-{
- return new Room(this, roomId);
-}
+std::function<User*(Connection*, const QString&)> Connection::createUser =
+ [](Connection* c, const QString& id) { return new User(id, c); };
QByteArray Connection::generateTxnId()
{