From 420e27c9efc1ef1a6400dc287345e897036abc71 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Wed, 25 Nov 2020 13:42:22 +0100 Subject: [PATCH] Return an empty QStringList if the family string is empty Since doing a split will create an empty entry, then we can save time and just return an empty QStringList in this case Change-Id: I86a6532e7243151493ea4021bfcc05e4c2a9cbf0 Reviewed-by: Fabian Kosmale --- src/gui/text/qfont.cpp | 2 ++ src/widgets/accessible/qaccessiblewidgets.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp index 43dccb1ded..aa03d814be 100644 --- a/src/gui/text/qfont.cpp +++ b/src/gui/text/qfont.cpp @@ -206,6 +206,8 @@ static int convertWeights(int weight, bool inverted) static QStringList splitIntoFamilies(const QString &family) { QStringList familyList; + if (family.isEmpty()) + return familyList; const auto list = QStringView{family}.split(QLatin1Char(',')); const int numFamilies = list.size(); familyList.reserve(numFamilies); diff --git a/src/widgets/accessible/qaccessiblewidgets.cpp b/src/widgets/accessible/qaccessiblewidgets.cpp index 033c213d41..d9ba34c145 100644 --- a/src/widgets/accessible/qaccessiblewidgets.cpp +++ b/src/widgets/accessible/qaccessiblewidgets.cpp @@ -850,7 +850,7 @@ QString QAccessibleTextWidget::attributes(int offset, int *startOffset, int *end const QFont charFormatFont = charFormat.font(); AttributeFormatter attrs; - QString family = charFormatFont.families().first(); + QString family = charFormatFont.families().value(0, QString()); if (!family.isEmpty()) { family = family.replace(u'\\', QLatin1String("\\\\")); family = family.replace(u':', QLatin1String("\\:"));