Vcs: in VcsBaseClient use functors to create log/diff parameter widgets

Also API of VcsBaseEditorParameterWidget was changed to take benefit of C++11 lambdas.
Slot executeCommand() is no longer virtual and only fires signal commandExecutionRequested().
The Vcs client just has to bind a lambda to this signal instead of some boiler-plate code
like keeping track of the arguments of diff/log with "struct XxxDiffParameters", etc.

Change-Id: I347c97d84a8324e9c661df4e6d9a6075980b020f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

2 files changed, 57 insertions, 112 deletions

diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp
index b2a83df8ec..0bde00f9e6 100644
--- a/src/plugins/bazaar/bazaarclient.cpp
+++ b/src/plugins/bazaar/bazaarclient.cpp
@@ -61,9 +61,66 @@ SynchronousProcessResponse::Result BazaarDiffExitCodeInterpreter::interpretExitC
     return SynchronousProcessResponse::Finished;
 }
 
+// Parameter widget controlling whitespace diff mode, associated with a parameter
+class BazaarDiffParameterWidget : public VcsBaseEditorParameterWidget
+{
+    Q_OBJECT
+public:
+    BazaarDiffParameterWidget(BazaarSettings *settings, QWidget *parent = 0) :
+        VcsBaseEditorParameterWidget(parent)
+    {
+        mapSetting(addToggleButton(QLatin1String("-w"), tr("Ignore Whitespace")),
+                   settings->boolPointer(BazaarSettings::diffIgnoreWhiteSpaceKey));
+        mapSetting(addToggleButton(QLatin1String("-B"), tr("Ignore Blank Lines")),
+                   settings->boolPointer(BazaarSettings::diffIgnoreBlankLinesKey));
+    }
+
+    QStringList arguments() const
+    {
+        QStringList args;
+        // Bazaar wants "--diff-options=-w -B.."
+        const QStringList formatArguments = VcsBaseEditorParameterWidget::arguments();
+        if (!formatArguments.isEmpty()) {
+            const QString a = QLatin1String("--diff-options=")
+                    + formatArguments.join(QString(QLatin1Char(' ')));
+            args.append(a);
+        }
+        return args;
+    }
+};
+
+class BazaarLogParameterWidget : public VcsBaseEditorParameterWidget
+{
+    Q_OBJECT
+public:
+    BazaarLogParameterWidget(BazaarSettings *settings, QWidget *parent = 0) :
+        VcsBaseEditorParameterWidget(parent)
+    {
+        mapSetting(addToggleButton(QLatin1String("--verbose"), tr("Verbose"),
+                                   tr("Show files changed in each revision")),
+                   settings->boolPointer(BazaarSettings::logVerboseKey));
+        mapSetting(addToggleButton(QLatin1String("--forward"), tr("Forward"),
+                                   tr("Show from oldest to newest")),
+                   settings->boolPointer(BazaarSettings::logForwardKey));
+        mapSetting(addToggleButton(QLatin1String("--include-merges"), tr("Include merges"),
+                                   tr("Show merged revisions")),
+                   settings->boolPointer(BazaarSettings::logIncludeMergesKey));
+
+        QList<ComboBoxItem> logChoices;
+        logChoices << ComboBoxItem(tr("Detailed"), QLatin1String("long"))
+                   << ComboBoxItem(tr("Moderately short"), QLatin1String("short"))
+                   << ComboBoxItem(tr("One line"), QLatin1String("line"))
+                   << ComboBoxItem(tr("GNU ChangeLog"), QLatin1String("gnu-changelog"));
+        mapSetting(addComboBox(QStringList(QLatin1String("--log-format=%1")), logChoices),
+                   settings->stringPointer(BazaarSettings::logFormatKey));
+    }
+};
+
 BazaarClient::BazaarClient(BazaarSettings *settings) :
     VcsBaseClient(settings)
 {
+    setDiffParameterWidgetCreator([=] { return new BazaarDiffParameterWidget(settings); });
+    setLogParameterWidgetCreator([=] { return new BazaarLogParameterWidget(settings); });
 }
 
 BazaarSettings *BazaarClient::settings() const
@@ -253,112 +310,6 @@ BazaarClient::StatusItem BazaarClient::parseStatusLine(const QString &line) cons
     return item;
 }
 
-// Collect all parameters required for a diff or log to be able to associate
-// them with an editor and re-run the command with parameters.
-struct BazaarCommandParameters
-{
-    BazaarCommandParameters(const QString &workDir,
-                            const QStringList &inFiles,
-                            const QStringList &options) :
-        workingDir(workDir), files(inFiles), extraOptions(options)
-    {
-    }
-
-    QString workingDir;
-    QStringList files;
-    QStringList extraOptions;
-};
-
-// Parameter widget controlling whitespace diff mode, associated with a parameter
-class BazaarDiffParameterWidget : public VcsBaseEditorParameterWidget
-{
-    Q_OBJECT
-public:
-    BazaarDiffParameterWidget(BazaarClient *client,
-                              const BazaarCommandParameters &p, QWidget *parent = 0) :
-        VcsBaseEditorParameterWidget(parent), m_client(client), m_params(p)
-    {
-        mapSetting(addToggleButton(QLatin1String("-w"), tr("Ignore Whitespace")),
-                   client->settings()->boolPointer(BazaarSettings::diffIgnoreWhiteSpaceKey));
-        mapSetting(addToggleButton(QLatin1String("-B"), tr("Ignore Blank Lines")),
-                   client->settings()->boolPointer(BazaarSettings::diffIgnoreBlankLinesKey));
-    }
-
-    QStringList arguments() const
-    {
-        QStringList args;
-        // Bazaar wants "--diff-options=-w -B.."
-        const QStringList formatArguments = VcsBaseEditorParameterWidget::arguments();
-        if (!formatArguments.isEmpty()) {
-            const QString a = QLatin1String("--diff-options=")
-                    + formatArguments.join(QString(QLatin1Char(' ')));
-            args.append(a);
-        }
-        return args;
-    }
-
-    void executeCommand()
-    {
-        m_client->diff(m_params.workingDir, m_params.files, m_params.extraOptions);
-    }
-
-private:
-    BazaarClient *m_client;
-    const BazaarCommandParameters m_params;
-};
-
-VcsBaseEditorParameterWidget *BazaarClient::createDiffEditor(
-        const QString &workingDir, const QStringList &files, const QStringList &extraOptions)
-{
-    const BazaarCommandParameters parameters(workingDir, files, extraOptions);
-    return new BazaarDiffParameterWidget(this, parameters);
-}
-
-class BazaarLogParameterWidget : public VcsBaseEditorParameterWidget
-{
-    Q_OBJECT
-public:
-    BazaarLogParameterWidget(BazaarClient *client,
-                             const BazaarCommandParameters &p, QWidget *parent = 0) :
-        VcsBaseEditorParameterWidget(parent), m_client(client), m_params(p)
-    {
-        BazaarSettings *settings = m_client->settings();
-        mapSetting(addToggleButton(QLatin1String("--verbose"), tr("Verbose"),
-                                   tr("Show files changed in each revision")),
-                   settings->boolPointer(BazaarSettings::logVerboseKey));
-        mapSetting(addToggleButton(QLatin1String("--forward"), tr("Forward"),
-                                   tr("Show from oldest to newest")),
-                   settings->boolPointer(BazaarSettings::logForwardKey));
-        mapSetting(addToggleButton(QLatin1String("--include-merges"), tr("Include merges"),
-                                   tr("Show merged revisions")),
-                   settings->boolPointer(BazaarSettings::logIncludeMergesKey));
-
-        QList<ComboBoxItem> logChoices;
-        logChoices << ComboBoxItem(tr("Detailed"), QLatin1String("long"))
-                   << ComboBoxItem(tr("Moderately short"), QLatin1String("short"))
-                   << ComboBoxItem(tr("One line"), QLatin1String("line"))
-                   << ComboBoxItem(tr("GNU ChangeLog"), QLatin1String("gnu-changelog"));
-        mapSetting(addComboBox(QStringList(QLatin1String("--log-format=%1")), logChoices),
-                   settings->stringPointer(BazaarSettings::logFormatKey));
-    }
-
-    void executeCommand()
-    {
-        m_client->log(m_params.workingDir, m_params.files, m_params.extraOptions);
-    }
-
-private:
-    BazaarClient *m_client;
-    const BazaarCommandParameters m_params;
-};
-
-VcsBaseEditorParameterWidget *BazaarClient::createLogEditor(
-        const QString &workingDir, const QStringList &files, const QStringList &extraOptions)
-{
-    const BazaarCommandParameters parameters(workingDir, files, extraOptions);
-    return new BazaarLogParameterWidget(this, parameters);
-}
-
 } // namespace Internal
 } // namespace Bazaar
 
diff --git a/src/plugins/bazaar/bazaarclient.h b/src/plugins/bazaar/bazaarclient.h
index 836fe85c8c..64fec97956 100644
--- a/src/plugins/bazaar/bazaarclient.h
+++ b/src/plugins/bazaar/bazaarclient.h
@@ -68,12 +68,6 @@ protected:
     QString vcsCommandString(VcsCommandTag cmd) const;
     Utils::ExitCodeInterpreter *exitCodeInterpreter(VcsCommandTag cmd, QObject *parent) const;
     QStringList revisionSpec(const QString &revision) const;
-    VcsBase::VcsBaseEditorParameterWidget *createDiffEditor(const QString &workingDir,
-                                                            const QStringList &files,
-                                                            const QStringList &extraOptions);
-    VcsBase::VcsBaseEditorParameterWidget *createLogEditor(const QString &workingDir,
-                                                           const QStringList &files,
-                                                           const QStringList &extraOptions);
     StatusItem parseStatusLine(const QString &line) const;
 
 private: