From 27293db2e41cec40729d5cb4c664b34f2629a497 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 15 Aug 2020 09:59:48 +0300 Subject: [PATCH] avoid temporaries in QTextDocument::adjustSize(), printPage() and QTextHtmlExporter constructor Signed-off-by: Ivailo Monev --- src/gui/text/qtextdocument.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 5e1d7150d..27f87b827 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -809,9 +809,7 @@ void QTextDocument::setIndentWidth(qreal width) */ void QTextDocument::adjustSize() { - // Pull this private function in from qglobal.cpp - QFont f = defaultFont(); - QFontMetrics fm(f); + QFontMetrics fm(defaultFont()); int mw = fm.width(QLatin1Char('x')) * 80; int w = mw; setTextWidth(w); @@ -1688,7 +1686,7 @@ static void printPage(int index, QPainter *painter, const QTextDocument *doc, co if (!pageNumberPos.isNull()) { painter->setClipping(false); - painter->setFont(QFont(doc->defaultFont())); + painter->setFont(doc->defaultFont()); const QString pageString = QString::number(index); painter->drawText(qRound(pageNumberPos.x() - painter->fontMetrics().width(pageString)), @@ -2059,8 +2057,7 @@ static QTextFormat formatDifference(const QTextFormat &from, const QTextFormat & QTextHtmlExporter::QTextHtmlExporter(const QTextDocument *_doc) : doc(_doc), fragmentMarkers(false) { - const QFont defaultFont = doc->defaultFont(); - defaultCharFormat.setFont(defaultFont); + defaultCharFormat.setFont(doc->defaultFont()); // don't export those for the default font since we cannot turn them off with CSS defaultCharFormat.clearProperty(QTextFormat::FontUnderline); defaultCharFormat.clearProperty(QTextFormat::FontOverline); -- 2.11.0