From d64fa1ee48b9007287ea04a31f9470c9b321c61e Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Fri, 2 Jun 2017 09:42:09 +0300
Subject: [PATCH] Gerrit: Refresh when the dialog is re-opened

Task-number: QTCREATORBUG-10028
Change-Id: I60d91d88df5596f7d34605ed28d0cc6ef3427a8c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
---
 src/plugins/git/gerrit/gerritdialog.cpp | 8 ++++----
 src/plugins/git/gerrit/gerritdialog.h   | 2 +-
 src/plugins/git/gerrit/gerritplugin.cpp | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/plugins/git/gerrit/gerritdialog.cpp b/src/plugins/git/gerrit/gerritdialog.cpp
index 66c8c38d22d..58d35390e88 100644
--- a/src/plugins/git/gerrit/gerritdialog.cpp
+++ b/src/plugins/git/gerrit/gerritdialog.cpp
@@ -82,7 +82,7 @@ GerritDialog::GerritDialog(const QSharedPointer<GerritParameters> &p,
     m_ui->filterLineEdit->setFiltering(true);
     connect(m_ui->filterLineEdit, &Utils::FancyLineEdit::filterChanged,
             m_filterModel, &QSortFilterProxyModel::setFilterFixedString);
-    connect(m_ui->queryLineEdit, &QLineEdit::returnPressed, this, &GerritDialog::slotRefresh);
+    connect(m_ui->queryLineEdit, &QLineEdit::returnPressed, this, &GerritDialog::refresh);
     connect(m_model, &GerritModel::stateChanged, m_ui->queryLineEdit, &Utils::FancyLineEdit::validate);
     connect(m_ui->remoteComboBox, &QComboBox::currentTextChanged,
             this, &GerritDialog::remoteChanged);
@@ -118,7 +118,7 @@ GerritDialog::GerritDialog(const QSharedPointer<GerritParameters> &p,
     m_displayButton = addActionButton(tr("&Show"), [this]() { slotFetchDisplay(); });
     m_cherryPickButton = addActionButton(tr("Cherry &Pick"), [this]() { slotFetchCherryPick(); });
     m_checkoutButton = addActionButton(tr("C&heckout"), [this]() { slotFetchCheckout(); });
-    m_refreshButton = addActionButton(tr("&Refresh"), [this]() { slotRefresh(); });
+    m_refreshButton = addActionButton(tr("&Refresh"), [this]() { refresh(); });
 
     connect(m_model, &GerritModel::refreshStateChanged,
             m_refreshButton, &QWidget::setDisabled);
@@ -214,7 +214,7 @@ void GerritDialog::slotFetchCheckout()
         emit fetchCheckout(m_model->change(index));
 }
 
-void GerritDialog::slotRefresh()
+void GerritDialog::refresh()
 {
     const QString &query = m_ui->queryLineEdit->text().trimmed();
     updateCompletions(query);
@@ -232,7 +232,7 @@ void GerritDialog::remoteChanged()
            return;
     }
     *m_server = server;
-    slotRefresh();
+    refresh();
 }
 
 void GerritDialog::updateRemotes(bool forceReload)
diff --git a/src/plugins/git/gerrit/gerritdialog.h b/src/plugins/git/gerrit/gerritdialog.h
index 6c1f087764e..4959a0bf70a 100644
--- a/src/plugins/git/gerrit/gerritdialog.h
+++ b/src/plugins/git/gerrit/gerritdialog.h
@@ -61,6 +61,7 @@ public:
     void setCurrentPath(const QString &path);
     void fetchStarted(const QSharedPointer<Gerrit::Internal::GerritChange> &change);
     void fetchFinished();
+    void refresh();
 
 signals:
     void fetchDisplay(const QSharedPointer<Gerrit::Internal::GerritChange> &);
@@ -74,7 +75,6 @@ private:
     void slotFetchDisplay();
     void slotFetchCherryPick();
     void slotFetchCheckout();
-    void slotRefresh();
     void remoteChanged();
     void updateRemotes(bool forceReload = false);
     void addRemote(const GerritServer &server, const QString &name);
diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp
index 2a44b2dcac0..cedcf002d79 100644
--- a/src/plugins/git/gerrit/gerritplugin.cpp
+++ b/src/plugins/git/gerrit/gerritplugin.cpp
@@ -377,6 +377,7 @@ void GerritPlugin::openView()
         m_dialog->setWindowState(state & ~Qt::WindowMinimized);
     m_dialog->show();
     m_dialog->raise();
+    m_dialog->refresh();
 }
 
 void GerritPlugin::push()