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

ProjectExplorer: Refactor KitManager::registerKit()

Browse Source 
The interface of this function was rather unfortunate. In particluar,
the fact that it took ownership of the std::unique_ptr that was passed
in required some weird boiler plate code at all the calling sites.
Instead, it now becomes a proper factory function.

Change-Id: Iecdc6f6345232fc0f0a08bffaf8f1780edb57201
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-03-11 16:59:16 +01:00
parent 03d776a873
commit 3aea3a13cb
9 changed files with 89 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmlprofiler/tests/qmlprofilerattachdialog_test.cpp
View File

@@ -46,16 +46,15 @@ void QmlProfilerAttachDialogTest::testAccessors()
dialog.setPort(4444);
QCOMPARE(dialog.port(), 4444);
auto newKit = std::make_unique<ProjectExplorer::Kit>("dings");
ProjectExplorer::Kit *newKitPtr = newKit.get();
ProjectExplorer::KitManager *kitManager = ProjectExplorer::KitManager::instance();
QVERIFY(kitManager);
QVERIFY(kitManager->registerKit(std::move(newKit)));
ProjectExplorer::Kit * const newKit = kitManager->registerKit({}, "dings");
QVERIFY(newKit);
dialog.setKitId("dings");
QCOMPARE(dialog.kit(), newKitPtr);
QCOMPARE(dialog.kit(), newKit);
kitManager->deregisterKit(newKitPtr);
kitManager->deregisterKit(newKit);
}
} // namespace Internal

7
src/plugins/qmlprofiler/tests/qmlprofilertool_test.cpp
View File

@@ -44,14 +44,13 @@ namespace Internal {
void QmlProfilerToolTest::testAttachToWaitingApplication()
{
auto newKit = std::make_unique<ProjectExplorer::Kit>("fookit");
ProjectExplorer::Kit * newKitPtr = newKit.get();
ProjectExplorer::KitManager *kitManager = ProjectExplorer::KitManager::instance();
QVERIFY(kitManager);
QVERIFY(kitManager->registerKit(std::move(newKit)));
ProjectExplorer::Kit * const newKit = kitManager->registerKit({}, "fookit");
QVERIFY(newKit);
QSettings *settings = Core::ICore::settings();
QVERIFY(settings);
settings->setValue(QLatin1String("AnalyzerQmlAttachDialog/kitId"), newKitPtr->id().toSetting());
settings->setValue(QLatin1String("AnalyzerQmlAttachDialog/kitId"), newKit->id().toSetting());
QmlProfilerTool profilerTool;