mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-07-22 06:28:52 -04:00
Fix all Qt 5.15 deprecation warnings (#7783)
* Deprecated qSort() -> std::sort() * Replace QDateTime::toString(Qt::DefaultLocaleShortDate) with Clock::toString() * Replace QDateTime::toString(Qt::SystemLocaleShortDate) with QLocale::system().toString(..., QLocale::ShortFormat) * Use QDateTime::startOfDay() instead of QDate(QDateTime) Note: QDateTime::startOfDay() is only available in Qt 5.14, we need to guard it * Replace QString::SkipEmptyParts with Qt::SkipEmptyParts Note: Its designated replacement, Qt::SplitBehavior, was only added in Qt 5.14. * Don't call deprecated QFlags(nullptr) constructor * QSet::{toList->values} * Replace QList::toSet, QSet::fromList with Tools::asSet() * QHash::insertMulti -> QMultiHash::insert * QProcess::startDetached: non-deprecated overload * QProcess::{pid->processId} * QPainter::{HighQuality->}Antialiasing * QPalette::{background->window}() * Use Qt::{Background,Foreground}Role * endl -> Qt::endl, flush -> Qt::flush * Make YubiKey::s_interfaceMutex non-recursive * OpenSSHKeyGenDialog: use non-deprecated QComboBox::sizeAdjustPolicy setting
This commit is contained in:
parent
5bf5b93836
commit
88b76244cf
67 changed files with 341 additions and 240 deletions
|
@ -18,6 +18,7 @@
|
|||
#include "Analyze.h"
|
||||
|
||||
#include "Utils.h"
|
||||
#include "core/Global.h"
|
||||
#include "core/Group.h"
|
||||
#include "core/HibpOffline.h"
|
||||
|
||||
|
@ -60,23 +61,24 @@ int Analyze::executeWithDatabase(QSharedPointer<Database> database, QSharedPoint
|
|||
|
||||
auto okon = parser->value(Analyze::OkonOption);
|
||||
if (!okon.isEmpty()) {
|
||||
out << QObject::tr("Evaluating database entries using okon…") << endl;
|
||||
out << QObject::tr("Evaluating database entries using okon…") << Qt::endl;
|
||||
|
||||
if (!HibpOffline::okonReport(database, okon, hibpDatabase, findings, &error)) {
|
||||
err << error << endl;
|
||||
err << error << Qt::endl;
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
} else {
|
||||
QFile hibpFile(hibpDatabase);
|
||||
if (!hibpFile.open(QFile::ReadOnly)) {
|
||||
err << QObject::tr("Failed to open HIBP file %1: %2").arg(hibpDatabase).arg(hibpFile.errorString()) << endl;
|
||||
err << QObject::tr("Failed to open HIBP file %1: %2").arg(hibpDatabase).arg(hibpFile.errorString())
|
||||
<< Qt::endl;
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
out << QObject::tr("Evaluating database entries against HIBP file, this will take a while…") << endl;
|
||||
out << QObject::tr("Evaluating database entries against HIBP file, this will take a while…") << Qt::endl;
|
||||
|
||||
if (!HibpOffline::report(database, hibpFile, findings, &error)) {
|
||||
err << error << endl;
|
||||
err << error << Qt::endl;
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
}
|
||||
|
@ -91,9 +93,10 @@ int Analyze::executeWithDatabase(QSharedPointer<Database> database, QSharedPoint
|
|||
}
|
||||
|
||||
if (count > 0) {
|
||||
out << QObject::tr("Password for '%1' has been leaked %2 time(s)!", "", count).arg(path).arg(count) << endl;
|
||||
out << QObject::tr("Password for '%1' has been leaked %2 time(s)!", "", count).arg(path).arg(count)
|
||||
<< Qt::endl;
|
||||
} else {
|
||||
out << QObject::tr("Password for '%1' has been leaked!").arg(path) << endl;
|
||||
out << QObject::tr("Password for '%1' has been leaked!").arg(path) << Qt::endl;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue