MixManager: Use new 'transform()'

olomono · Mar 22, 2024 · 5fc73aa · 5fc73aa
1 parent 526676f
commit 5fc73aa
Showing 1 changed file with 8 additions and 15 deletions.
diff --git a/src/client/QXmppMixManager.cpp b/src/client/QXmppMixManager.cpp
@@ -18,6 +18,8 @@
 #include "QXmppRosterManager.h"
 #include "QXmppUtils.h"
 
+#include "Algorithms.h"
+
 #include <QDomElement>
 #include <QStringBuilder>
 
@@ -431,15 +433,11 @@ QXmppTask<QXmppMixManager::ChannelJidResult> QXmppMixManager::requestChannelJids
 {
     return chain<ChannelJidResult>(d->discoveryManager->requestDiscoItems(serviceJid), this, [](QXmppDiscoveryManager::ItemsResult &&result) -> ChannelJidResult {
         if (const auto items = std::get_if<QList<QXmppDiscoveryIq::Item>>(&result)) {
-            QVector<ChannelJid> jids;
-
-            std::for_each(items->cbegin(), items->cend(), [&jids](const QXmppDiscoveryIq::Item &item) {
-                jids.append(item.jid());
+            return transform<QVector<ChannelJid>>(*items, [](const QXmppDiscoveryIq::Item &item) {
+                return item.jid();
             });
-
-            return std::move(jids);
         } else {
-            return std::move(std::get<QXmppError>(result));
+            return std::get<QXmppError>(std::move(result));
         }
     });
 }
@@ -458,9 +456,8 @@ QXmppTask<QXmppMixManager::ChannelNodeResult> QXmppMixManager::requestChannelNod
             return std::move(*error);
         } else {
             const auto &items = std::get<QList<QXmppDiscoveryIq::Item>>(result);
-            QVector<QString> nodes(items.size());
 
-            std::transform(items.cbegin(), items.cend(), nodes.begin(), [](const QXmppDiscoveryIq::Item &item) {
+            const auto nodes = transform<QVector<QString>>(items, [](const QXmppDiscoveryIq::Item &item) {
                 return item.node();
             });
 
@@ -1204,13 +1201,9 @@ QXmppTask<QXmppMixManager::JidResult> QXmppMixManager::requestJids(const QString
             return std::move(*error);
         } else {
             const auto &items = std::get<QXmppPubSubManager::Items<QXmppPubSubBaseItem>>(result).items;
-            QVector<Jid> jids;
-
-            std::for_each(items.cbegin(), items.cend(), [&jids](const QXmppPubSubBaseItem &item) mutable {
-                jids.append(item.id());
+            return transform<QVector<Jid>>(items, [](const QXmppPubSubBaseItem &item) {
+                return item.id();
             });
-
-            return std::move(jids);
         }
     });
 }