Fix all Qt 5.15 deprecation warnings (keepassxreboot#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
tigerwill90 · Jun 23, 2024 · 6b8b906 · 6b8b906
1 parent c832b08
commit 6b8b906
Show file tree

Hide file tree

Showing 67 changed files with 341 additions and 240 deletions.
diff --git a/src/autotype/AutoType.cpp b/src/autotype/AutoType.cpp
@@ -29,6 +29,7 @@
 #include "autotype/AutoTypePlatformPlugin.h"
 #include "autotype/AutoTypeSelectDialog.h"
 #include "autotype/PickcharsDialog.h"
+#include "core/Global.h"
 #include "core/Resources.h"
 #include "core/Tools.h"
 #include "gui/MainWindow.h"
@@ -460,7 +461,7 @@ void AutoType::performGlobalAutoType(const QList<QSharedPointer<Database>>& dbLi
             if (hideExpired && entry->isExpired()) {
                 continue;
             }
-            auto sequences = entry->autoTypeSequences(m_windowTitleForGlobal).toSet();
+            const QSet<QString> sequences = Tools::asSet(entry->autoTypeSequences(m_windowTitleForGlobal));
             for (const auto& sequence : sequences) {
                 matchList << AutoTypeMatch(entry, sequence);
             }

diff --git a/src/browser/BrowserEntryConfig.cpp b/src/browser/BrowserEntryConfig.cpp
@@ -19,6 +19,7 @@
 #include "BrowserEntryConfig.h"
 
 #include "core/Entry.h"
+#include "core/Global.h"
 #include "core/Tools.h"
 
 #include <QJsonDocument>
@@ -34,22 +35,22 @@ BrowserEntryConfig::BrowserEntryConfig(QObject* parent)
 
 QStringList BrowserEntryConfig::allowedHosts() const
 {
-    return m_allowedHosts.toList();
+    return m_allowedHosts.values();
 }
 
 void BrowserEntryConfig::setAllowedHosts(const QStringList& allowedHosts)
 {
-    m_allowedHosts = allowedHosts.toSet();
+    m_allowedHosts = Tools::asSet(allowedHosts);
 }
 
 QStringList BrowserEntryConfig::deniedHosts() const
 {
-    return m_deniedHosts.toList();
+    return m_deniedHosts.values();
 }
 
 void BrowserEntryConfig::setDeniedHosts(const QStringList& deniedHosts)
 {
-    m_deniedHosts = deniedHosts.toSet();
+    m_deniedHosts = Tools::asSet(deniedHosts);
 }
 
 bool BrowserEntryConfig::isAllowed(const QString& host) const

diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
@@ -48,6 +48,7 @@
 #include <QJsonObject>
 #include <QListWidget>
 #include <QLocalSocket>
+#include <QLocale>
 #include <QProgressDialog>
 #include <QUrl>
 
@@ -601,7 +602,7 @@ QString BrowserService::storeKey(const QString& key)
     hideWindow();
     db->metadata()->customData()->set(CustomData::BrowserKeyPrefix + id, key);
     db->metadata()->customData()->set(QString("%1_%2").arg(CustomData::Created, id),
-                                      Clock::currentDateTime().toString(Qt::SystemLocaleShortDate));
+                                      QLocale::system().toString(Clock::currentDateTime(), QLocale::ShortFormat));
     return id;
 }
 

diff --git a/src/cli/Add.cpp b/src/cli/Add.cpp
@@ -19,6 +19,7 @@
 
 #include "Generate.h"
 #include "Utils.h"
+#include "core/Global.h"
 #include "core/Group.h"
 #include "core/PasswordGenerator.h"
 
@@ -78,7 +79,7 @@ int Add::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<Q
 
     // Cannot use those 2 options at the same time!
     if (parser->isSet(Add::GenerateOption) && parser->isSet(Add::PasswordPromptOption)) {
-        err << QObject::tr("Cannot generate a password and prompt at the same time.") << endl;
+        err << QObject::tr("Cannot generate a password and prompt at the same time.") << Qt::endl;
         return EXIT_FAILURE;
     }
 
@@ -94,7 +95,7 @@ int Add::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<Q
 
     Entry* entry = database->rootGroup()->addEntryWithPath(entryPath);
     if (!entry) {
-        err << QObject::tr("Could not create entry with path %1.").arg(entryPath) << endl;
+        err << QObject::tr("Could not create entry with path %1.").arg(entryPath) << Qt::endl;
         return EXIT_FAILURE;
     }
 
@@ -112,7 +113,7 @@ int Add::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<Q
 
     if (parser->isSet(Add::PasswordPromptOption)) {
         if (!parser->isSet(Command::QuietOption)) {
-            out << QObject::tr("Enter password for new entry: ") << flush;
+            out << QObject::tr("Enter password for new entry: ") << Qt::flush;
         }
         QString password = Utils::getPassword(parser->isSet(Command::QuietOption));
         entry->setPassword(password);
@@ -123,12 +124,12 @@ int Add::executeWithDatabase(QSharedPointer<Database> database, QSharedPointer<Q
 
     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;
     }
 
     if (!parser->isSet(Command::QuietOption)) {
-        out << QObject::tr("Successfully added entry %1.").arg(entry->title()) << endl;
+        out << QObject::tr("Successfully added entry %1.").arg(entry->title()) << Qt::endl;
     }
     return EXIT_SUCCESS;
 }
diff --git a/src/cli/AddGroup.cpp b/src/cli/AddGroup.cpp
@@ -18,6 +18,7 @@
 #include "AddGroup.h"
 
 #include "Utils.h"
+#include "core/Global.h"
 #include "core/Group.h"
 
 #include <QCommandLineParser>
@@ -45,13 +46,13 @@ int AddGroup::executeWithDatabase(QSharedPointer<Database> database, QSharedPoin
 
     Group* group = database->rootGroup()->findGroupByPath(groupPath);
     if (group) {
-        err << QObject::tr("Group %1 already exists!").arg(groupPath) << endl;
+        err << QObject::tr("Group %1 already exists!").arg(groupPath) << Qt::endl;
         return EXIT_FAILURE;
     }
 
     Group* parentGroup = database->rootGroup()->findGroupByPath(parentGroupPath);
     if (!parentGroup) {
-        err << QObject::tr("Group %1 not found.").arg(parentGroupPath) << endl;
+        err << QObject::tr("Group %1 not found.").arg(parentGroupPath) << Qt::endl;
         return EXIT_FAILURE;
     }
 
@@ -62,12 +63,12 @@ int AddGroup::executeWithDatabase(QSharedPointer<Database> database, QSharedPoin
 
     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;
     }
 
     if (!parser->isSet(Command::QuietOption)) {
-        out << QObject::tr("Successfully added group %1.").arg(groupName) << endl;
+        out << QObject::tr("Successfully added group %1.").arg(groupName) << Qt::endl;
     }
     return EXIT_SUCCESS;
 }
diff --git a/src/cli/Analyze.cpp b/src/cli/Analyze.cpp
@@ -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;
         }
     }
 

diff --git a/src/cli/AttachmentExport.cpp b/src/cli/AttachmentExport.cpp
@@ -18,6 +18,7 @@
 #include "AttachmentExport.h"
 
 #include "Utils.h"
+#include "core/Global.h"
 #include "core/Group.h"
 
 #include <QCommandLineParser>
@@ -49,40 +50,40 @@ int AttachmentExport::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;
     }
 
     auto attachmentName = args.at(2);
 
     auto attachments = entry->attachments();
     if (!attachments->hasKey(attachmentName)) {
-        err << QObject::tr("Could not find attachment with name %1.").arg(attachmentName) << endl;
+        err << QObject::tr("Could not find attachment with name %1.").arg(attachmentName) << Qt::endl;
         return EXIT_FAILURE;
     }
 
     if (parser->isSet(AttachmentExport::StdoutOption)) {
         // Output to STDOUT even in quiet mode
-        Utils::STDOUT << attachments->value(attachmentName) << flush;
+        Utils::STDOUT << attachments->value(attachmentName) << Qt::flush;
         return EXIT_SUCCESS;
     }
 
     if (args.size() < 4) {
-        err << QObject::tr("No export target given. Please use '--stdout' or specify an 'export-file'.") << endl;
+        err << QObject::tr("No export target given. Please use '--stdout' or specify an 'export-file'.") << Qt::endl;
         return EXIT_FAILURE;
     }
 
     auto exportFileName = args.at(3);
     QFile exportFile(exportFileName);
     if (!exportFile.open(QIODevice::WriteOnly)) {
-        err << QObject::tr("Could not open output file %1.").arg(exportFileName) << endl;
+        err << QObject::tr("Could not open output file %1.").arg(exportFileName) << Qt::endl;
         return EXIT_FAILURE;
     }
     exportFile.write(attachments->value(attachmentName));
 
     out << QObject::tr("Successfully exported attachment %1 of entry %2 to %3.")
                .arg(attachmentName, entryPath, exportFileName)
-        << endl;
+        << Qt::endl;
 
     return EXIT_SUCCESS;
 }
diff --git a/src/cli/AttachmentImport.cpp b/src/cli/AttachmentImport.cpp
@@ -18,6 +18,7 @@
 #include "AttachmentImport.h"
 
 #include "Utils.h"
+#include "core/Global.h"
 #include "core/Group.h"
 
 #include <QCommandLineParser>
@@ -50,23 +51,23 @@ 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;
     }
 
     auto attachmentName = args.at(2);
 
     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;
     }
 
     auto importFileName = args.at(3);
 
     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;
     }
 
@@ -76,12 +77,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;
 }
diff --git a/src/cli/AttachmentRemove.cpp b/src/cli/AttachmentRemove.cpp
@@ -18,6 +18,7 @@
 #include "AttachmentRemove.h"
 
 #include "Utils.h"
+#include "core/Global.h"
 #include "core/Group.h"
 
 #include <QCommandLineParser>
@@ -41,15 +42,15 @@ int AttachmentRemove::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;
     }
 
     auto attachmentName = args.at(2);
 
     auto attachments = entry->attachments();
     if (!attachments->hasKey(attachmentName)) {
-        err << QObject::tr("Could not find attachment with name %1.").arg(attachmentName) << endl;
+        err << QObject::tr("Could not find attachment with name %1.").arg(attachmentName) << Qt::endl;
         return EXIT_FAILURE;
     }
 
@@ -59,10 +60,10 @@ int AttachmentRemove::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 removed attachment %1 from entry %2.").arg(attachmentName, entryPath) << endl;
+    out << QObject::tr("Successfully removed attachment %1 from entry %2.").arg(attachmentName, entryPath) << Qt::endl;
     return EXIT_SUCCESS;
 }