procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Use QStringList::join to print notifications capabilities

This commit is contained in:
Nicholas Guriev 2020-01-20 08:13:20 +03:00 committed by John Preston
parent 965a01a4cd
commit 8fab9167be
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
View File

@ -52,19 +52,19 @@ std::vector<QString> GetServerInformation(
return serverInformation; return serverInformation;
} }
std::vector<QString> GetCapabilities( QStringList GetCapabilities(
const std::shared_ptr<QDBusInterface> &notificationInterface) { const std::shared_ptr<QDBusInterface> &notificationInterface) {
QDBusReply<QStringList> capabilitiesReply = notificationInterface QDBusReply<QStringList> capabilitiesReply = notificationInterface
->call(qsl("GetCapabilities")); ->call(qsl("GetCapabilities"));
if (capabilitiesReply.isValid()) { if (capabilitiesReply.isValid()) {
return capabilitiesReply.value().toVector().toStdVector(); return capabilitiesReply.value();
} else { } else {
LOG(("Native notification error: %1") LOG(("Native notification error: %1")
.arg(capabilitiesReply.error().message())); .arg(capabilitiesReply.error().message()));
} }
return std::vector<QString>(); return {};
} }
QVersionNumber ParseSpecificationVersion( QVersionNumber ParseSpecificationVersion(
@ -303,14 +303,7 @@ Manager::Private::Private(Manager *manager, Type type)
} }
if (!capabilities.empty()) { if (!capabilities.empty()) {
const auto capabilitiesString = std::accumulate( const auto capabilitiesString = capabilities.join(", ");
capabilities.begin(),
capabilities.end(),
QString{},
[](auto &s, auto &p) {
return s + (p + qstr(", "));
}).chopped(2);
LOG(("Notification daemon capabilities: %1").arg(capabilitiesString)); LOG(("Notification daemon capabilities: %1").arg(capabilitiesString));
} }
} }