Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Beatrici <davidebeatrici@gmail.com>2019-10-07 07:27:49 +0300
committerDavide Beatrici <davidebeatrici@gmail.com>2019-10-07 07:27:52 +0300
commit90c93fa7a529fa57236d21dde6ab44b16af97462 (patch)
tree18739de0e480527cb3809c1a5e22b5df9c19e6d0 /src/murmur/MurmurGRPCImpl.cpp
parent49c33c5613fc2c217aba9599fe4f76a43e38dc43 (diff)
Replace deprecated qSort() with std::sort()
https://github.com/qt/qtbase/commit/5957f245c6c77c98d7e90d614c9fe2cdbfe7e8e6 I accidentally forgot to search for "qSort" in files when I created 3132f993d83820d72124ffbb6fc4fd3810d36b8e. This commit replaces the qSort() instances I missed.
Diffstat (limited to 'src/murmur/MurmurGRPCImpl.cpp')
-rw-r--r--src/murmur/MurmurGRPCImpl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/murmur/MurmurGRPCImpl.cpp b/src/murmur/MurmurGRPCImpl.cpp
index d2265891b..07acec4ed 100644
--- a/src/murmur/MurmurGRPCImpl.cpp
+++ b/src/murmur/MurmurGRPCImpl.cpp
@@ -1700,7 +1700,7 @@ void V1_TreeQuery::impl(bool) {
ToRPC(server, currentChannel, currentTree->mutable_channel());
QList< ::User *> users = currentChannel->qlUsers;
- qSort(users.begin(), users.end(), [] (const ::User *a, const ::User *b) -> bool {
+ std::sort(users.begin(), users.end(), [] (const ::User *a, const ::User *b) -> bool {
return ::User::lessThan(a, b);
});
foreach(const ::User *u, users) {
@@ -1709,7 +1709,7 @@ void V1_TreeQuery::impl(bool) {
}
QList< ::Channel *> channels = currentChannel->qlChannels;
- qSort(channels.begin(), channels.end(), [] (const ::Channel *a, const ::Channel *b) -> bool {
+ std::sort(channels.begin(), channels.end(), [] (const ::Channel *a, const ::Channel *b) -> bool {
return ::Channel::lessThan(a, b);
});
foreach(const ::Channel *subChannel, channels) {