From 43969c4e56bcf3d73ea33eaf01d80a4008bdda4b Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@digia.com>
Date: Thu, 4 Apr 2013 14:30:17 +0200
Subject: [PATCH] Rename PluginManager::runningTests() --> testRunRequested()
Change-Id: I209ebb85ad2a3cc32be0c45ee37ba4918ec42828
Reviewed-by: hjk <hjk121@nokiamail.com>
---
src/app/main.cpp | 2 +-
src/libs/extensionsystem/pluginmanager.cpp | 2 +-
src/libs/extensionsystem/pluginmanager.h | 2 +-
src/plugins/fakevim/fakevimplugin.cpp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 1db6fc2bdaf..c7fe2c623cc 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -506,7 +506,7 @@ int main(int argc, char **argv)
#ifdef WITH_TESTS
// Do this after the event loop has started
- if (PluginManager::runningTests())
+ if (PluginManager::testRunRequested())
QTimer::singleShot(100, &pluginManager, SLOT(startTests()));
#endif
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index d5c7b87e7f6..69b51317933 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -750,7 +750,7 @@ void PluginManager::startTests()
* \fn bool PluginManager::runningTests() const
* \internal
*/
-bool PluginManager::runningTests()
+bool PluginManager::testRunRequested()
{
return !m_instance->d->testSpecs.isEmpty();
}
diff --git a/src/libs/extensionsystem/pluginmanager.h b/src/libs/extensionsystem/pluginmanager.h
index e20159abfca..428559eaf2a 100644
--- a/src/libs/extensionsystem/pluginmanager.h
+++ b/src/libs/extensionsystem/pluginmanager.h
@@ -124,7 +124,7 @@ public:
static QString serializedArguments();
- static bool runningTests();
+ static bool testRunRequested();
static QString testDataDirectory();
static void profilingReport(const char *what, const PluginSpec *spec = 0);
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index a982c8121a7..a8e8ff13862 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -1116,7 +1116,7 @@ bool FakeVimPluginPrivate::initialize()
this, SLOT(handleDelayedQuitAll(bool)), Qt::QueuedConnection);
// Vimrc can break test so don't source it if running tests.
- if (!ExtensionSystem::PluginManager::runningTests())
+ if (!ExtensionSystem::PluginManager::testRunRequested())
maybeReadVimRc();
// << "MODE: " << theFakeVimSetting(ConfigUseFakeVim)->value();
--
GitLab