From 3b85cd1344e679f22e8a292682d1b5352a628dce Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 20 May 2025 16:59:30 +0200 Subject: [PATCH] QmlDesigner: Remove SourceType::QmlU It is not used but generates test cases. Change-Id: I4bf529b6d3f8cb58fcbbb29378fd3dd5c91f8168 Reviewed-by: Thomas Hartmann --- .../projectstorage/projectstoragepathwatchertypes.h | 5 +---- .../projectstorage/projectstorageupdater.cpp | 1 - tests/unit/tests/printers/gtest-creator-printing.cpp | 2 -- .../projectstoragepathwatcher-test.cpp | 12 ++++++------ 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstoragepathwatchertypes.h b/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstoragepathwatchertypes.h index addfe704d8c..ffbe9be3207 100644 --- a/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstoragepathwatchertypes.h +++ b/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstoragepathwatchertypes.h @@ -10,7 +10,7 @@ namespace QmlDesigner { -enum class SourceType : int { Qml, QmlUi, QmlTypes, QmlDir, Directory }; +enum class SourceType : int { Qml, QmlTypes, QmlDir, Directory }; template void convertToString(String &string, SourceType sourceType) @@ -19,9 +19,6 @@ void convertToString(String &string, SourceType sourceType) case SourceType::Qml: convertToString(string, "Qml"); break; - case SourceType::QmlUi: - convertToString(string, "QmlUi"); - break; case SourceType::QmlTypes: convertToString(string, "QmlTypes"); break; diff --git a/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageupdater.cpp b/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageupdater.cpp index ccfce28bbab..55929c70961 100644 --- a/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageupdater.cpp +++ b/src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageupdater.cpp @@ -1015,7 +1015,6 @@ void appendProjectChunkSourceIds(ProjectChunkSourceIds &ids, ids.directory.insert(ids.directory.end(), sourceIds.begin(), sourceIds.end()); break; case SourceType::Qml: - case SourceType::QmlUi: ids.qmlDocument.insert(ids.qmlDocument.end(), sourceIds.begin(), sourceIds.end()); break; case SourceType::QmlTypes: diff --git a/tests/unit/tests/printers/gtest-creator-printing.cpp b/tests/unit/tests/printers/gtest-creator-printing.cpp index fc4657de73e..42fe86cd089 100644 --- a/tests/unit/tests/printers/gtest-creator-printing.cpp +++ b/tests/unit/tests/printers/gtest-creator-printing.cpp @@ -422,8 +422,6 @@ const char *sourceTypeToText(SourceType sourceType) switch (sourceType) { case SourceType::Qml: return "Qml"; - case SourceType::QmlUi: - return "QmlUi"; case SourceType::QmlDir: return "QmlDir"; case SourceType::QmlTypes: diff --git a/tests/unit/tests/unittests/projectstorage/projectstoragepathwatcher-test.cpp b/tests/unit/tests/unittests/projectstorage/projectstoragepathwatcher-test.cpp index a4b67aa7efb..ff816d6aa3d 100644 --- a/tests/unit/tests/unittests/projectstorage/projectstoragepathwatcher-test.cpp +++ b/tests/unit/tests/unittests/projectstorage/projectstoragepathwatcher-test.cpp @@ -88,7 +88,7 @@ protected: Watcher watcher{pathCache, fileStatusCache, ¬ifier}; NiceMock &mockQFileSytemWatcher = watcher.fileSystemWatcher(); ProjectChunkId projectChunkId1{ProjectPartId::create(2), SourceType::Qml}; - ProjectChunkId projectChunkId2{ProjectPartId::create(2), SourceType::QmlUi}; + ProjectChunkId projectChunkId2{ProjectPartId::create(3), SourceType::Qml}; ProjectChunkId projectChunkId3{ProjectPartId::create(3), SourceType::QmlTypes}; ProjectChunkId projectChunkId4{ProjectPartId::create(4), SourceType::Qml}; SourcePathView path1{"/path/path1"}; @@ -267,9 +267,9 @@ TEST_F(ProjectStoragePathWatcher, remove_entries_with_id) {projectChunkId2, {sourceIds[0], sourceIds[1]}}, {projectChunkId3, {sourceIds[1], sourceIds[3]}}}); - watcher.removeIds({ProjectPartId::create(2)}); + watcher.removeIds({ProjectPartId::create(3)}); - ASSERT_THAT(watcher.watchedEntries(), ElementsAre(watcherEntry5, watcherEntry8)); + ASSERT_THAT(watcher.watchedEntries(), ElementsAre(watcherEntry1, watcherEntry3)); } TEST_F(ProjectStoragePathWatcher, remove_no_paths_for_empty_ids) @@ -286,7 +286,7 @@ TEST_F(ProjectStoragePathWatcher, remove_no_paths_for_one_id) EXPECT_CALL(mockQFileSytemWatcher, removePaths(_)).Times(0); - watcher.removeIds({projectChunkId3.id}); + watcher.removeIds({projectChunkId4.id}); } TEST_F(ProjectStoragePathWatcher, remove_path_for_one_id) @@ -327,9 +327,9 @@ TEST_F(ProjectStoragePathWatcher, remove_one_path_for_two_id) {projectChunkId2, {sourceIds[0], sourceIds[1]}}, {projectChunkId3, {sourceIds[3]}}}); - EXPECT_CALL(mockQFileSytemWatcher, removePaths(ElementsAre(directoryPath))); + EXPECT_CALL(mockQFileSytemWatcher, removePaths(ElementsAre(directoryPath2))); - watcher.removeIds({projectChunkId1.id, projectChunkId2.id}); + watcher.removeIds({projectChunkId2.id, projectChunkId3.id}); } TEST_F(ProjectStoragePathWatcher, not_anymore_watched_entries_with_id)