Gerrit: Minor cleanup

* Remove unused member
* Inline function that is used only once
* Replace slots with lambdas

Change-Id: I6887b115463c9aac24d4c3dfe6a70357c9068973
Reviewed-by: André Hartmann <aha_1980@gmx.de>

src/plugins/git/gerrit/gerritmodel.cpp

@@ -239,7 +239,6 @@ private:
     void errorTermination(const QString &msg);
     void terminate();
 
-    const QSharedPointer<GerritParameters> m_parameters;
     const QStringList m_queries;
     QProcess m_process;
     QTimer m_timer;
@@ -257,10 +256,9 @@ QueryContext::QueryContext(const QStringList &queries,
                            const QSharedPointer<GerritParameters> &p,
                            QObject *parent)
     : QObject(parent)
-    , m_parameters(p)
     , m_queries(queries)
     , m_currentQuery(0)
-    , m_baseArguments(p->baseCommandArguments())
+    , m_baseArguments({ p->ssh, p->portFlag, QString::number(p->port), p->sshHostArgument(), "gerrit" })
 {
     connect(&m_process, &QProcess::readyReadStandardError,
             this, &QueryContext::readyReadStandardError);

src/plugins/git/gerrit/gerritparameters.cpp

@@ -86,11 +86,6 @@ GerritParameters::GerritParameters()
 {
 }
 
-QStringList GerritParameters::baseCommandArguments() const
-{
-    return { ssh, portFlag, QString::number(port), sshHostArgument(), "gerrit" };
-}
-
 QString GerritParameters::sshHostArgument() const
 {
     return user.isEmpty() ? host : (user + '@' + host);

src/plugins/git/gerrit/gerritparameters.h

@@ -37,7 +37,6 @@ class GerritParameters
 public:
     GerritParameters();
 
-    QStringList baseCommandArguments() const;
     QString sshHostArgument() const;
     bool isValid() const;
     bool equals(const GerritParameters &rhs) const;

src/plugins/git/gerrit/gerritplugin.cpp

@@ -96,8 +96,6 @@ public:
                  const QSharedPointer<GerritParameters> &p,
                  FetchMode fm, QObject *parent = 0);
     ~FetchContext();
-
-public slots:
     void start();
 
 private:
@@ -359,9 +357,12 @@ void GerritPlugin::openView()
         }
         GerritDialog *gd = new GerritDialog(m_parameters, ICore::mainWindow());
         gd->setModal(false);
-        connect(gd, &GerritDialog::fetchDisplay, this, &GerritPlugin::fetchDisplay);
-        connect(gd, &GerritDialog::fetchCherryPick, this, &GerritPlugin::fetchCherryPick);
-        connect(gd, &GerritDialog::fetchCheckout, this, &GerritPlugin::fetchCheckout);
+        connect(gd, &GerritDialog::fetchDisplay, this,
+                [this](const QSharedPointer<GerritChange> &change) { fetch(change, FetchDisplay); });
+        connect(gd, &GerritDialog::fetchCherryPick, this,
+                [this](const QSharedPointer<GerritChange> &change) { fetch(change, FetchCherryPick); });
+        connect(gd, &GerritDialog::fetchCheckout, this,
+                [this](const QSharedPointer<GerritChange> &change) { fetch(change, FetchCheckout); });
         connect(this, &GerritPlugin::fetchStarted, gd, &GerritDialog::fetchStarted);
         connect(this, &GerritPlugin::fetchFinished, gd, &GerritDialog::fetchFinished);
         m_dialog = gd;
@@ -391,21 +392,6 @@ QString GerritPlugin::branch(const QString &repository)
     return GitPlugin::client()->synchronousCurrentLocalBranch(repository);
 }
 
-void GerritPlugin::fetchDisplay(const QSharedPointer<GerritChange> &change)
-{
-    fetch(change, FetchDisplay);
-}
-
-void GerritPlugin::fetchCherryPick(const QSharedPointer<GerritChange> &change)
-{
-    fetch(change, FetchCherryPick);
-}
-
-void GerritPlugin::fetchCheckout(const QSharedPointer<GerritChange> &change)
-{
-    fetch(change, FetchCheckout);
-}
-
 void GerritPlugin::fetch(const QSharedPointer<GerritChange> &change, int mode)
 {
     // Locate git.
@@ -442,8 +428,7 @@ void GerritPlugin::fetch(const QSharedPointer<GerritChange> &change, int mode)
                         remote.chop(4);
                     if (remote.contains(m_parameters->host) && remote.endsWith(change->project)
                             && QFile::exists(repository + '/' + submoduleData.dir)) {
-                        repository = QDir::cleanPath(repository + '/'
-                                                     + submoduleData.dir);
+                        repository = QDir::cleanPath(repository + '/' + submoduleData.dir);
                         verifiedRepository = true;
                         break;
                     }

src/plugins/git/gerrit/gerritplugin.h

@@ -63,9 +63,6 @@ public:
     void addToLocator(Core::CommandLocator *locator);
     void push(const QString &topLevel);
 
-    void fetchDisplay(const QSharedPointer<Gerrit::Internal::GerritChange> &change);
-    void fetchCherryPick(const QSharedPointer<Gerrit::Internal::GerritChange> &change);
-    void fetchCheckout(const QSharedPointer<Gerrit::Internal::GerritChange> &change);
     void updateActions(bool hasTopLevel);
 
 signals: