gui/text: use const methods more
to avoid implicit detach Change-Id: I2c6edfcf8b9dc6e9bb0801b7bd58f34a8033a955 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
parent
14505ca278
commit
2c67774f99
@ -733,7 +733,7 @@ QFontEngine *QFontDatabasePrivate::loadSingleEngine(int script,
|
||||
// Also check for OpenType tables when using complex scripts
|
||||
if (Q_UNLIKELY(!engine->supportsScript(QChar::Script(script)))) {
|
||||
qWarning(" OpenType support missing for \"%s\", script %d",
|
||||
qPrintable(def.families.first()), script);
|
||||
qPrintable(def.families.constFirst()), script);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
@ -758,7 +758,7 @@ QFontEngine *QFontDatabasePrivate::loadSingleEngine(int script,
|
||||
// Also check for OpenType tables when using complex scripts
|
||||
if (!engine->supportsScript(QChar::Script(script))) {
|
||||
qWarning(" OpenType support missing for \"%s\", script %d",
|
||||
+qPrintable(def.families.first()), script);
|
||||
+qPrintable(def.families.constFirst()), script);
|
||||
if (engine->ref.loadRelaxed() == 0)
|
||||
delete engine;
|
||||
return nullptr;
|
||||
@ -2465,7 +2465,7 @@ QFontEngine *QFontDatabasePrivate::findFont(const QFontDef &req,
|
||||
if (!engine) {
|
||||
QtFontDesc desc;
|
||||
do {
|
||||
index = match(multi ? QChar::Script_Common : script, def, def.families.first(), ""_L1, &desc, blackListed);
|
||||
index = match(multi ? QChar::Script_Common : script, def, def.families.constFirst(), ""_L1, &desc, blackListed);
|
||||
if (index >= 0) {
|
||||
QFontDef loadDef = def;
|
||||
if (loadDef.families.isEmpty())
|
||||
@ -2541,7 +2541,7 @@ void QFontDatabasePrivate::load(const QFontPrivate *d, int script)
|
||||
family_list << req.families.at(0);
|
||||
|
||||
// add the default family
|
||||
auto families = QGuiApplication::font().families();
|
||||
const auto families = QGuiApplication::font().families();
|
||||
if (!families.isEmpty()) {
|
||||
QString defaultFamily = families.first();
|
||||
if (! family_list.contains(defaultFamily))
|
||||
|
@ -1727,7 +1727,7 @@ void QFontEngineMulti::ensureFallbackFamiliesQueried()
|
||||
if (styleHint == QFont::AnyStyle && fontDef.fixedPitch)
|
||||
styleHint = QFont::TypeWriter;
|
||||
|
||||
setFallbackFamiliesList(qt_fallbacksForFamily(fontDef.families.first(),
|
||||
setFallbackFamiliesList(qt_fallbacksForFamily(fontDef.families.constFirst(),
|
||||
QFont::Style(fontDef.style), styleHint,
|
||||
QChar::Script(m_script)));
|
||||
}
|
||||
@ -1743,7 +1743,7 @@ void QFontEngineMulti::setFallbackFamiliesList(const QStringList &fallbackFamili
|
||||
QFontEngine *engine = m_engines.at(0);
|
||||
engine->ref.ref();
|
||||
m_engines[1] = engine;
|
||||
m_fallbackFamilies << fontDef.families.first();
|
||||
m_fallbackFamilies << fontDef.families.constFirst();
|
||||
} else {
|
||||
m_engines.resize(m_fallbackFamilies.size() + 1);
|
||||
}
|
||||
|
@ -1195,7 +1195,7 @@ QByteArray QFontSubset::toTruetype() const
|
||||
name.copyright = "Fake font"_L1;
|
||||
else
|
||||
name.copyright = QLatin1StringView(properties.copyright);
|
||||
name.family = fontEngine->fontDef.families.first();
|
||||
name.family = fontEngine->fontDef.families.constFirst();
|
||||
name.subfamily = "Regular"_L1; // ######
|
||||
name.postscript_name = QLatin1StringView(properties.postscriptName);
|
||||
name_table = generateName(name);
|
||||
|
@ -440,7 +440,7 @@ qreal QRawFont::underlinePosition() const
|
||||
*/
|
||||
QString QRawFont::familyName() const
|
||||
{
|
||||
return d->isValid() ? d->fontEngine->fontDef.families.first() : QString();
|
||||
return d->isValid() ? d->fontEngine->fontDef.families.constFirst() : QString();
|
||||
}
|
||||
|
||||
/*!
|
||||
|
@ -1205,8 +1205,8 @@ void QTextHtmlParserNode::applyCssDeclarations(const QList<QCss::Declaration> &d
|
||||
if (decl.d->values.isEmpty()) continue;
|
||||
|
||||
QCss::KnownValue identifier = QCss::UnknownValue;
|
||||
if (decl.d->values.first().type == QCss::Value::KnownIdentifier)
|
||||
identifier = static_cast<QCss::KnownValue>(decl.d->values.first().variant.toInt());
|
||||
if (decl.d->values.constFirst().type == QCss::Value::KnownIdentifier)
|
||||
identifier = static_cast<QCss::KnownValue>(decl.d->values.constFirst().variant.toInt());
|
||||
|
||||
switch (decl.d->propertyId) {
|
||||
case QCss::BorderColor: borderBrush = QBrush(decl.colorValue()); break;
|
||||
@ -1233,10 +1233,10 @@ void QTextHtmlParserNode::applyCssDeclarations(const QList<QCss::Declaration> &d
|
||||
}
|
||||
break;
|
||||
case QCss::QtBlockIndent:
|
||||
blockFormat.setIndent(decl.d->values.first().variant.toInt());
|
||||
blockFormat.setIndent(decl.d->values.constFirst().variant.toInt());
|
||||
break;
|
||||
case QCss::QtLineHeightType: {
|
||||
QString lineHeightTypeName = decl.d->values.first().variant.toString();
|
||||
QString lineHeightTypeName = decl.d->values.constFirst().variant.toString();
|
||||
QTextBlockFormat::LineHeightTypes lineHeightType;
|
||||
if (lineHeightTypeName.compare("proportional"_L1, Qt::CaseInsensitive) == 0)
|
||||
lineHeightType = QTextBlockFormat::ProportionalHeight;
|
||||
@ -1265,7 +1265,7 @@ void QTextHtmlParserNode::applyCssDeclarations(const QList<QCss::Declaration> &d
|
||||
lineHeightType = QTextBlockFormat::MinimumHeight;
|
||||
} else {
|
||||
bool ok;
|
||||
QCss::Value cssValue = decl.d->values.first();
|
||||
QCss::Value cssValue = decl.d->values.constFirst();
|
||||
QString value = cssValue.toString();
|
||||
lineHeight = value.toDouble(&ok);
|
||||
if (ok) {
|
||||
@ -1297,19 +1297,19 @@ void QTextHtmlParserNode::applyCssDeclarations(const QList<QCss::Declaration> &d
|
||||
hasCssListIndent = true;
|
||||
break;
|
||||
case QCss::QtParagraphType:
|
||||
if (decl.d->values.first().variant.toString().compare("empty"_L1, Qt::CaseInsensitive) == 0)
|
||||
if (decl.d->values.constFirst().variant.toString().compare("empty"_L1, Qt::CaseInsensitive) == 0)
|
||||
isEmptyParagraph = true;
|
||||
break;
|
||||
case QCss::QtTableType:
|
||||
if (decl.d->values.first().variant.toString().compare("frame"_L1, Qt::CaseInsensitive) == 0)
|
||||
if (decl.d->values.constFirst().variant.toString().compare("frame"_L1, Qt::CaseInsensitive) == 0)
|
||||
isTextFrame = true;
|
||||
else if (decl.d->values.first().variant.toString().compare("root"_L1, Qt::CaseInsensitive) == 0) {
|
||||
else if (decl.d->values.constFirst().variant.toString().compare("root"_L1, Qt::CaseInsensitive) == 0) {
|
||||
isTextFrame = true;
|
||||
isRootFrame = true;
|
||||
}
|
||||
break;
|
||||
case QCss::QtUserState:
|
||||
userState = decl.d->values.first().variant.toInt();
|
||||
userState = decl.d->values.constFirst().variant.toInt();
|
||||
break;
|
||||
case QCss::Whitespace:
|
||||
switch (identifier) {
|
||||
@ -1363,10 +1363,10 @@ void QTextHtmlParserNode::applyCssDeclarations(const QList<QCss::Declaration> &d
|
||||
setListStyle(decl.d->values);
|
||||
break;
|
||||
case QCss::QtListNumberPrefix:
|
||||
textListNumberPrefix = decl.d->values.first().variant.toString();
|
||||
textListNumberPrefix = decl.d->values.constFirst().variant.toString();
|
||||
break;
|
||||
case QCss::QtListNumberSuffix:
|
||||
textListNumberSuffix = decl.d->values.first().variant.toString();
|
||||
textListNumberSuffix = decl.d->values.constFirst().variant.toString();
|
||||
break;
|
||||
case QCss::TextAlignment:
|
||||
switch (identifier) {
|
||||
@ -1381,7 +1381,7 @@ void QTextHtmlParserNode::applyCssDeclarations(const QList<QCss::Declaration> &d
|
||||
{
|
||||
if (resourceProvider != nullptr && QTextDocumentPrivate::get(resourceProvider) != nullptr) {
|
||||
bool ok;
|
||||
qint64 searchKey = decl.d->values.first().variant.toLongLong(&ok);
|
||||
qint64 searchKey = decl.d->values.constFirst().variant.toLongLong(&ok);
|
||||
if (ok)
|
||||
applyForegroundImage(searchKey, resourceProvider);
|
||||
}
|
||||
@ -2080,7 +2080,7 @@ QList<QCss::Declaration> standardDeclarationForNode(const QTextHtmlParserNode &n
|
||||
decl.d->propertyId = QCss::FontFamily;
|
||||
QList<QCss::Value> values;
|
||||
val.type = QCss::Value::String;
|
||||
val.variant = QFontDatabase::systemFont(QFontDatabase::FixedFont).families().first();
|
||||
val.variant = QFontDatabase::systemFont(QFontDatabase::FixedFont).families().constFirst();
|
||||
values << val;
|
||||
decl.d->values = values;
|
||||
decl.d->inheritable = true;
|
||||
|
@ -402,7 +402,7 @@ int QTextMarkdownImporter::cbEnterSpan(int spanType, void *det)
|
||||
break;
|
||||
}
|
||||
m_spanFormatStack.push(charFmt);
|
||||
qCDebug(lcMD) << spanType << "setCharFormat" << charFmt.font().families().first()
|
||||
qCDebug(lcMD) << spanType << "setCharFormat" << charFmt.font().families().constFirst()
|
||||
<< charFmt.fontWeight() << (charFmt.fontItalic() ? "italic" : "")
|
||||
<< charFmt.foreground().color().name();
|
||||
m_cursor.setCharFormat(charFmt);
|
||||
@ -419,7 +419,7 @@ int QTextMarkdownImporter::cbLeaveSpan(int spanType, void *detail)
|
||||
charFmt = m_spanFormatStack.top();
|
||||
}
|
||||
m_cursor.setCharFormat(charFmt);
|
||||
qCDebug(lcMD) << spanType << "setCharFormat" << charFmt.font().families().first()
|
||||
qCDebug(lcMD) << spanType << "setCharFormat" << charFmt.font().families().constFirst()
|
||||
<< charFmt.fontWeight() << (charFmt.fontItalic() ? "italic" : "")
|
||||
<< charFmt.foreground().color().name();
|
||||
if (spanType == int(MD_SPAN_IMG))
|
||||
|
@ -368,8 +368,8 @@ void QWindowsDirectWriteFontDatabase::populateFontDatabase()
|
||||
bool hasDefaultLocale = GetUserDefaultLocaleName(defaultLocale, LOCALE_NAME_MAX_LENGTH) != 0;
|
||||
wchar_t englishLocale[] = L"en-us";
|
||||
|
||||
const QString defaultFontName = defaultFont().families().first();
|
||||
const QString systemDefaultFontName = systemDefaultFont().families().first();
|
||||
const QString defaultFontName = defaultFont().families().constFirst();
|
||||
const QString systemDefaultFontName = systemDefaultFont().families().constFirst();
|
||||
|
||||
IDWriteFontCollection *fontCollection;
|
||||
if (SUCCEEDED(data()->directWriteFactory->GetSystemFontCollection(&fontCollection))) {
|
||||
|
@ -725,7 +725,7 @@ void QWindowsFontDatabase::populateFontDatabase()
|
||||
EnumFontFamiliesEx(dummy, &lf, populateFontFamilies, 0, 0);
|
||||
ReleaseDC(0, dummy);
|
||||
// Work around EnumFontFamiliesEx() not listing the system font.
|
||||
const QString systemDefaultFamily = QWindowsFontDatabase::systemDefaultFont().families().first();
|
||||
const QString systemDefaultFamily = QWindowsFontDatabase::systemDefaultFont().families().constFirst();
|
||||
if (QPlatformFontDatabase::resolveFontFamilyAlias(systemDefaultFamily) == systemDefaultFamily)
|
||||
QPlatformFontDatabase::registerFontFamily(systemDefaultFamily);
|
||||
addDefaultEUDCFont();
|
||||
@ -820,7 +820,7 @@ QT_WARNING_POP
|
||||
if (fontEngine) {
|
||||
if (request.families != fontEngine->fontDef.families) {
|
||||
qWarning("%s: Failed to load font. Got fallback instead: %s", __FUNCTION__,
|
||||
qPrintable(fontEngine->fontDef.families.first()));
|
||||
qPrintable(fontEngine->fontDef.families.constFirst()));
|
||||
if (fontEngine->ref.loadRelaxed() == 0)
|
||||
delete fontEngine;
|
||||
fontEngine = 0;
|
||||
|
@ -378,7 +378,7 @@ void QWindowsFontDatabaseFT::populateFontDatabase()
|
||||
EnumFontFamiliesEx(dummy, &lf, populateFontFamilies, 0, 0);
|
||||
ReleaseDC(0, dummy);
|
||||
// Work around EnumFontFamiliesEx() not listing the system font
|
||||
const QString systemDefaultFamily = QWindowsFontDatabase::systemDefaultFont().families().first();
|
||||
const QString systemDefaultFamily = QWindowsFontDatabase::systemDefaultFont().families().constFirst();
|
||||
if (QPlatformFontDatabase::resolveFontFamilyAlias(systemDefaultFamily) == systemDefaultFamily)
|
||||
QPlatformFontDatabase::registerFontFamily(systemDefaultFamily);
|
||||
}
|
||||
@ -386,7 +386,7 @@ void QWindowsFontDatabaseFT::populateFontDatabase()
|
||||
QFontEngine * QWindowsFontDatabaseFT::fontEngine(const QFontDef &fontDef, void *handle)
|
||||
{
|
||||
QFontEngine *fe = QFreeTypeFontDatabase::fontEngine(fontDef, handle);
|
||||
qCDebug(lcQpaFonts) << __FUNCTION__ << "FONTDEF" << fontDef.families.first() << fe << handle;
|
||||
qCDebug(lcQpaFonts) << __FUNCTION__ << "FONTDEF" << fontDef.families.constFirst() << fe << handle;
|
||||
return fe;
|
||||
}
|
||||
|
||||
|
@ -1089,7 +1089,7 @@ QImage QWindowsFontEngine::alphaRGBMapForGlyph(glyph_t glyph,
|
||||
QFontEngine *QWindowsFontEngine::cloneWithSize(qreal pixelSize) const
|
||||
{
|
||||
QFontDef request = fontDef;
|
||||
QString actualFontName = request.families.first();
|
||||
QString actualFontName = request.families.constFirst();
|
||||
if (!uniqueFamilyName.isEmpty())
|
||||
request.families = QStringList(uniqueFamilyName);
|
||||
request.pixelSize = pixelSize;
|
||||
|
Loading…
x
Reference in New Issue
Block a user