diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2019-02-06 12:50:51 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-02-11 11:55:01 +0000 |
commit | 83dd0319606bd1eb52d1af937e2dd559721214ef (patch) | |
tree | 400b33893880cbe252f603840dbef30b6b6df64c /src/plugins/qmlprofiler | |
parent | 46c287fee5cea9a4f83c554e2162301a8a70ae5d (diff) |
ProjectExplorer: Rename KitInformation to KitAspect
The name "KitInformation" does not properly convey the fact that it
represents a certain *aspect* of a kit. The same goes for
"KitConfigWidget", which in addition was inconsistent with
"KitInformation".
We now use "KitAspect" and "KitAspectWidget".
Change-Id: I9804ee4cedc4d61fad533ea1dd4e4720e67fde97
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/qmlprofiler')
5 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp b/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp index 392bf159277..43b1d500a0b 100644 --- a/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerattachdialog.cpp @@ -56,7 +56,7 @@ QmlProfilerAttachDialog::QmlProfilerAttachDialog(QWidget *parent) : d->kitChooser = new KitChooser(this); d->kitChooser->setKitPredicate([](const Kit *kit) { - return DeviceKitInformation::device(kit) != nullptr; + return DeviceKitAspect::device(kit) != nullptr; }); d->kitChooser->populate(); diff --git a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp index e3a2a1aa3ff..92a4fe0a444 100644 --- a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp @@ -105,7 +105,7 @@ void QmlProfilerPlugin::extensionsInitialized() auto constraint = [](RunConfiguration *runConfiguration) { Target *target = runConfiguration ? runConfiguration->target() : nullptr; Kit *kit = target ? target->kit() : nullptr; - return DeviceTypeKitInformation::deviceTypeId(kit) + return DeviceTypeKitAspect::deviceTypeId(kit) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; }; diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp index e1e476df363..09f3945cbea 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp @@ -206,7 +206,7 @@ static QUrl localServerUrl(RunControl *runControl) QUrl serverUrl; RunConfiguration *runConfiguration = runControl->runConfiguration(); Kit *kit = runConfiguration->target()->kit(); - const QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(kit); + const QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(kit); if (version) { if (version->qtVersion() >= QtSupport::QtVersionNumber(5, 6, 0)) serverUrl = Utils::urlFromLocalSocket(); diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 1196429d7dc..9669ed0b2cc 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -545,7 +545,7 @@ ProjectExplorer::RunControl *QmlProfilerTool::attachToWaitingApplication() QUrl serverUrl; - IDevice::ConstPtr device = DeviceKitInformation::device(kit); + IDevice::ConstPtr device = DeviceKitAspect::device(kit); QTC_ASSERT(device, return nullptr); QUrl toolControl = device->toolControlChannel(IDevice::QmlControlChannel); serverUrl.setScheme(Utils::urlTcpScheme()); diff --git a/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp b/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp index 9a2dede6571..88965ca4f2e 100644 --- a/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp +++ b/src/plugins/qmlprofiler/tests/qmlprofilerdetailsrewriter_test.cpp @@ -226,7 +226,7 @@ void QmlProfilerDetailsRewriterTest::seedRewriter() QVERIFY(!doc->source().isEmpty()); auto kit = std::make_unique<ProjectExplorer::Kit>(); - ProjectExplorer::SysRootKitInformation::setSysRoot( + ProjectExplorer::SysRootKitAspect::setSysRoot( kit.get(), Utils::FileName::fromLatin1("/nowhere")); DummyProject *project = new DummyProject(Utils::FileName::fromString(filename)); |