From f3d2842d98f2a8973b7cb214401b1d67df1bc19a Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 7 Feb 2023 17:38:29 +0100 Subject: [PATCH] Fix for Qt 5.12 --- linphone-app/src/utils/Utils.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/linphone-app/src/utils/Utils.cpp b/linphone-app/src/utils/Utils.cpp index 723dcf507..656e454a9 100644 --- a/linphone-app/src/utils/Utils.cpp +++ b/linphone-app/src/utils/Utils.cpp @@ -125,17 +125,18 @@ QString Utils::getInitials(const QString& username){ if(username.isEmpty()) return ""; QRegularExpression regex("[\\s\\.]+"); - QStringList words = username.split(regex, Qt::SkipEmptyParts); + QStringList words = username.split(regex);// Qt 5.14: Qt::SkipEmptyParts QStringList initials; auto str32 = words[0].toStdU32String(); std::u32string char32; char32 += str32[0]; initials << QString::fromStdU32String(char32); - - if(words.size() > 1){ - str32 = words[1].toStdU32String(); - char32[0] = str32[0]; - initials << QString::fromStdU32String(char32); + for(int i = 1; i < words.size() && initials.size() <= 1 ; ++i) { + if( words[i].size() > 0){ + str32 = words[i].toStdU32String(); + char32[0] = str32[0]; + initials << QString::fromStdU32String(char32); + } } return initials.join(""); }