From e8e30d6afdf5eb436c3f0d5e4c5e239717254d06 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Tue, 6 Sep 2022 18:04:36 +0200 Subject: [PATCH] use initializer lists Change-Id: I13fdce33c26e975a2a97edf10d4619c753f3229e Reviewed-by: Christian Kandeler --- src/plugins/cppeditor/abstracteditorsupport.cpp | 2 +- src/plugins/cppeditor/cppmodelmanager_test.cpp | 10 +++++----- src/plugins/cppeditor/cppsourceprocessor_test.cpp | 2 +- src/plugins/cppeditor/cpptoolstestcase.cpp | 2 +- src/plugins/cppeditor/symbolsearcher_test.cpp | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/plugins/cppeditor/abstracteditorsupport.cpp b/src/plugins/cppeditor/abstracteditorsupport.cpp index 9a32f961d37..14f800f7942 100644 --- a/src/plugins/cppeditor/abstracteditorsupport.cpp +++ b/src/plugins/cppeditor/abstracteditorsupport.cpp @@ -27,7 +27,7 @@ AbstractEditorSupport::~AbstractEditorSupport() void AbstractEditorSupport::updateDocument() { ++m_revision; - m_modelmanager->updateSourceFiles(QSet() << fileName()); + m_modelmanager->updateSourceFiles(QSet{fileName()}); } void AbstractEditorSupport::notifyAboutUpdatedContents() const diff --git a/src/plugins/cppeditor/cppmodelmanager_test.cpp b/src/plugins/cppeditor/cppmodelmanager_test.cpp index 7d8fb7ac85f..5f0deb7af94 100644 --- a/src/plugins/cppeditor/cppmodelmanager_test.cpp +++ b/src/plugins/cppeditor/cppmodelmanager_test.cpp @@ -1009,7 +1009,7 @@ void ModelManagerTest::testRenameIncludes() QCoreApplication::processEvents(); CPlusPlus::Snapshot snapshot = modelManager->snapshot(); for (const QString &sourceFile : qAsConst(sourceFiles)) - QCOMPARE(snapshot.allIncludesForDocument(sourceFile), QSet() << oldHeader); + QCOMPARE(snapshot.allIncludesForDocument(sourceFile), QSet{oldHeader}); // Renaming the header QVERIFY(Core::FileUtils::renameFile(Utils::FilePath::fromString(oldHeader), @@ -1021,7 +1021,7 @@ void ModelManagerTest::testRenameIncludes() QCoreApplication::processEvents(); snapshot = modelManager->snapshot(); for (const QString &sourceFile : qAsConst(sourceFiles)) - QCOMPARE(snapshot.allIncludesForDocument(sourceFile), QSet() << newHeader); + QCOMPARE(snapshot.allIncludesForDocument(sourceFile), QSet{newHeader}); } void ModelManagerTest::testRenameIncludesInEditor() @@ -1067,7 +1067,7 @@ void ModelManagerTest::testRenameIncludesInEditor() QCoreApplication::processEvents(); CPlusPlus::Snapshot snapshot = modelManager->snapshot(); for (const QString &sourceFile : qAsConst(sourceFiles)) - QCOMPARE(snapshot.allIncludesForDocument(sourceFile), QSet() << headerWithPragmaOnce); + QCOMPARE(snapshot.allIncludesForDocument(sourceFile), QSet{headerWithPragmaOnce}); // Open a file in the editor QCOMPARE(Core::DocumentModel::openedDocuments().size(), 0); @@ -1145,7 +1145,7 @@ void ModelManagerTest::testRenameIncludesInEditor() QCoreApplication::processEvents(); snapshot = modelManager->snapshot(); for (const QString &sourceFile : qAsConst(sourceFiles)) - QCOMPARE(snapshot.allIncludesForDocument(sourceFile), QSet() << renamedHeaderWithPragmaOnce); + QCOMPARE(snapshot.allIncludesForDocument(sourceFile), QSet{renamedHeaderWithPragmaOnce}); } void ModelManagerTest::testDocumentsAndRevisions() @@ -1156,7 +1156,7 @@ void ModelManagerTest::testDocumentsAndRevisions() const MyTestDataDir testDir(_("testdata_project1")); const QString filePath1 = testDir.file(QLatin1String("foo.h")); const QString filePath2 = testDir.file(QLatin1String("foo.cpp")); - const QSet filesToIndex = QSet() << filePath1 << filePath2; + const QSet filesToIndex = {filePath1,filePath2}; QVERIFY(TestCase::parseFiles(filesToIndex)); CppModelManager *modelManager = CppModelManager::instance(); diff --git a/src/plugins/cppeditor/cppsourceprocessor_test.cpp b/src/plugins/cppeditor/cppsourceprocessor_test.cpp index 75e345d8b67..e4c30f97c11 100644 --- a/src/plugins/cppeditor/cppsourceprocessor_test.cpp +++ b/src/plugins/cppeditor/cppsourceprocessor_test.cpp @@ -96,7 +96,7 @@ void SourceProcessorTest::testIncludesCyclic() { const QString fileName1 = TestIncludePaths::testFilePath(QLatin1String("cyclic1.h")); const QString fileName2 = TestIncludePaths::testFilePath(QLatin1String("cyclic2.h")); - const QSet sourceFiles = QSet() << fileName1 << fileName2; + const QSet sourceFiles = {fileName1, fileName2}; // Create global snapshot (needed in BuiltinEditorDocumentParser) TestCase testCase; diff --git a/src/plugins/cppeditor/cpptoolstestcase.cpp b/src/plugins/cppeditor/cpptoolstestcase.cpp index 58adb7dc6ad..0d361f1ae7a 100644 --- a/src/plugins/cppeditor/cpptoolstestcase.cpp +++ b/src/plugins/cppeditor/cpptoolstestcase.cpp @@ -299,7 +299,7 @@ bool TestCase::parseFiles(const QSet &filePaths) bool TestCase::parseFiles(const QString &filePath) { - return parseFiles(QSet() << filePath); + return parseFiles(QSet{filePath}); } void TestCase::closeEditorAtEndOfTestCase(Core::IEditor *editor) diff --git a/src/plugins/cppeditor/symbolsearcher_test.cpp b/src/plugins/cppeditor/symbolsearcher_test.cpp index ab2cd88dacb..57dbea69bf5 100644 --- a/src/plugins/cppeditor/symbolsearcher_test.cpp +++ b/src/plugins/cppeditor/symbolsearcher_test.cpp @@ -89,7 +89,7 @@ public: CppIndexingSupport *indexingSupport = m_modelManager->indexingSupport(); const QScopedPointer symbolSearcher( - indexingSupport->createSymbolSearcher(searchParameters, QSet() << testFile)); + indexingSupport->createSymbolSearcher(searchParameters, QSet{testFile})); QFuture search = Utils::runAsync(&SymbolSearcher::runSearch, symbolSearcher.data()); search.waitForFinished();