From 15dc6f062e79403458016626727977796cca4e5d Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Wed, 11 Nov 2020 17:58:40 -0500 Subject: [PATCH] Ignore format changes for new clang-format version --- src/core/PasswordHealth.cpp | 2 ++ src/gui/styles/base/BaseStyle.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/core/PasswordHealth.cpp b/src/core/PasswordHealth.cpp index 750fe39f..c2fc8c7f 100644 --- a/src/core/PasswordHealth.cpp +++ b/src/core/PasswordHealth.cpp @@ -173,12 +173,14 @@ QSharedPointer HealthChecker::evaluate(const Entry* entry) const if (health->score() > 60) { health->setScore(60); } + // clang-format off health->adjustScore((30 - days) * -2); health->addScoreReason(days <= 2 ? QApplication::tr("Password is about to expire") : days <= 10 ? QApplication::tr("Password expires in %1 days").arg(days) : QApplication::tr("Password will expire soon")); health->addScoreDetails(QApplication::tr("Password expires on %1") .arg(entry->timeInfo().expiryTime().toString(Qt::DefaultLocaleShortDate))); + //clang-format on } } diff --git a/src/gui/styles/base/BaseStyle.cpp b/src/gui/styles/base/BaseStyle.cpp index 10207ce1..6cde175c 100644 --- a/src/gui/styles/base/BaseStyle.cpp +++ b/src/gui/styles/base/BaseStyle.cpp @@ -2695,8 +2695,10 @@ void BaseStyle::drawControl(ControlElement element, if (isChecked) { painter->setRenderHint(QPainter::Antialiasing); painter->setPen(Qt::NoPen); + // clang-format off QPalette::ColorRole textRole = !isEnabled ? QPalette::Text : isSelected ? QPalette::HighlightedText : QPalette::ButtonText; + // clang-format on painter->setBrush(option->palette.brush(option->palette.currentColorGroup(), textRole)); qreal rx, ry, rw, rh; QRectF(checkRect).getRect(&rx, &ry, &rw, &rh);