diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index 6b4c244386f..a1d13c115a5 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -167,11 +167,11 @@ static QHash findToolChains(const static QSet existingAutoDetectedIosKits() { - return Utils::filtered(KitManager::kits(), [](Kit *kit) -> bool { + return Utils::toSet(Utils::filtered(KitManager::kits(), [](Kit *kit) -> bool { Core::Id deviceKind = DeviceTypeKitAspect::deviceTypeId(kit); return kit->isAutoDetected() && (deviceKind == Constants::IOS_DEVICE_TYPE || deviceKind == Constants::IOS_SIMULATOR_TYPE); - }).toSet(); + })); } static void printKits(const QSet &kits) @@ -249,9 +249,9 @@ void IosConfigurations::updateAutomaticKitList() // target -> tool chain const auto targetToolChainHash = findToolChains(platforms); - const auto qtVersions = QtVersionManager::versions([](const BaseQtVersion *v) { + const auto qtVersions = Utils::toSet(QtVersionManager::versions([](const BaseQtVersion *v) { return v->isValid() && v->type() == Constants::IOSQT; - }).toSet(); + })); const DebuggerItem *possibleDebugger = DebuggerItemManager::findByEngineType(LldbEngineType); const QVariant debuggerId = (possibleDebugger ? possibleDebugger->id() : QVariant()); diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp index a168fea084f..c8ae9aa013e 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardfilegenerator.cpp @@ -190,8 +190,7 @@ Core::GeneratedFiles JsonWizardFileGenerator::fileList(Utils::MacroExpander *exp std::tie(fileList, dirList) = Utils::partition(concreteFiles, [](const File &f) { return !QFileInfo(f.source).isDir(); }); - const QSet knownFiles - = QSet::fromList(Utils::transform(fileList, &File::target)); + const QSet knownFiles = Utils::transform(fileList, &File::target); foreach (const File &dir, dirList) { QDir sourceDir(dir.source); diff --git a/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.cpp b/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.cpp index 26c13902176..22e1c86dbcf 100644 --- a/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/contentnoteditableindicator.cpp @@ -26,6 +26,8 @@ #include "contentnoteditableindicator.h" #include "nodemetainfo.h" +#include + #include #include @@ -68,9 +70,9 @@ void ContentNotEditableIndicator::setItems(const QList &itemLis void ContentNotEditableIndicator::updateItems(const QList &itemList) { QSet affectedFormEditorItemItems; - affectedFormEditorItemItems.unite(itemList.toSet()); + affectedFormEditorItemItems.unite(Utils::toSet(itemList)); foreach (FormEditorItem *formEditorItem, itemList) - affectedFormEditorItemItems.unite(formEditorItem->offspringFormEditorItems().toSet()); + affectedFormEditorItemItems.unite(Utils::toSet(formEditorItem->offspringFormEditorItems())); foreach (const EntryPair &entryPair, m_entryList) { foreach (FormEditorItem *formEditorItem, affectedFormEditorItemItems) { diff --git a/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp b/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp index 05d13e29e78..ccd5813a9f2 100644 --- a/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp +++ b/src/plugins/qmldesigner/components/formeditor/rubberbandselectionmanipulator.cpp @@ -27,6 +27,8 @@ #include "formeditorscene.h" +#include + namespace QmlDesigner { RubberBandSelectionManipulator::RubberBandSelectionManipulator(LayerItem *layerItem, FormEditorView *editorView) @@ -125,9 +127,9 @@ void RubberBandSelectionManipulator::select(SelectionType selectionType) } break; case RemoveFromSelection: { - QSet oldSelectionSet(m_oldSelectionList.toSet()); - QSet newSelectionSet(newNodeList.toSet()); - nodeList.append(oldSelectionSet.subtract(newSelectionSet).toList()); + QSet oldSelectionSet = Utils::toSet(m_oldSelectionList); + const QSet newSelectionSet = Utils::toSet(newNodeList); + nodeList.append(Utils::toList(oldSelectionSet.subtract(newSelectionSet))); } } diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index 8c89acb7c83..08d2454bb15 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -634,7 +634,7 @@ static QList collectParents(const QList &modelNodes) } } - return parents.toList(); + return Utils::toList(parents); } QList NavigatorTreeModel::nodesToPersistentIndex(const QList &modelNodes) diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp index 62f12d910c8..c48bfedce1b 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp @@ -25,10 +25,6 @@ #include "nodeinstanceview.h" -#include -#include -#include - #include #include #include @@ -72,6 +68,12 @@ #include "nodeinstanceserverproxy.h" +#include + +#include +#include +#include + enum { debug = false }; @@ -1189,7 +1191,7 @@ void NodeInstanceView::pixmapChanged(const PixmapChangedCommand &command) m_nodeInstanceServer->benchmark(Q_FUNC_INFO + QString::number(renderImageChangeSet.count())); if (!renderImageChangeSet.isEmpty()) - emitInstancesRenderImageChanged(renderImageChangeSet.toList().toVector()); + emitInstancesRenderImageChanged(Utils::toList(renderImageChangeSet).toVector()); } QMultiHash NodeInstanceView::informationChanged(const QVector &containerVector)