From cba84f2cb7033e02ccf30bda05cab083ce27e5e9 Mon Sep 17 00:00:00 2001
From: Adrien Beraud <adrien.beraud@savoirfairelinux.com>
Date: Mon, 13 Jan 2025 14:28:20 -0500
Subject: [PATCH] conversation: simplify indexOfActiveCall
Change-Id: Ic31b708fc7bea67ea00171665aca955dd2633c37
---
src/app/lrcinstance.cpp | 2 +-
src/libclient/api/conversation.h | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/app/lrcinstance.cpp b/src/app/lrcinstance.cpp
index e2f87e644..de8ec2f52 100644
--- a/src/app/lrcinstance.cpp
+++ b/src/app/lrcinstance.cpp
@@ -412,7 +412,7 @@ LRCInstance::indexOfActiveCall(const QString& confId, const QString& uri, const
{
if (auto optConv = getCurrentConversationModel()->getConversationForUid(selectedConvUid_)) {
auto& convInfo = optConv->get();
- return convInfo.indexOfActiveCall({{"confId", confId}, {"uri", uri}, {"device", deviceId}});
+ return convInfo.indexOfActiveCall(confId, uri, deviceId);
}
return -1;
}
diff --git a/src/libclient/api/conversation.h b/src/libclient/api/conversation.h
index 4368ab985..a80831a4a 100644
--- a/src/libclient/api/conversation.h
+++ b/src/libclient/api/conversation.h
@@ -95,12 +95,11 @@ struct Info
MapStringString infos {};
MapStringString preferences {};
- int indexOfActiveCall(const MapStringString& commit)
+ int indexOfActiveCall(const QString& confId, const QString& uri, const QString& deviceId)
{
for (auto idx = 0; idx != activeCalls.size(); ++idx) {
const auto& call = activeCalls[idx];
- if (call["id"] == commit["confId"] && call["uri"] == commit["uri"]
- && call["device"] == commit["device"]) {
+ if (call["id"] == confId && call["uri"] == uri && call["device"] == deviceId) {
return idx;
}
}
--
GitLab