1 files changed, 34 insertions, 69 deletions

diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp
index 28ebd38270..e83f110ea5 100644
--- a/src/plugins/coreplugin/vcsmanager.cpp
+++ b/src/plugins/coreplugin/vcsmanager.cpp
@@ -37,6 +37,7 @@
 #include <vcsbase/vcsbaseconstants.h>
 #include <extensionsystem/pluginmanager.h>
 #include <utils/algorithm.h>
+#include <utils/optional.h>
 #include <utils/qtcassert.h>
 
 #include <QDir>
@@ -49,8 +50,6 @@
 
 namespace Core {
 
-typedef QList<IVersionControl *> VersionControlList;
-
 #if defined(WITH_TESTS)
 const char TEST_PREFIX[] = "/8E3A9BA0-0B97-40DF-AEC1-2BDF9FC9EDBE/";
 #endif
@@ -63,35 +62,29 @@ class VcsManagerPrivate
 public:
     class VcsInfo {
     public:
+        VcsInfo() = default;
         VcsInfo(IVersionControl *vc, const QString &tl) :
             versionControl(vc), topLevel(tl)
         { }
+        VcsInfo(const VcsInfo &other) = default;
 
         bool operator == (const VcsInfo &other) const
         {
-            return versionControl == other.versionControl &&
-                    topLevel == other.topLevel;
+            return versionControl == other.versionControl && topLevel == other.topLevel;
         }
 
-        IVersionControl *versionControl;
+        IVersionControl *versionControl = nullptr;
         QString topLevel;
     };
 
-    ~VcsManagerPrivate()
-    {
-        qDeleteAll(m_vcsInfoList);
-    }
-
-    VcsInfo *findInCache(const QString &dir)
+    Utils::optional<VcsInfo> findInCache(const QString &dir)
     {
-        QTC_ASSERT(QDir(dir).isAbsolute(), return nullptr);
-        QTC_ASSERT(!dir.endsWith(QLatin1Char('/')), return nullptr);
-        QTC_ASSERT(QDir::fromNativeSeparators(dir) == dir, return nullptr);
+        QTC_ASSERT(QDir(dir).isAbsolute(), return Utils::nullopt);
+        QTC_ASSERT(!dir.endsWith(QLatin1Char('/')), return Utils::nullopt);
+        QTC_ASSERT(QDir::fromNativeSeparators(dir) == dir, return Utils::nullopt);
 
-        const QMap<QString, VcsInfo *>::const_iterator it = m_cachedMatches.constFind(dir);
-        if (it != m_cachedMatches.constEnd())
-            return it.value();
-        return nullptr;
+        const auto it = m_cachedMatches.constFind(dir);
+        return it == m_cachedMatches.constEnd() ? Utils::nullopt : Utils::make_optional(it.value());
     }
 
     void clearCache()
@@ -121,24 +114,10 @@ public:
                    || topLevel == dir || topLevel.isEmpty(), return);
         QTC_ASSERT((topLevel.isEmpty() && !vc) || (!topLevel.isEmpty() && vc), return);
 
-        VcsInfo *newInfo = new VcsInfo(vc, topLevel);
-        bool createdNewInfo(true);
-        // Do we have a matching VcsInfo already?
-        foreach (VcsInfo *i, m_vcsInfoList) {
-            if (*i == *newInfo) {
-                delete newInfo;
-                newInfo = i;
-                createdNewInfo = false;
-                break;
-            }
-        }
-        if (createdNewInfo)
-            m_vcsInfoList.append(newInfo);
-
         QString tmpDir = dir;
         const QChar slash = QLatin1Char('/');
         while (tmpDir.count() >= topLevel.count() && !tmpDir.isEmpty()) {
-            m_cachedMatches.insert(tmpDir, newInfo);
+            m_cachedMatches.insert(tmpDir, VcsInfo(vc, topLevel));
             // if no vc was found, this might mean we're inside a repo internal directory (.git)
             // Cache only input directory, not parents
             if (!vc)
@@ -151,8 +130,8 @@ public:
         }
     }
 
-    QMap<QString, VcsInfo *> m_cachedMatches;
-    QList<VcsInfo *> m_vcsInfoList;
+    QList<IVersionControl *> m_versionControlList;
+    QMap<QString, VcsInfo> m_cachedMatches;
     IVersionControl *m_unconfiguredVcs = nullptr;
 
     QStringList m_cachedAdditionalToolsPaths;
@@ -177,6 +156,12 @@ VcsManager::~VcsManager()
     delete d;
 }
 
+void VcsManager::addVersionControl(IVersionControl *vc)
+{
+    QTC_ASSERT(!d->m_versionControlList.contains(vc), return);
+    d->m_versionControlList.append(vc);
+}
+
 VcsManager *VcsManager::instance()
 {
     return m_instance;
@@ -195,9 +180,9 @@ void VcsManager::extensionsInitialized()
     }
 }
 
-QList<IVersionControl *> VcsManager::versionControls()
+const QList<IVersionControl *> VcsManager::versionControls()
 {
-    return ExtensionSystem::PluginManager::getObjects<IVersionControl>();
+    return d->m_versionControlList;
 }
 
 IVersionControl *VcsManager::versionControl(Id id)
@@ -240,7 +225,7 @@ IVersionControl* VcsManager::findVersionControlForDirectory(const QString &input
     if (directory[0].isLetter() && directory.indexOf(QLatin1Char(':') + QLatin1String(TEST_PREFIX)) == 1)
         directory = directory.mid(2);
 #endif
-    VcsManagerPrivate::VcsInfo *cachedData = d->findInCache(directory);
+    auto cachedData = d->findInCache(directory);
     if (cachedData) {
         if (topLevelDirectory)
             *topLevelDirectory = cachedData->topLevel;
@@ -341,9 +326,10 @@ QString VcsManager::findTopLevelForDirectory(const QString &directory)
 QStringList VcsManager::repositories(const IVersionControl *vc)
 {
     QStringList result;
-    foreach (const VcsManagerPrivate::VcsInfo *vi, d->m_vcsInfoList)
-        if (vi->versionControl == vc)
-            result.push_back(vi->topLevel);
+    for (auto it = d->m_cachedMatches.constBegin(); it != d->m_cachedMatches.constEnd(); ++it) {
+        if (it.value().versionControl == vc)
+            result.append(it.value().topLevel);
+    }
     return result;
 }
 
@@ -478,31 +464,6 @@ const char ID_VCS_B[] = "B";
 
 typedef QHash<QString, QString> FileHash;
 
-template<class T>
-class ObjectPoolGuard
-{
-public:
-    ObjectPoolGuard(T *watch) : m_watched(watch)
-    {
-        ExtensionSystem::PluginManager::addObject(watch);
-    }
-
-    explicit operator bool() { return m_watched; }
-    bool operator !() { return !m_watched; }
-    T &operator*() { return *m_watched; }
-    T *operator->() { return m_watched; }
-    T *value() { return m_watched; }
-
-    ~ObjectPoolGuard()
-    {
-        ExtensionSystem::PluginManager::removeObject(m_watched);
-        delete m_watched;
-    }
-
-private:
-    T *m_watched;
-};
-
 static FileHash makeHash(const QStringList &list)
 {
     FileHash result;
@@ -577,8 +538,11 @@ void CorePlugin::testVcsManager_data()
 void CorePlugin::testVcsManager()
 {
     // setup:
-    ObjectPoolGuard<TestVersionControl> vcsA(new TestVersionControl(ID_VCS_A, QLatin1String("A")));
-    ObjectPoolGuard<TestVersionControl> vcsB(new TestVersionControl(ID_VCS_B, QLatin1String("B")));
+    QList<IVersionControl *> orig = Core::d->m_versionControlList;
+    TestVersionControl *vcsA(new TestVersionControl(ID_VCS_A, QLatin1String("A")));
+    TestVersionControl *vcsB(new TestVersionControl(ID_VCS_B, QLatin1String("B")));
+
+    Core::d->m_versionControlList = {vcsA, vcsB};
 
     // test:
     QFETCH(QStringList, dirsVcsA);
@@ -622,7 +586,8 @@ void CorePlugin::testVcsManager()
     }
 
     // teardown:
-    // handled by guards
+    qDeleteAll(Core::d->m_versionControlList);
+    Core::d->m_versionControlList = orig;
 }
 
 } // namespace Internal