From 2494c693d1d9d777ff574e08e2920875610ee74f Mon Sep 17 00:00:00 2001 From: David Faure Date: Sun, 8 Sep 2019 17:12:14 +0200 Subject: [PATCH] Port from QString::sprintf to arg(), to fix compilation with Qt 5.14 --- src/filter/mailfilter.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/filter/mailfilter.cpp b/src/filter/mailfilter.cpp index ad80098..6cb5d47 100644 --- a/src/filter/mailfilter.cpp +++ b/src/filter/mailfilter.cpp @@ -441,7 +441,6 @@ bool MailFilter::readConfig(const KConfigGroup &config, bool interactive) mIcon = config.readEntry("Icon", "system-run"); bAutoNaming = config.readEntry("AutomaticName", false); bEnabled = config.readEntry("Enabled", true); - QString actName, argsName; mActions.clear(); @@ -452,8 +451,8 @@ bool MailFilter::readConfig(const KConfigGroup &config, bool interactive) } for (int i = 0; i < numActions; ++i) { - actName.sprintf("action-name-%d", i); - argsName.sprintf("action-args-%d", i); + const QString actName = QStringLiteral("action-name-%1").arg(i); + const QString argsName = QStringLiteral("action-args-%1").arg(i); // get the action description... FilterActionDesc *desc = FilterManager::filterActionDict()->value( config.readEntry(actName, QString())); @@ -570,16 +569,15 @@ void MailFilter::writeConfig(KConfigGroup &config, bool exportFilter) const config.writeEntry("AutomaticName", bAutoNaming); config.writeEntry("Applicability", static_cast(mApplicability)); config.writeEntry("Enabled", bEnabled); - QString key; int i; QVector::const_iterator it; QVector::const_iterator end(mActions.constEnd()); for (i = 0, it = mActions.constBegin(); it != end; ++it, ++i) { - config.writeEntry(key.sprintf("action-name-%d", i), + config.writeEntry(QStringLiteral("action-name-%1").arg(i), (*it)->name()); - config.writeEntry(key.sprintf("action-args-%d", i), + config.writeEntry(QStringLiteral("action-args-%1").arg(i), exportFilter ? (*it)->argsAsStringReal() : (*it)->argsAsString()); } config.writeEntry("actions", i);