diff --git a/src/tools/clangbackend/ipcsource/clangipcserver.cpp b/src/tools/clangbackend/ipcsource/clangipcserver.cpp index a7652caf28d..eeae3d7ffb5 100644 --- a/src/tools/clangbackend/ipcsource/clangipcserver.cpp +++ b/src/tools/clangbackend/ipcsource/clangipcserver.cpp @@ -280,8 +280,8 @@ void ClangIpcServer::updateVisibleTranslationUnits(const UpdateVisibleTranslatio TIME_SCOPE_DURATION("ClangIpcServer::updateVisibleTranslationUnits"); try { - translationUnits.setCurrentEditor(message.currentEditorFilePath()); - translationUnits.setVisibleEditors(message.visibleEditorFilePaths()); + translationUnits.setUsedByCurrentEditor(message.currentEditorFilePath()); + translationUnits.setVisibleInEditors(message.visibleEditorFilePaths()); } catch (const std::exception &exception) { qWarning() << "Error in ClangIpcServer::updateVisibleTranslationUnits:" << exception.what(); } diff --git a/src/tools/clangbackend/ipcsource/translationunits.cpp b/src/tools/clangbackend/ipcsource/translationunits.cpp index c1daa3bf501..459679fc7a2 100644 --- a/src/tools/clangbackend/ipcsource/translationunits.cpp +++ b/src/tools/clangbackend/ipcsource/translationunits.cpp @@ -100,13 +100,13 @@ void TranslationUnits::remove(const QVector &fileContainers) updateTranslationUnitsWithChangedDependencies(fileContainers); } -void TranslationUnits::setCurrentEditor(const Utf8String &filePath) +void TranslationUnits::setUsedByCurrentEditor(const Utf8String &filePath) { for (TranslationUnit &translationUnit : translationUnits_) translationUnit.setIsUsedByCurrentEditor(translationUnit.filePath() == filePath); } -void TranslationUnits::setVisibleEditors(const Utf8StringVector &filePaths) +void TranslationUnits::setVisibleInEditors(const Utf8StringVector &filePaths) { for (TranslationUnit &translationUnit : translationUnits_) translationUnit.setIsVisibleInEditor(filePaths.contains(translationUnit.filePath())); diff --git a/src/tools/clangbackend/ipcsource/translationunits.h b/src/tools/clangbackend/ipcsource/translationunits.h index 9493103a9c0..aca120dad00 100644 --- a/src/tools/clangbackend/ipcsource/translationunits.h +++ b/src/tools/clangbackend/ipcsource/translationunits.h @@ -67,8 +67,8 @@ public: void update(const QVector &fileContainers); void remove(const QVector &fileContainers); - void setCurrentEditor(const Utf8String &filePath); - void setVisibleEditors(const Utf8StringVector &filePaths); + void setUsedByCurrentEditor(const Utf8String &filePath); + void setVisibleInEditors(const Utf8StringVector &filePaths); const TranslationUnit &translationUnit(const Utf8String &filePath, const Utf8String &projectPartId) const; const TranslationUnit &translationUnit(const FileContainer &fileContainer) const; diff --git a/tests/unit/unittest/translationunitstest.cpp b/tests/unit/unittest/translationunitstest.cpp index 87dfc886ead..d502a51351e 100644 --- a/tests/unit/unittest/translationunitstest.cpp +++ b/tests/unit/unittest/translationunitstest.cpp @@ -317,7 +317,7 @@ TEST_F(TranslationUnits, isUsedByCurrentEditor) translationUnits.create({fileContainer}); auto translationUnit = translationUnits.translationUnit(fileContainer); - translationUnits.setCurrentEditor(filePath); + translationUnits.setUsedByCurrentEditor(filePath); ASSERT_TRUE(translationUnit.isUsedByCurrentEditor()); } @@ -327,7 +327,7 @@ TEST_F(TranslationUnits, IsNotCurrentEditor) translationUnits.create({fileContainer}); auto translationUnit = translationUnits.translationUnit(fileContainer); - translationUnits.setCurrentEditor(headerPath); + translationUnits.setUsedByCurrentEditor(headerPath); ASSERT_FALSE(translationUnit.isUsedByCurrentEditor()); } @@ -336,9 +336,9 @@ TEST_F(TranslationUnits, IsNotCurrentEditorAfterBeingCurrent) { translationUnits.create({fileContainer}); auto translationUnit = translationUnits.translationUnit(fileContainer); - translationUnits.setCurrentEditor(filePath); + translationUnits.setUsedByCurrentEditor(filePath); - translationUnits.setCurrentEditor(headerPath); + translationUnits.setUsedByCurrentEditor(headerPath); ASSERT_FALSE(translationUnit.isUsedByCurrentEditor()); } @@ -348,7 +348,7 @@ TEST_F(TranslationUnits, IsVisibleEditor) translationUnits.create({fileContainer}); auto translationUnit = translationUnits.translationUnit(fileContainer); - translationUnits.setVisibleEditors({filePath}); + translationUnits.setVisibleInEditors({filePath}); ASSERT_TRUE(translationUnit.isVisibleInEditor()); } @@ -358,7 +358,7 @@ TEST_F(TranslationUnits, IsNotVisibleEditor) translationUnits.create({fileContainer}); auto translationUnit = translationUnits.translationUnit(fileContainer); - translationUnits.setVisibleEditors({headerPath}); + translationUnits.setVisibleInEditors({headerPath}); ASSERT_FALSE(translationUnit.isVisibleInEditor()); } @@ -367,9 +367,9 @@ TEST_F(TranslationUnits, IsNotVisibleEditorAfterBeingVisible) { translationUnits.create({fileContainer}); auto translationUnit = translationUnits.translationUnit(fileContainer); - translationUnits.setVisibleEditors({filePath}); + translationUnits.setVisibleInEditors({filePath}); - translationUnits.setVisibleEditors({headerPath}); + translationUnits.setVisibleInEditors({headerPath}); ASSERT_FALSE(translationUnit.isVisibleInEditor()); }