mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2026-11-21 09:31:32 -08: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:
65 files changed
+329
-236
No files matched your search
@@ -18,6 +18,7 @@
|
||||
#include "AttachmentImport.h"
|
||||
|
||||
#include "Utils.h"
|
||||
#include "core/Global.h"
|
||||
#include "core/Group.h"
|
||||
|
||||
#include <QCommandLineParser>
|
||||
@@ -48,7 +49,7 @@ int AttachmentImport::executeWithDatabase(QSharedPointer<Database> database, QSh
|
||||
|
||||
auto entry = database->rootGroup()->findEntryByPath(entryPath);
|
||||
if (!entry) {
|
||||
err << QObject::tr("Could not find entry with path %1.").arg(entryPath) << endl;
|
||||
err << QObject::tr("Could not find entry with path %1.").arg(entryPath) << Qt::endl;
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
@@ -56,7 +57,7 @@ int AttachmentImport::executeWithDatabase(QSharedPointer<Database> database, QSh
|
||||
|
||||
auto attachments = entry->attachments();
|
||||
if (attachments->hasKey(attachmentName) && !parser->isSet(AttachmentImport::ForceOption)) {
|
||||
err << QObject::tr("Attachment %1 already exists for entry %2.").arg(attachmentName, entryPath) << endl;
|
||||
err << QObject::tr("Attachment %1 already exists for entry %2.").arg(attachmentName, entryPath) << Qt::endl;
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
@@ -64,7 +65,7 @@ int AttachmentImport::executeWithDatabase(QSharedPointer<Database> database, QSh
|
||||
|
||||
QFile importFile(importFileName);
|
||||
if (!importFile.open(QIODevice::ReadOnly)) {
|
||||
err << QObject::tr("Could not open attachment file %1.").arg(importFileName) << endl;
|
||||
err << QObject::tr("Could not open attachment file %1.").arg(importFileName) << Qt::endl;
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
@@ -74,12 +75,12 @@ int AttachmentImport::executeWithDatabase(QSharedPointer<Database> database, QSh
|
||||
|
||||
QString errorMessage;
|
||||
if (!database->save(Database::Atomic, {}, &errorMessage)) {
|
||||
err << QObject::tr("Writing the database failed %1.").arg(errorMessage) << endl;
|
||||
err << QObject::tr("Writing the database failed %1.").arg(errorMessage) << Qt::endl;
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
out << QObject::tr("Successfully imported attachment %1 as %2 to entry %3.")
|
||||
.arg(importFileName, attachmentName, entryPath)
|
||||
<< endl;
|
||||
<< Qt::endl;
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
Reference in new issue
Block a user