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

QmlDesigner: Remove SourceType::QmlU

Browse Source 
It is not used but generates test cases.

Change-Id: I4bf529b6d3f8cb58fcbbb29378fd3dd5c91f8168
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Bubke
2025-05-20 16:59:30 +02:00
parent 7e230d6f45
commit 3b85cd1344
4 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/libs/designercore/projectstorage/projectstoragepathwatchertypes.h
View File

@@ -10,7 +10,7 @@
namespace QmlDesigner { namespace QmlDesigner {
enum class SourceType : int { Qml, QmlUi, QmlTypes, QmlDir, Directory }; enum class SourceType : int { Qml, QmlTypes, QmlDir, Directory };
template<typename String> template<typename String>
void convertToString(String &string, SourceType sourceType) void convertToString(String &string, SourceType sourceType)
@@ -19,9 +19,6 @@ void convertToString(String &string, SourceType sourceType)
case SourceType::Qml: case SourceType::Qml:
convertToString(string, "Qml"); convertToString(string, "Qml");
break; break;
case SourceType::QmlUi:
convertToString(string, "QmlUi");
break;
case SourceType::QmlTypes: case SourceType::QmlTypes:
convertToString(string, "QmlTypes"); convertToString(string, "QmlTypes");
break; break;

1
src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorageupdater.cpp
View File

@@ -1015,7 +1015,6 @@ void appendProjectChunkSourceIds(ProjectChunkSourceIds &ids,
ids.directory.insert(ids.directory.end(), sourceIds.begin(), sourceIds.end()); ids.directory.insert(ids.directory.end(), sourceIds.begin(), sourceIds.end());
break; break;
case SourceType::Qml: case SourceType::Qml:
case SourceType::QmlUi:
ids.qmlDocument.insert(ids.qmlDocument.end(), sourceIds.begin(), sourceIds.end()); ids.qmlDocument.insert(ids.qmlDocument.end(), sourceIds.begin(), sourceIds.end());
break; break;
case SourceType::QmlTypes: case SourceType::QmlTypes:

2
tests/unit/tests/printers/gtest-creator-printing.cpp
View File

@@ -422,8 +422,6 @@ const char *sourceTypeToText(SourceType sourceType)
switch (sourceType) { switch (sourceType) {
case SourceType::Qml: case SourceType::Qml:
return "Qml"; return "Qml";
case SourceType::QmlUi:
return "QmlUi";
case SourceType::QmlDir: case SourceType::QmlDir:
return "QmlDir"; return "QmlDir";
case SourceType::QmlTypes: case SourceType::QmlTypes:

12
tests/unit/tests/unittests/projectstorage/projectstoragepathwatcher-test.cpp
View File

@@ -88,7 +88,7 @@ protected:
Watcher watcher{pathCache, fileStatusCache, &notifier}; Watcher watcher{pathCache, fileStatusCache, &notifier};
NiceMock<MockQFileSytemWatcher> &mockQFileSytemWatcher = watcher.fileSystemWatcher(); NiceMock<MockQFileSytemWatcher> &mockQFileSytemWatcher = watcher.fileSystemWatcher();
ProjectChunkId projectChunkId1{ProjectPartId::create(2), SourceType::Qml}; 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 projectChunkId3{ProjectPartId::create(3), SourceType::QmlTypes};
ProjectChunkId projectChunkId4{ProjectPartId::create(4), SourceType::Qml}; ProjectChunkId projectChunkId4{ProjectPartId::create(4), SourceType::Qml};
SourcePathView path1{"/path/path1"}; SourcePathView path1{"/path/path1"};
@@ -267,9 +267,9 @@ TEST_F(ProjectStoragePathWatcher, remove_entries_with_id)
{projectChunkId2, {sourceIds[0], sourceIds[1]}}, {projectChunkId2, {sourceIds[0], sourceIds[1]}},
{projectChunkId3, {sourceIds[1], sourceIds[3]}}}); {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) 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); EXPECT_CALL(mockQFileSytemWatcher, removePaths(_)).Times(0);
watcher.removeIds({projectChunkId3.id}); watcher.removeIds({projectChunkId4.id});
} }
TEST_F(ProjectStoragePathWatcher, remove_path_for_one_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]}}, {projectChunkId2, {sourceIds[0], sourceIds[1]}},
{projectChunkId3, {sourceIds[3]}}}); {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) TEST_F(ProjectStoragePathWatcher, not_anymore_watched_entries_with_id)