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

AutoTest: Shuffle namespaces for clearer separation

Browse Source 
Change-Id: I6ac440c6d72c3d0dbcd75907f8a6ae756f3cf5ee
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2019-08-19 10:55:32 +02:00
parent df93c6c5a7
commit 03b80025a9
27 changed files with 56 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/autotest/testframeworkmanager.cpp
View File

@@ -43,14 +43,13 @@
static Q_LOGGING_CATEGORY(LOG, "qtc.autotest.frameworkmanager", QtWarningMsg)
namespace Autotest {
namespace Internal {
static TestFrameworkManager *s_instance = nullptr;
TestFrameworkManager::TestFrameworkManager()
{
m_testTreeModel = TestTreeModel::instance();
m_testRunner = TestRunner::instance();
m_testRunner = Internal::TestRunner::instance();
s_instance = this;
}
@@ -89,7 +88,7 @@ bool TestFrameworkManager::registerTestFramework(ITestFramework *framework)
return true;
}
void TestFrameworkManager::activateFrameworksFromSettings(QSharedPointer<TestSettings> settings)
void TestFrameworkManager::activateFrameworksFromSettings(QSharedPointer<Internal::TestSettings> settings)
{
FrameworkIterator it = m_registeredFrameworks.begin();
FrameworkIterator end = m_registeredFrameworks.end();
@@ -168,7 +167,7 @@ QSharedPointer<IFrameworkSettings> TestFrameworkManager::settingsForTestFramewor
void TestFrameworkManager::synchronizeSettings(QSettings *s)
{
AutotestPlugin::settings()->fromSettings(s);
Internal::AutotestPlugin::settings()->fromSettings(s);
for (const Core::Id &id : m_frameworkSettings.keys()) {
QSharedPointer<IFrameworkSettings> fSettings = settingsForTestFramework(id);
if (!fSettings.isNull())
@@ -217,5 +216,4 @@ unsigned TestFrameworkManager::priority(const Core::Id &frameworkId) const
return unsigned(-1);
}
} // namespace Internal
} // namespace Autotest