From e6bfa33be0ebb253e1e6761d5318032aa7224b79 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 6 Oct 2022 20:04:04 +0200 Subject: [PATCH] Avoid returning value by reference Change-Id: Id094d6f70a0e3eb8ef9cb6336880f6ff9187d7df Reviewed-by: Orgad Shaneh --- plugins/fossil/fossilplugin.cpp | 3 +-- plugins/fossil/wizard/fossiljsextension.cpp | 6 +++--- plugins/fossil/wizard/fossiljsextension.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/plugins/fossil/fossilplugin.cpp b/plugins/fossil/fossilplugin.cpp index 2ae9a1ef256..aa1d464e4ab 100644 --- a/plugins/fossil/fossilplugin.cpp +++ b/plugins/fossil/fossilplugin.cpp @@ -1004,8 +1004,7 @@ VcsCommand *FossilPluginPrivate::createInitialCheckoutCommand(const QString &sou const QString &localName, const QStringList &extraArgs) { - QMap options; - FossilJsExtension::parseArgOptions(extraArgs, options); + const QMap options = FossilJsExtension::parseArgOptions(extraArgs); // Two operating modes: // 1) CloneCheckout: diff --git a/plugins/fossil/wizard/fossiljsextension.cpp b/plugins/fossil/wizard/fossiljsextension.cpp index 2cdf2c27952..dad175dde43 100644 --- a/plugins/fossil/wizard/fossiljsextension.cpp +++ b/plugins/fossil/wizard/fossiljsextension.cpp @@ -52,16 +52,16 @@ public: }; -void FossilJsExtension::parseArgOptions(const QStringList &args, QMap &options) +QMap FossilJsExtension::parseArgOptions(const QStringList &args) { - options.clear(); - + QMap options; for (const QString &arg : args) { if (arg.isEmpty()) continue; const QStringList opt = arg.split('|', Qt::KeepEmptyParts); options.insert(opt[0], opt.size() > 1 ? opt[1] : QString()); } + return options; } FossilJsExtension::FossilJsExtension(FossilSettings *settings) : diff --git a/plugins/fossil/wizard/fossiljsextension.h b/plugins/fossil/wizard/fossiljsextension.h index 9e9ff022034..3d04f235434 100644 --- a/plugins/fossil/wizard/fossiljsextension.h +++ b/plugins/fossil/wizard/fossiljsextension.h @@ -42,7 +42,7 @@ class FossilJsExtension : public QObject Q_OBJECT public: - static void parseArgOptions(const QStringList &args, QMap &options); + static QMap parseArgOptions(const QStringList &args); FossilJsExtension(FossilSettings *settings); ~FossilJsExtension();