rixxc/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-04 15:39:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix all Qt 5.15 deprecation warnings (#7783)

Browse Source 
* 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:
Carlo Teubner
2024-06-22 12:22:44 +01:00
committed by GitHub
parent 5bf5b93836
commit 88b76244cf
67 changed files with 341 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/cli/Merge.cpp
View File

@@ -18,6 +18,7 @@
#include "Merge.h"
#include "Utils.h"
#include "core/Global.h"
#include "core/Merger.h"
#include <QCommandLineParser>
@@ -90,18 +91,18 @@ int Merge::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer
QStringList changeList = merger.merge();
for (auto& mergeChange : changeList) {
out << "\t" << mergeChange << endl;
out << "\t" << mergeChange << Qt::endl;
}
if (!changeList.isEmpty() && !parser->isSet(Merge::DryRunOption)) {
QString errorMessage;
if (!database->save(Database::Atomic, {}, &errorMessage)) {
err << QObject::tr("Unable to save database to file : %1").arg(errorMessage) << endl;
err << QObject::tr("Unable to save database to file : %1").arg(errorMessage) << Qt::endl;
return EXIT_FAILURE;
}
out << QObject::tr("Successfully merged %1 into %2.").arg(fromDatabasePath, toDatabasePath) << endl;
out << QObject::tr("Successfully merged %1 into %2.").arg(fromDatabasePath, toDatabasePath) << Qt::endl;
} else {
out << QObject::tr("Database was not modified by merge operation.") << endl;
out << QObject::tr("Database was not modified by merge operation.") << Qt::endl;
}
return EXIT_SUCCESS;