diff --git a/src/plugins/git/branchdialog.cpp b/src/plugins/git/branchdialog.cpp index 294461c05b4..11c14f80532 100644 --- a/src/plugins/git/branchdialog.cpp +++ b/src/plugins/git/branchdialog.cpp @@ -32,7 +32,6 @@ #include "gitutils.h" #include "gitconstants.h" #include "ui_branchdialog.h" -#include "stashdialog.h" // Label helpers #include #include @@ -106,7 +105,7 @@ void BranchDialog::refresh(const QString &repository, bool force) return; m_repository = repository; - m_ui->repositoryLabel->setText(StashDialog::msgRepositoryLabel(m_repository)); + m_ui->repositoryLabel->setText(GitPlugin::msgRepositoryLabel(m_repository)); QString errorMessage; if (!m_model->refresh(m_repository, &errorMessage)) VcsOutputWindow::appendError(errorMessage); diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index f2f5abbcfa7..f8f921f4d42 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -167,6 +167,13 @@ GitClient *GitPlugin::client() return m_instance->m_gitClient; } +QString GitPlugin::msgRepositoryLabel(const QString &repository) +{ + return repository.isEmpty() ? + tr("") : + tr("Repository: %1").arg(QDir::toNativeSeparators(repository)); +} + const VcsBaseSubmitEditorParameters submitParameters = { Git::Constants::SUBMIT_MIMETYPE, Git::Constants::GITSUBMITEDITOR_ID, diff --git a/src/plugins/git/gitplugin.h b/src/plugins/git/gitplugin.h index c14c15764e6..cba81b025d4 100644 --- a/src/plugins/git/gitplugin.h +++ b/src/plugins/git/gitplugin.h @@ -87,6 +87,7 @@ public: Gerrit::Internal::GerritPlugin *gerritPlugin() const; bool isCommitEditorOpen() const; + static QString msgRepositoryLabel(const QString &repository); public slots: void startCommit(); diff --git a/src/plugins/git/remotedialog.cpp b/src/plugins/git/remotedialog.cpp index 4ed3e5df9b4..b6a02e1cb5e 100644 --- a/src/plugins/git/remotedialog.cpp +++ b/src/plugins/git/remotedialog.cpp @@ -28,7 +28,6 @@ #include "gitclient.h" #include "gitplugin.h" #include "remotemodel.h" -#include "stashdialog.h" // for messages #include "ui_remotedialog.h" #include "ui_remoteadditiondialog.h" @@ -114,7 +113,7 @@ void RemoteDialog::refresh(const QString &repository, bool force) if (m_remoteModel->workingDirectory() == repository && !force) return; // Refresh - m_ui->repositoryLabel->setText(StashDialog::msgRepositoryLabel(repository)); + m_ui->repositoryLabel->setText(GitPlugin::msgRepositoryLabel(repository)); if (repository.isEmpty()) { m_remoteModel->clear(); } else { diff --git a/src/plugins/git/stashdialog.cpp b/src/plugins/git/stashdialog.cpp index d6b4960eb9f..346d75a886a 100644 --- a/src/plugins/git/stashdialog.cpp +++ b/src/plugins/git/stashdialog.cpp @@ -151,20 +151,13 @@ StashDialog::~StashDialog() delete ui; } -QString StashDialog::msgRepositoryLabel(const QString &repository) -{ - return repository.isEmpty() ? - tr("") : - tr("Repository: %1").arg(QDir::toNativeSeparators(repository)); -} - void StashDialog::refresh(const QString &repository, bool force) { if (m_repository == repository && !force) return; // Refresh m_repository = repository; - ui->repositoryLabel->setText(msgRepositoryLabel(repository)); + ui->repositoryLabel->setText(GitPlugin::msgRepositoryLabel(repository)); if (m_repository.isEmpty()) { m_model->setStashes(QList()); } else { diff --git a/src/plugins/git/stashdialog.h b/src/plugins/git/stashdialog.h index 400c67a3a42..a64857b3180 100644 --- a/src/plugins/git/stashdialog.h +++ b/src/plugins/git/stashdialog.h @@ -52,8 +52,6 @@ public: explicit StashDialog(QWidget *parent = 0); ~StashDialog() override; - static QString msgRepositoryLabel(const QString &repository); - void refresh(const QString &repository, bool force); private: