aboutsummaryrefslogtreecommitdiff
path: root/room.cpp
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2018-01-13 14:22:33 +0900
committerKitsune Ral <Kitsune-Ral@users.sf.net>2018-01-13 14:22:33 +0900
commit1902ab6d923d2e3e475e5559ff409b68b3c66f67 (patch)
treece2a8c237a2d265b65b0d2a5d060d246fce60340 /room.cpp
parentf80065013935a0b32acafd4d96dda271441436fe (diff)
parentf8f7fb7a00e5100881e347f18e96a5b1a8f56227 (diff)
downloadlibquotient-1902ab6d923d2e3e475e5559ff409b68b3c66f67.tar.gz
libquotient-1902ab6d923d2e3e475e5559ff409b68b3c66f67.zip
Merge branch 'master' into kitsune-gtad
Diffstat (limited to 'room.cpp')
-rw-r--r--room.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/room.cpp b/room.cpp
index b647a506..28107228 100644
--- a/room.cpp
+++ b/room.cpp
@@ -510,7 +510,7 @@ void Room::Private::addMember(User *u)
{
insertMemberIntoMap(u);
connect(u, &User::nameChanged, q,
- bind(&Private::renameMember, this, _1, _2));
+ std::bind(&Private::renameMember, this, u, _2));
emit q->userAdded(u);
}
}