From 8fab9167beb2407c1153930ed03a4badd0c2b59f Mon Sep 17 00:00:00 2001 From: Nicholas Guriev Date: Mon, 20 Jan 2020 08:13:20 +0300 Subject: [PATCH] Use QStringList::join to print notifications capabilities --- .../linux/notifications_manager_linux.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp index 7c4441152b..6bde362a58 100644 --- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp @@ -52,19 +52,19 @@ std::vector GetServerInformation( return serverInformation; } -std::vector GetCapabilities( +QStringList GetCapabilities( const std::shared_ptr ¬ificationInterface) { QDBusReply capabilitiesReply = notificationInterface ->call(qsl("GetCapabilities")); if (capabilitiesReply.isValid()) { - return capabilitiesReply.value().toVector().toStdVector(); + return capabilitiesReply.value(); } else { LOG(("Native notification error: %1") .arg(capabilitiesReply.error().message())); } - return std::vector(); + return {}; } QVersionNumber ParseSpecificationVersion( @@ -303,14 +303,7 @@ Manager::Private::Private(Manager *manager, Type type) } if (!capabilities.empty()) { - const auto capabilitiesString = std::accumulate( - capabilities.begin(), - capabilities.end(), - QString{}, - [](auto &s, auto &p) { - return s + (p + qstr(", ")); - }).chopped(2); - + const auto capabilitiesString = capabilities.join(", "); LOG(("Notification daemon capabilities: %1").arg(capabilitiesString)); } }