diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index f4ba55d0930..a1f4d3f5caa 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -2315,7 +2315,7 @@ public: m_editor(0) { ClearCasePlugin::instance()->setFakeCleartool(true); - VcsManager::instance()->clearVersionControlCache(); + VcsManager::clearVersionControlCache(); FileSaver srcSaver(fileName); srcSaver.write(QByteArray()); diff --git a/src/plugins/coreplugin/iversioncontrol.cpp b/src/plugins/coreplugin/iversioncontrol.cpp index 1c11437d6cb..678e4ecc8c5 100644 --- a/src/plugins/coreplugin/iversioncontrol.cpp +++ b/src/plugins/coreplugin/iversioncontrol.cpp @@ -140,21 +140,21 @@ namespace Core { TestVersionControl::~TestVersionControl() { - VcsManager::instance()->clearVersionControlCache(); + VcsManager::clearVersionControlCache(); } void TestVersionControl::setManagedDirectories(const QHash &dirs) { m_managedDirs = dirs; m_dirCount = 0; - VcsManager::instance()->clearVersionControlCache(); + VcsManager::clearVersionControlCache(); } void TestVersionControl::setManagedFiles(const QSet &files) { m_managedFiles = files; m_fileCount = 0; - VcsManager::instance()->clearVersionControlCache(); + VcsManager::clearVersionControlCache(); } bool TestVersionControl::managesDirectory(const QString &filename, QString *topLevel) const diff --git a/src/plugins/coreplugin/vcsmanager.h b/src/plugins/coreplugin/vcsmanager.h index 71e3adeaf83..e830f235081 100644 --- a/src/plugins/coreplugin/vcsmanager.h +++ b/src/plugins/coreplugin/vcsmanager.h @@ -92,13 +92,12 @@ public: */ static QStringList additionalToolsPath(); + static void clearVersionControlCache(); + signals: void repositoryChanged(const QString &repository); void configurationChanged(const IVersionControl *vcs); -public slots: - static void clearVersionControlCache(); - private: explicit VcsManager(QObject *parent = 0); ~VcsManager(); diff --git a/src/plugins/vcsbase/commonsettingspage.cpp b/src/plugins/vcsbase/commonsettingspage.cpp index 735defb4ae7..12f374bcbba 100644 --- a/src/plugins/vcsbase/commonsettingspage.cpp +++ b/src/plugins/vcsbase/commonsettingspage.cpp @@ -61,7 +61,7 @@ CommonSettingsWidget::CommonSettingsWidget(QWidget *parent) : connect(Core::VcsManager::instance(), &Core::VcsManager::configurationChanged, this, &CommonSettingsWidget::updatePath); connect(m_ui->cacheResetButton, &QPushButton::clicked, - this, [] { Core::VcsManager::clearVersionControlCache(); }); + Core::VcsManager::instance(), &Core::VcsManager::clearVersionControlCache); } CommonSettingsWidget::~CommonSettingsWidget()