summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2022-10-06 20:04:04 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2022-10-06 18:16:54 +0000
commite6bfa33be0ebb253e1e6761d5318032aa7224b79 (patch)
tree14f3a19d01811de788a2f7a1ee6256f139b78a04
parent70466ed81191e4fb40d30b8d3078ff0247018b0c (diff)
Avoid returning value by reference
Change-Id: Id094d6f70a0e3eb8ef9cb6336880f6ff9187d7df Reviewed-by: Orgad Shaneh <orgads@gmail.com>
-rw-r--r--plugins/fossil/fossilplugin.cpp3
-rw-r--r--plugins/fossil/wizard/fossiljsextension.cpp6
-rw-r--r--plugins/fossil/wizard/fossiljsextension.h2
3 files changed, 5 insertions, 6 deletions
diff --git a/plugins/fossil/fossilplugin.cpp b/plugins/fossil/fossilplugin.cpp
index 2ae9a1e..aa1d464 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<QString, QString> options;
- FossilJsExtension::parseArgOptions(extraArgs, options);
+ const QMap<QString, QString> options = FossilJsExtension::parseArgOptions(extraArgs);
// Two operating modes:
// 1) CloneCheckout:
diff --git a/plugins/fossil/wizard/fossiljsextension.cpp b/plugins/fossil/wizard/fossiljsextension.cpp
index 2cdf2c2..dad175d 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<QString, QString> &options)
+QMap<QString, QString> FossilJsExtension::parseArgOptions(const QStringList &args)
{
- options.clear();
-
+ QMap<QString, QString> 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 9e9ff02..3d04f23 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<QString, QString> &options);
+ static QMap<QString, QString> parseArgOptions(const QStringList &args);
FossilJsExtension(FossilSettings *settings);
~FossilJsExtension();