Autotest: Move Test{FrameWorkManager,Runner} singletons

Make them plugin-pimpl data members, removing some indirections.

Change-Id: Ie441ac94a27f07342513b0b5b1437ccfe4b5d7d2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-03-26 09:21:25 +01:00
parent bac32dc740
commit f3c1751965
5 changed files with 31 additions and 39 deletions

View File

@@ -28,7 +28,6 @@
#include "autotestplugin.h"
#include "iframeworksettings.h"
#include "itestparser.h"
#include "testrunner.h"
#include "testsettings.h"
#include "testtreeitem.h"
#include "testtreemodel.h"
@@ -51,21 +50,18 @@ static TestFrameworkManager *s_instance = nullptr;
TestFrameworkManager::TestFrameworkManager()
{
m_testRunner = Internal::TestRunner::instance();
s_instance = this;
}
TestFrameworkManager *TestFrameworkManager::instance()
{
if (!s_instance)
return new TestFrameworkManager;
return s_instance;
}
TestFrameworkManager::~TestFrameworkManager()
{
delete m_testRunner;
qDeleteAll(m_registeredFrameworks);
s_instance = nullptr;
}
bool TestFrameworkManager::registerTestFramework(ITestFramework *framework)