mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2026-01-15 15:28:54 -05: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
df1035a31d
commit
cb9fe40ebb
65 changed files with 329 additions and 236 deletions
|
|
@ -20,6 +20,7 @@
|
|||
|
||||
#include "core/Config.h"
|
||||
#include "core/Database.h"
|
||||
#include "core/Global.h"
|
||||
#include "core/Group.h"
|
||||
#include "core/Metadata.h"
|
||||
#include "core/PasswordHealth.h"
|
||||
|
|
@ -292,7 +293,7 @@ QString Entry::effectiveAutoTypeSequence() const
|
|||
|
||||
/**
|
||||
* Retrieve the Auto-Type sequences matches for a given windowTitle
|
||||
* This returns a list with priority ordering. If you don't want duplicates call .toSet() on it.
|
||||
* This returns a list with priority ordering. If you don't want duplicates, convert it to a QSet<QString>.
|
||||
*/
|
||||
QList<QString> Entry::autoTypeSequences(const QString& windowTitle) const
|
||||
{
|
||||
|
|
@ -458,7 +459,7 @@ int Entry::size() const
|
|||
size += autoTypeAssociations()->associationsSize();
|
||||
size += attachments()->attachmentsSize();
|
||||
size += customData()->dataSize();
|
||||
for (const QString& tag : tags().split(TagDelimiterRegex, QString::SkipEmptyParts)) {
|
||||
for (const QString& tag : tags().split(TagDelimiterRegex, Qt::SkipEmptyParts)) {
|
||||
size += tag.toUtf8().size();
|
||||
}
|
||||
|
||||
|
|
@ -707,14 +708,13 @@ void Entry::setOverrideUrl(const QString& url)
|
|||
|
||||
void Entry::setTags(const QString& tags)
|
||||
{
|
||||
auto taglist = tags.split(TagDelimiterRegex, QString::SkipEmptyParts);
|
||||
auto taglist = tags.split(TagDelimiterRegex, Qt::SkipEmptyParts);
|
||||
// Trim whitespace before/after tag text
|
||||
for (auto& tag : taglist) {
|
||||
tag = tag.trimmed();
|
||||
}
|
||||
// Remove duplicates
|
||||
auto tagSet = QSet<QString>::fromList(taglist);
|
||||
taglist = tagSet.toList();
|
||||
taglist = Tools::asSet(taglist).values();
|
||||
// Sort alphabetically
|
||||
taglist.sort();
|
||||
set(m_data.tags, taglist);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue