feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

use existing versionControls() instead allVersionControls()

Browse Source 
Change-Id: I4a438b2c98b49525db90bf945b8d8a467b8bfac2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tim Jenssen
2015-06-30 14:11:13 +02:00
parent 51104d2c3a
commit 8a0ae412e6
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/coreplugin/vcsmanager.cpp
View File

@@ -56,11 +56,6 @@ namespace Core {
typedef QList<IVersionControl *> VersionControlList; typedef QList<IVersionControl *> VersionControlList;
static inline VersionControlList allVersionControls()
{
return ExtensionSystem::PluginManager::getObjects<IVersionControl>();
}
#if defined(WITH_TESTS) #if defined(WITH_TESTS)
const char TEST_PREFIX[] = "/8E3A9BA0-0B97-40DF-AEC1-2BDF9FC9EDBE/"; const char TEST_PREFIX[] = "/8E3A9BA0-0B97-40DF-AEC1-2BDF9FC9EDBE/";
#endif #endif
@@ -213,7 +208,7 @@ VcsManager *VcsManager::instance()
void VcsManager::extensionsInitialized() void VcsManager::extensionsInitialized()
{ {
// Change signal connections // Change signal connections
foreach (IVersionControl *versionControl, allVersionControls()) { foreach (IVersionControl *versionControl, versionControls()) {
connect(versionControl, SIGNAL(filesChanged(QStringList)), connect(versionControl, SIGNAL(filesChanged(QStringList)),
DocumentManager::instance(), SIGNAL(filesChangedInternally(QStringList))); DocumentManager::instance(), SIGNAL(filesChangedInternally(QStringList)));
connect(versionControl, SIGNAL(repositoryChanged(QString)), connect(versionControl, SIGNAL(repositoryChanged(QString)),
@@ -271,10 +266,9 @@ IVersionControl* VcsManager::findVersionControlForDirectory(const QString &input
} }
// Nothing: ask the IVersionControls directly. // Nothing: ask the IVersionControls directly.
const VersionControlList versionControls = allVersionControls();
StringVersionControlPairs allThatCanManage; StringVersionControlPairs allThatCanManage;
foreach (IVersionControl * versionControl, versionControls) { foreach (IVersionControl * versionControl, versionControls()) {
QString topLevel; QString topLevel;
if (versionControl->managesDirectory(directory, &topLevel)) if (versionControl->managesDirectory(directory, &topLevel))
allThatCanManage.push_back(StringVersionControlPair(topLevel, versionControl)); allThatCanManage.push_back(StringVersionControlPair(topLevel, versionControl));
@@ -425,7 +419,7 @@ QStringList VcsManager::additionalToolsPath()
{ {
if (d->m_cachedAdditionalToolsPathsDirty) { if (d->m_cachedAdditionalToolsPathsDirty) {
d->m_cachedAdditionalToolsPaths.clear(); d->m_cachedAdditionalToolsPaths.clear();
foreach (IVersionControl *vc, allVersionControls()) foreach (IVersionControl *vc, versionControls())
d->m_cachedAdditionalToolsPaths.append(vc->additionalToolsPath()); d->m_cachedAdditionalToolsPaths.append(vc->additionalToolsPath());
d->m_cachedAdditionalToolsPathsDirty = false; d->m_cachedAdditionalToolsPathsDirty = false;
} }