VcsManager: Simplify usage of clearVersionControlCache

Change-Id: Iaf2f65da31a33979c30e63c29a706a568cc5fd1c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2017-06-15 12:48:22 +02:00
parent 3158981e9d
commit 74c1ebdcaa
4 changed files with 7 additions and 8 deletions

View File

@@ -2315,7 +2315,7 @@ public:
m_editor(0) m_editor(0)
{ {
ClearCasePlugin::instance()->setFakeCleartool(true); ClearCasePlugin::instance()->setFakeCleartool(true);
VcsManager::instance()->clearVersionControlCache(); VcsManager::clearVersionControlCache();
FileSaver srcSaver(fileName); FileSaver srcSaver(fileName);
srcSaver.write(QByteArray()); srcSaver.write(QByteArray());

View File

@@ -140,21 +140,21 @@ namespace Core {
TestVersionControl::~TestVersionControl() TestVersionControl::~TestVersionControl()
{ {
VcsManager::instance()->clearVersionControlCache(); VcsManager::clearVersionControlCache();
} }
void TestVersionControl::setManagedDirectories(const QHash<QString, QString> &dirs) void TestVersionControl::setManagedDirectories(const QHash<QString, QString> &dirs)
{ {
m_managedDirs = dirs; m_managedDirs = dirs;
m_dirCount = 0; m_dirCount = 0;
VcsManager::instance()->clearVersionControlCache(); VcsManager::clearVersionControlCache();
} }
void TestVersionControl::setManagedFiles(const QSet<QString> &files) void TestVersionControl::setManagedFiles(const QSet<QString> &files)
{ {
m_managedFiles = files; m_managedFiles = files;
m_fileCount = 0; m_fileCount = 0;
VcsManager::instance()->clearVersionControlCache(); VcsManager::clearVersionControlCache();
} }
bool TestVersionControl::managesDirectory(const QString &filename, QString *topLevel) const bool TestVersionControl::managesDirectory(const QString &filename, QString *topLevel) const

View File

@@ -92,13 +92,12 @@ public:
*/ */
static QStringList additionalToolsPath(); static QStringList additionalToolsPath();
static void clearVersionControlCache();
signals: signals:
void repositoryChanged(const QString &repository); void repositoryChanged(const QString &repository);
void configurationChanged(const IVersionControl *vcs); void configurationChanged(const IVersionControl *vcs);
public slots:
static void clearVersionControlCache();
private: private:
explicit VcsManager(QObject *parent = 0); explicit VcsManager(QObject *parent = 0);
~VcsManager(); ~VcsManager();

View File

@@ -61,7 +61,7 @@ CommonSettingsWidget::CommonSettingsWidget(QWidget *parent) :
connect(Core::VcsManager::instance(), &Core::VcsManager::configurationChanged, connect(Core::VcsManager::instance(), &Core::VcsManager::configurationChanged,
this, &CommonSettingsWidget::updatePath); this, &CommonSettingsWidget::updatePath);
connect(m_ui->cacheResetButton, &QPushButton::clicked, connect(m_ui->cacheResetButton, &QPushButton::clicked,
this, [] { Core::VcsManager::clearVersionControlCache(); }); Core::VcsManager::instance(), &Core::VcsManager::clearVersionControlCache);
} }
CommonSettingsWidget::~CommonSettingsWidget() CommonSettingsWidget::~CommonSettingsWidget()