1 files changed, 16 insertions, 21 deletions

diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp
index baba43fc6e..e59d5266cf 100644
--- a/src/plugins/coreplugin/vcsmanager.cpp
+++ b/src/plugins/coreplugin/vcsmanager.cpp
@@ -223,6 +223,18 @@ void VcsManager::extensionsInitialized()
     }
 }
 
+QList<IVersionControl *> VcsManager::versionControls()
+{
+    return ExtensionSystem::PluginManager::getObjects<IVersionControl>();
+}
+
+IVersionControl *VcsManager::versionControl(Id id)
+{
+    return Utils::findOrDefault(versionControls(), [id](const Core::IVersionControl *vc) {
+        return vc->id() == id;
+    });
+}
+
 void VcsManager::resetVersionControlForDirectory(const QString &inputDirectory)
 {
     if (inputDirectory.isEmpty())
@@ -330,7 +342,7 @@ IVersionControl* VcsManager::findVersionControlForDirectory(const QString &input
                                   .arg(versionControl->displayName()),
                                   InfoBarEntry::GlobalSuppressionEnabled);
                 d->m_unconfiguredVcs = versionControl;
-                info.setCustomButtonInfo(Core::ICore::msgShowOptionsDialog(), []() {
+                info.setCustomButtonInfo(ICore::msgShowOptionsDialog(), []() {
                     QTC_ASSERT(d->m_unconfiguredVcs, return);
                     ICore::showOptionsDialog(Id(VcsBase::Constants::VCS_SETTINGS_CATEGORY),
                                              d->m_unconfiguredVcs->id());
@@ -367,23 +379,6 @@ bool VcsManager::promptToDelete(const QString &fileName)
     return true;
 }
 
-IVersionControl *VcsManager::checkout(const QString &versionControlType,
-                                      const QString &directory,
-                                      const QByteArray &url)
-{
-    foreach (IVersionControl *versionControl, allVersionControls()) {
-        if (versionControl->displayName() == versionControlType
-            && versionControl->supportsOperation(Core::IVersionControl::CheckoutOperation)) {
-            if (versionControl->vcsCheckout(directory, url)) {
-                d->cache(versionControl, directory, directory);
-                return versionControl;
-            }
-            return 0;
-        }
-    }
-    return 0;
-}
-
 bool VcsManager::promptToDelete(IVersionControl *vc, const QString &fileName)
 {
     QTC_ASSERT(vc, return true);
@@ -441,7 +436,7 @@ QStringList VcsManager::additionalToolsPath()
 void VcsManager::promptToAdd(const QString &directory, const QStringList &fileNames)
 {
     IVersionControl *vc = findVersionControlForDirectory(directory);
-    if (!vc || !vc->supportsOperation(Core::IVersionControl::AddOperation))
+    if (!vc || !vc->supportsOperation(IVersionControl::AddOperation))
         return;
 
     QStringList unmanagedFiles;
@@ -453,7 +448,7 @@ void VcsManager::promptToAdd(const QString &directory, const QStringList &fileNa
     if (unmanagedFiles.isEmpty())
         return;
 
-    Internal::AddToVcsDialog dlg(Core::ICore::mainWindow(), VcsManager::msgAddToVcsTitle(),
+    Internal::AddToVcsDialog dlg(ICore::mainWindow(), VcsManager::msgAddToVcsTitle(),
                                  unmanagedFiles, vc->displayName());
     if (dlg.exec() == QDialog::Accepted) {
         QStringList notAddedToVc;
@@ -463,7 +458,7 @@ void VcsManager::promptToAdd(const QString &directory, const QStringList &fileNa
         }
 
         if (!notAddedToVc.isEmpty()) {
-            QMessageBox::warning(Core::ICore::mainWindow(), VcsManager::msgAddToVcsFailedTitle(),
+            QMessageBox::warning(ICore::mainWindow(), VcsManager::msgAddToVcsFailedTitle(),
                                  VcsManager::msgToAddToVcsFailed(notAddedToVc, vc));
         }
     }