From 186c8b17ab5b3512c0e4db7fffc72e01384c9a65 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 9 Sep 2021 19:34:56 +0300 Subject: [PATCH] use QColor::name() instead of expensive conversions in QStaticTextPrivate::paintText() and QSvgPaintEngine::saveGradientStops() Signed-off-by: Ivailo Monev --- src/gui/text/qstatictext.cpp | 8 +++----- src/svg/qsvggenerator.cpp | 7 +------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index 9bcc0e1c6..933b0a377 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -566,11 +566,9 @@ void QStaticTextPrivate::paintText(const QPointF &topLeftPosition, QPainter *p) } else { QTextDocument document; #ifndef QT_NO_CSSPARSER - QColor color = p->pen().color(); - document.setDefaultStyleSheet(QString::fromLatin1("body { color: #%1%2%3 }") - .arg(QString::number(color.red(), 16), 2, QLatin1Char('0')) - .arg(QString::number(color.green(), 16), 2, QLatin1Char('0')) - .arg(QString::number(color.blue(), 16), 2, QLatin1Char('0'))); + const QColor color = p->pen().color(); + document.setDefaultStyleSheet(QString::fromLatin1("body { color: %1 }") + .arg(color.name())); #endif document.setDefaultFont(font); document.setDocumentMargin(0.0); diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp index 354986eea..9c4be6f83 100644 --- a/src/svg/qsvggenerator.cpp +++ b/src/svg/qsvggenerator.cpp @@ -257,13 +257,8 @@ public: } foreach(QGradientStop stop, stops) { - QString color = - QString::fromLatin1("#%1%2%3") - .arg(stop.second.red(), 2, 16, QLatin1Char('0')) - .arg(stop.second.green(), 2, 16, QLatin1Char('0')) - .arg(stop.second.blue(), 2, 16, QLatin1Char('0')); str << QLatin1String(" \n"); } } -- 2.11.0