mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-08-03 20:14:17 -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
|
@ -26,6 +26,7 @@
|
|||
|
||||
#include "config-keepassx-tests.h"
|
||||
|
||||
#include "core/Global.h"
|
||||
#include "core/Tools.h"
|
||||
#include "crypto/Crypto.h"
|
||||
#include "gui/Application.h"
|
||||
|
@ -1246,7 +1247,7 @@ void TestGuiFdoSecrets::testItemReplace()
|
|||
{
|
||||
DBUS_GET2(unlocked, locked, service->SearchItems({{"application", "fdosecrets-test"}}));
|
||||
QSet<QDBusObjectPath> expected{QDBusObjectPath(item1->path()), QDBusObjectPath(item2->path())};
|
||||
COMPARE(QSet<QDBusObjectPath>::fromList(unlocked), expected);
|
||||
COMPARE(Tools::asSet(unlocked), expected);
|
||||
}
|
||||
|
||||
QSignalSpy spyItemCreated(coll.data(), SIGNAL(ItemCreated(QDBusObjectPath)));
|
||||
|
@ -1263,7 +1264,7 @@ void TestGuiFdoSecrets::testItemReplace()
|
|||
// there are still 2 entries
|
||||
DBUS_GET2(unlocked, locked, service->SearchItems({{"application", "fdosecrets-test"}}));
|
||||
QSet<QDBusObjectPath> expected{QDBusObjectPath(item1->path()), QDBusObjectPath(item2->path())};
|
||||
COMPARE(QSet<QDBusObjectPath>::fromList(unlocked), expected);
|
||||
COMPARE(Tools::asSet(unlocked), expected);
|
||||
|
||||
VERIFY(waitForSignal(spyItemCreated, 0));
|
||||
// there may be multiple changed signals, due to each item attribute is set separately
|
||||
|
@ -1289,7 +1290,7 @@ void TestGuiFdoSecrets::testItemReplace()
|
|||
QDBusObjectPath(item2->path()),
|
||||
QDBusObjectPath(item4->path()),
|
||||
};
|
||||
COMPARE(QSet<QDBusObjectPath>::fromList(unlocked), expected);
|
||||
COMPARE(Tools::asSet(unlocked), expected);
|
||||
|
||||
VERIFY(waitForSignal(spyItemCreated, 1));
|
||||
{
|
||||
|
@ -1617,7 +1618,7 @@ void TestGuiFdoSecrets::testExposeSubgroup()
|
|||
for (const auto& itemPath : itemPaths) {
|
||||
exposedEntries << m_plugin->dbus()->pathToObject<Item>(itemPath)->backend();
|
||||
}
|
||||
COMPARE(exposedEntries, QSet<Entry*>::fromList(subgroup->entries()));
|
||||
COMPARE(exposedEntries, Tools::asSet(subgroup->entries()));
|
||||
}
|
||||
|
||||
void TestGuiFdoSecrets::testModifyingExposedGroup()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue