feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Theme: Limit the usage of qMakePair

Browse Source 
Change-Id: Ibc47dfc4f48ab1b3bc2fe77b353d13d1e22d8b8f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2022-09-30 10:24:53 +02:00
parent 43f3b70437
commit 7eb778dc3d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/utils/theme/theme.cpp
View File

@@ -133,17 +133,18 @@ QString Theme::imageFile(Theme::ImageFile imageFile, const QString &fallBack) co
QPair<QColor, QString> Theme::readNamedColor(const QString &color) const QPair<QColor, QString> Theme::readNamedColor(const QString &color) const
{ {
if (d->palette.contains(color)) const auto it = d->palette.constFind(color);
return qMakePair(d->palette[color], color); if (it != d->palette.constEnd())
return {it.value(), color};
if (color == QLatin1String("style")) if (color == QLatin1String("style"))
return qMakePair(QColor(), QString()); return {};
const QColor col('#' + color); const QColor col('#' + color);
if (!col.isValid()) { if (!col.isValid()) {
qWarning("Color \"%s\" is neither a named color nor a valid color", qPrintable(color)); qWarning("Color \"%s\" is neither a named color nor a valid color", qPrintable(color));
return qMakePair(Qt::black, QString()); return {Qt::black, {}};
} }
return qMakePair(col, QString()); return {col, {}};
} }
QString Theme::filePath() const QString Theme::filePath() const