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 a couple more Qt 5.15 deprecation warnings (#10953)

Browse Source 
* More {QString->Qt}::SkipEmptyParts
* QProcess::start: non-deprecated overload
This commit is contained in:
Carlo Teubner
2024-06-22 15:54:50 +01:00
committed by GitHub
parent 6b1ab1a5ed
commit 198889c7a4
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/Entry.cpp
View File

@@ -443,7 +443,7 @@ int Entry::size() const
size += autoTypeAssociations()->associationsSize(); size += autoTypeAssociations()->associationsSize();
size += attachments()->attachmentsSize(); size += attachments()->attachmentsSize();
size += customData()->dataSize(); 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(); size += tag.toUtf8().size();
} }
@@ -672,7 +672,7 @@ void Entry::setOverrideUrl(const QString& url)
void Entry::setTags(const QString& tags) 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 // Trim whitespace before/after tag text
for (auto& tag : taglist) { for (auto& tag : taglist) {
tag = tag.trimmed(); tag = tag.trimmed();

12
src/gui/remote/RemoteProcess.cpp
View File

@@ -36,7 +36,17 @@ void RemoteProcess::setTempFileLocation(const QString& tempFile)
void RemoteProcess::start(const QString& command) void RemoteProcess::start(const QString& command)
{ {
m_process->start(resolveTemplateVariables(command)); const QString commandResolved = resolveTemplateVariables(command);
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
QStringList cmdList = QProcess::splitCommand(commandResolved);
if (!cmdList.isEmpty()) {
const QString program = cmdList.takeFirst();
m_process->start(program, cmdList);
}
#else
m_process->start(resolveTemplateVariables(commandResolved));
#endif
m_process->waitForStarted(); m_process->waitForStarted();
} }