Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-04 17:05:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Ignore format changes for new clang-format version

Browse Source
This commit is contained in:
Jonathan White 2020-11-11 17:58:40 -05:00
parent 91dea9cbc4
commit 15dc6f062e
No known key found for this signature in database
GPG Key ID: 440FC65F2E0C6E01
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/PasswordHealth.cpp
View File

@ -173,12 +173,14 @@ QSharedPointer<PasswordHealth> HealthChecker::evaluate(const Entry* entry) const
if (health->score() > 60) { if (health->score() > 60) {
health->setScore(60); health->setScore(60);
} }
// clang-format off
health->adjustScore((30 - days) * -2); health->adjustScore((30 - days) * -2);
health->addScoreReason(days <= 2 ? QApplication::tr("Password is about to expire") health->addScoreReason(days <= 2 ? QApplication::tr("Password is about to expire")
: days <= 10 ? QApplication::tr("Password expires in %1 days").arg(days) : days <= 10 ? QApplication::tr("Password expires in %1 days").arg(days)
: QApplication::tr("Password will expire soon")); : QApplication::tr("Password will expire soon"));
health->addScoreDetails(QApplication::tr("Password expires on %1") health->addScoreDetails(QApplication::tr("Password expires on %1")
.arg(entry->timeInfo().expiryTime().toString(Qt::DefaultLocaleShortDate))); .arg(entry->timeInfo().expiryTime().toString(Qt::DefaultLocaleShortDate)));
//clang-format on
} }
} }

2
src/gui/styles/base/BaseStyle.cpp
View File

@ -2695,8 +2695,10 @@ void BaseStyle::drawControl(ControlElement element,
if (isChecked) { if (isChecked) {
painter->setRenderHint(QPainter::Antialiasing); painter->setRenderHint(QPainter::Antialiasing);
painter->setPen(Qt::NoPen); painter->setPen(Qt::NoPen);
// clang-format off
QPalette::ColorRole textRole = QPalette::ColorRole textRole =
!isEnabled ? QPalette::Text : isSelected ? QPalette::HighlightedText : QPalette::ButtonText; !isEnabled ? QPalette::Text : isSelected ? QPalette::HighlightedText : QPalette::ButtonText;
// clang-format on
painter->setBrush(option->palette.brush(option->palette.currentColorGroup(), textRole)); painter->setBrush(option->palette.brush(option->palette.currentColorGroup(), textRole));
qreal rx, ry, rw, rh; qreal rx, ry, rw, rh;
QRectF(checkRect).getRect(&rx, &ry, &rw, &rh); QRectF(checkRect).getRect(&rx, &ry, &rw, &rh);