Skip to content

Commit a66a5cd

Browse files
authored
Merge pull request #7769 from nextcloud/perf/color-conversion
Avoid converting string to color
2 parents 1565077 + 411f88e commit a66a5cd

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/gui/accountsettings.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1140,7 +1140,7 @@ void AccountSettings::showConnectionLabel(const QString &message, QStringList er
11401140
errors.prepend(message);
11411141
auto userFriendlyMsg = errors.join(QLatin1String("<br>"));
11421142
qCDebug(lcAccountSettings) << userFriendlyMsg;
1143-
Theme::replaceLinkColorString(userFriendlyMsg, QColor("#c1c8e6"));
1143+
Theme::replaceLinkColorString(userFriendlyMsg, QColor(0xc1c8e6));
11441144
_ui->connectLabel->setText(userFriendlyMsg);
11451145
_ui->connectLabel->setToolTip({});
11461146
_ui->connectLabel->setStyleSheet(errStyle);

src/libsync/theme.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ QIcon Theme::themeIcon(const QString &name, bool sysTray) const
277277
if (qgetenv("DESKTOP_SESSION") == "ubuntu") {
278278
QBitmap mask = px.createMaskFromColor(Qt::white, Qt::MaskOutColor);
279279
QPainter p(&px);
280-
p.setPen(QColor("#dfdbd2"));
280+
p.setPen(QColor(0xdfdbd2));
281281
p.drawPixmap(px.rect(), mask, mask.rect());
282282
}
283283
cached.addPixmap(px);
@@ -870,7 +870,7 @@ bool Theme::isDarkColor(const QColor &color)
870870

871871
QColor Theme::getBackgroundAwareLinkColor(const QColor &backgroundColor)
872872
{
873-
return {(isDarkColor(backgroundColor) ? QColor("#6193dc") : QGuiApplication::palette().color(QPalette::Link))};
873+
return {(isDarkColor(backgroundColor) ? QColor(0x6193dc) : QGuiApplication::palette().color(QPalette::Link))};
874874
}
875875

876876
QColor Theme::getBackgroundAwareLinkColor()

0 commit comments

Comments
 (0)