Skip to content

Commit

Permalink
Ignore format changes for new clang-format version
Browse files Browse the repository at this point in the history
  • Loading branch information
droidmonkey committed Nov 11, 2020
1 parent 91dea9c commit 15dc6f0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/core/PasswordHealth.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,14 @@ QSharedPointer<PasswordHealth> 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
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/gui/styles/base/BaseStyle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 15dc6f0

Please sign in to comment.