Clang: Rename ProjectParts in ProjectPartsManager

Change-Id: Ia60d78e34a296b0b379339ebc14efd0e81dc8989
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>

7 files changed, 37 insertions, 38 deletions

diff --git a/src/tools/clangpchmanagerbackend/clangpchmanagerbackendmain.cpp b/src/tools/clangpchmanagerbackend/clangpchmanagerbackendmain.cpp
index 0bc807a03d..3237aab2fb 100644
--- a/src/tools/clangpchmanagerbackend/clangpchmanagerbackendmain.cpp
+++ b/src/tools/clangpchmanagerbackend/clangpchmanagerbackendmain.cpp
@@ -41,7 +41,7 @@
 #include <precompiledheaderstorage.h>
 #include <processormanager.h>
 #include <progresscounter.h>
-#include <projectparts.h>
+#include <projectpartsmanager.h>
 #include <filepathcaching.h>
 #include <refactoringdatabaseinitializer.h>
 #include <sqlitedatabase.h>
@@ -68,7 +68,7 @@ using ClangBackEnd::PchCreator;
 using ClangBackEnd::PchManagerClientProxy;
 using ClangBackEnd::PchManagerServer;
 using ClangBackEnd::PrecompiledHeaderStorage;
-using ClangBackEnd::ProjectParts;
+using ClangBackEnd::ProjectPartsManager;
 using ClangBackEnd::FilePathCache;
 using ClangBackEnd::FilePathView;
 using ClangBackEnd::TimeStamp;
@@ -179,7 +179,7 @@ struct Data // because we have a cycle dependency
     ClangBackEnd::FilePathCaching filePathCache{database};
     ClangPathWatcher<QFileSystemWatcher, QTimer> includeWatcher{filePathCache};
     ApplicationEnvironment environment;
-    ProjectParts projectParts;
+    ProjectPartsManager projectParts;
     GeneratedFiles generatedFiles;
     PchCreatorManager pchCreatorManager{generatedFiles,
                                         environment,
diff --git a/src/tools/clangpchmanagerbackend/source/clangpchmanagerbackend-source.pri b/src/tools/clangpchmanagerbackend/source/clangpchmanagerbackend-source.pri
index fa8d6e527a..61bcedc262 100644
--- a/src/tools/clangpchmanagerbackend/source/clangpchmanagerbackend-source.pri
+++ b/src/tools/clangpchmanagerbackend/source/clangpchmanagerbackend-source.pri
@@ -3,19 +3,19 @@ INCLUDEPATH += $$PWD
 SOURCES += \
     $$PWD/builddependenciesprovider.cpp \
     $$PWD/pchmanagerserver.cpp \
-    $$PWD/projectparts.cpp \
     $$PWD/pchtaskgenerator.cpp \
     $$PWD/pchtasksmerger.cpp \
-    $$PWD/pchtaskqueue.cpp
+    $$PWD/pchtaskqueue.cpp \
+    $$PWD/projectpartsmanager.cpp
 
 HEADERS += \
     $$PWD/pchmanagerserver.h \
     $$PWD/clangpchmanagerbackend_global.h \
     $$PWD/pchnotcreatederror.h \
     $$PWD/environment.h \
-    $$PWD/projectparts.h \
     $$PWD/pchcreatorinterface.h \
-    $$PWD/projectpartsinterface.h \
+    $$PWD/projectpartsmanager.h \
+    $$PWD/projectpartsmanagerinterface.h \
     $$PWD/queueinterface.h \
     $$PWD/processormanagerinterface.h \
     $$PWD/processorinterface.h \
diff --git a/src/tools/clangpchmanagerbackend/source/pchmanagerserver.cpp b/src/tools/clangpchmanagerbackend/source/pchmanagerserver.cpp
index 999da26448..89ad912640 100644
--- a/src/tools/clangpchmanagerbackend/source/pchmanagerserver.cpp
+++ b/src/tools/clangpchmanagerbackend/source/pchmanagerserver.cpp
@@ -42,12 +42,12 @@ namespace ClangBackEnd {
 
 PchManagerServer::PchManagerServer(ClangPathWatcherInterface &fileSystemWatcher,
                                    PchTaskGeneratorInterface &pchTaskGenerator,
-                                   ProjectPartsInterface &projectParts,
+                                   ProjectPartsManagerInterface &projectParts,
                                    GeneratedFilesInterface &generatedFiles)
-    : m_fileSystemWatcher(fileSystemWatcher),
-      m_pchTaskGenerator(pchTaskGenerator),
-      m_projectParts(projectParts),
-      m_generatedFiles(generatedFiles)
+    : m_fileSystemWatcher(fileSystemWatcher)
+    , m_pchTaskGenerator(pchTaskGenerator)
+    , m_projectPartsManager(projectParts)
+    , m_generatedFiles(generatedFiles)
 {
     m_fileSystemWatcher.setNotifier(this);
 }
@@ -61,13 +61,13 @@ void PchManagerServer::updateProjectParts(UpdateProjectPartsMessage &&message)
 {
     m_toolChainsArgumentsCache.update(message.projectsParts, message.toolChainArguments);
 
-    ProjectPartContainers newProjectParts = m_projectParts.update(message.takeProjectsParts());
+    ProjectPartContainers newProjectParts = m_projectPartsManager.update(message.takeProjectsParts());
 
     if (m_generatedFiles.isValid()) {
         m_pchTaskGenerator.addProjectParts(std::move(newProjectParts),
                                            std::move(message.toolChainArguments));
     } else  {
-        m_projectParts.updateDeferred(newProjectParts);
+        m_projectPartsManager.updateDeferred(newProjectParts);
     }
 }
 
@@ -75,7 +75,7 @@ void PchManagerServer::removeProjectParts(RemoveProjectPartsMessage &&message)
 {
     m_fileSystemWatcher.removeIds(message.projectsPartIds);
 
-    m_projectParts.remove(message.projectsPartIds);
+    m_projectPartsManager.remove(message.projectsPartIds);
 
     m_pchTaskGenerator.removeProjectParts(message.projectsPartIds);
 
@@ -102,7 +102,7 @@ void PchManagerServer::updateGeneratedFiles(UpdateGeneratedFilesMessage &&messag
     m_generatedFiles.update(message.takeGeneratedFiles());
 
     if (m_generatedFiles.isValid()) {
-        ProjectPartContainers deferredProjectParts = m_projectParts.deferredUpdates();
+        ProjectPartContainers deferredProjectParts = m_projectPartsManager.deferredUpdates();
         ArgumentsEntries entries = m_toolChainsArgumentsCache.arguments(
             projectPartIds(deferredProjectParts));
 
@@ -123,8 +123,8 @@ void PchManagerServer::pathsWithIdsChanged(const Utils::SmallStringVector &ids)
     ArgumentsEntries entries = m_toolChainsArgumentsCache.arguments(ids);
 
     for (ArgumentsEntry &entry : entries) {
-        m_pchTaskGenerator.addProjectParts(
-            m_projectParts.projects(entry.ids), std::move(entry.arguments));
+        m_pchTaskGenerator.addProjectParts(m_projectPartsManager.projects(entry.ids),
+                                           std::move(entry.arguments));
     }
 }
 
diff --git a/src/tools/clangpchmanagerbackend/source/pchmanagerserver.h b/src/tools/clangpchmanagerbackend/source/pchmanagerserver.h
index bf6b5bd7e7..9cf8aa8321 100644
--- a/src/tools/clangpchmanagerbackend/source/pchmanagerserver.h
+++ b/src/tools/clangpchmanagerbackend/source/pchmanagerserver.h
@@ -29,7 +29,7 @@
 #include "clangpathwatchernotifier.h"
 #include "pchcreatorinterface.h"
 #include "pchmanagerserverinterface.h"
-#include "projectpartsinterface.h"
+#include "projectpartsmanagerinterface.h"
 #include "toolchainargumentscache.h"
 
 #include <generatedfilesinterface.h>
@@ -48,7 +48,7 @@ class PchManagerServer : public PchManagerServerInterface,
 public:
     PchManagerServer(ClangPathWatcherInterface &fileSystemWatcher,
                      PchTaskGeneratorInterface &pchTaskGenerator,
-                     ProjectPartsInterface &projectParts,
+                     ProjectPartsManagerInterface &projectParts,
                      GeneratedFilesInterface &generatedFiles);
 
     void end() override;
@@ -66,7 +66,7 @@ public:
 private:
     ClangPathWatcherInterface &m_fileSystemWatcher;
     PchTaskGeneratorInterface &m_pchTaskGenerator;
-    ProjectPartsInterface &m_projectParts;
+    ProjectPartsManagerInterface &m_projectPartsManager;
     GeneratedFilesInterface &m_generatedFiles;
     ToolChainsArgumentsCache m_toolChainsArgumentsCache;
 };
diff --git a/src/tools/clangpchmanagerbackend/source/projectparts.cpp b/src/tools/clangpchmanagerbackend/source/projectpartsmanager.cpp
index e8df25e104..8333ed9674 100644
--- a/src/tools/clangpchmanagerbackend/source/projectparts.cpp
+++ b/src/tools/clangpchmanagerbackend/source/projectpartsmanager.cpp
@@ -23,7 +23,7 @@
 **
 ****************************************************************************/
 
-#include "projectparts.h"
+#include "projectpartsmanager.h"
 
 #include <projectpartcontainer.h>
 
@@ -33,7 +33,7 @@ namespace ClangBackEnd {
 
 inline namespace Pch {
 
-ProjectPartContainers ProjectParts::update(ProjectPartContainers &&projectsParts)
+ProjectPartContainers ProjectPartsManager::update(ProjectPartContainers &&projectsParts)
 {
     auto updatedProjectPartContainers = newProjectParts(std::move(projectsParts));
 
@@ -42,7 +42,7 @@ ProjectPartContainers ProjectParts::update(ProjectPartContainers &&projectsParts
     return updatedProjectPartContainers;
 }
 
-void ProjectParts::remove(const Utils::SmallStringVector &ids)
+void ProjectPartsManager::remove(const Utils::SmallStringVector &ids)
 {
     auto shouldRemove = [&] (const ProjectPartContainer &projectPart) {
         return std::find(ids.begin(), ids.end(), projectPart.projectPartId) != ids.end();
@@ -52,7 +52,7 @@ void ProjectParts::remove(const Utils::SmallStringVector &ids)
     m_projectParts.erase(newEnd, m_projectParts.end());
 }
 
-ProjectPartContainers ProjectParts::projects(const Utils::SmallStringVector &projectPartIds) const
+ProjectPartContainers ProjectPartsManager::projects(const Utils::SmallStringVector &projectPartIds) const
 {
     ProjectPartContainers projectPartsWithIds;
 
@@ -66,7 +66,7 @@ ProjectPartContainers ProjectParts::projects(const Utils::SmallStringVector &pro
     return projectPartsWithIds;
 }
 
-void ProjectParts::updateDeferred(const ProjectPartContainers &deferredProjectsParts)
+void ProjectPartsManager::updateDeferred(const ProjectPartContainers &deferredProjectsParts)
 {
     using ProjectPartContainerReferences = std::vector<std::reference_wrapper<ProjectPartContainer>>;
 
@@ -86,7 +86,7 @@ void ProjectParts::updateDeferred(const ProjectPartContainers &deferredProjectsP
         projectPart.updateIsDeferred = true;
 }
 
-ProjectPartContainers ProjectParts::deferredUpdates()
+ProjectPartContainers ProjectPartsManager::deferredUpdates()
 {
     ProjectPartContainers deferredProjectParts;
     deferredProjectParts.reserve(m_projectParts.size());
@@ -102,7 +102,7 @@ ProjectPartContainers ProjectParts::deferredUpdates()
     return deferredProjectParts;
 }
 
-ProjectPartContainers ProjectParts::newProjectParts(ProjectPartContainers &&projectsParts) const
+ProjectPartContainers ProjectPartsManager::newProjectParts(ProjectPartContainers &&projectsParts) const
 {
     ProjectPartContainers updatedProjectPartContainers;
     updatedProjectPartContainers.reserve(projectsParts.size());
@@ -116,7 +116,7 @@ ProjectPartContainers ProjectParts::newProjectParts(ProjectPartContainers &&proj
     return updatedProjectPartContainers;
 }
 
-void ProjectParts::mergeProjectParts(const ProjectPartContainers &projectsParts)
+void ProjectPartsManager::mergeProjectParts(const ProjectPartContainers &projectsParts)
 {
     ProjectPartContainers newProjectParts;
     newProjectParts.reserve(m_projectParts.size() + projectsParts.size());
@@ -135,7 +135,7 @@ void ProjectParts::mergeProjectParts(const ProjectPartContainers &projectsParts)
     m_projectParts = newProjectParts;
 }
 
-const ProjectPartContainers &ProjectParts::projectParts() const
+const ProjectPartContainers &ProjectPartsManager::projectParts() const
 {
     return m_projectParts;
 }
diff --git a/src/tools/clangpchmanagerbackend/source/projectparts.h b/src/tools/clangpchmanagerbackend/source/projectpartsmanager.h
index 4df413ce6f..2b3c43ebc8 100644
--- a/src/tools/clangpchmanagerbackend/source/projectparts.h
+++ b/src/tools/clangpchmanagerbackend/source/projectpartsmanager.h
@@ -27,15 +27,14 @@
 
 #include "clangpchmanagerbackend_global.h"
 
-#include <projectpartsinterface.h>
+#include <projectpartsmanagerinterface.h>
 
 #include <utils/smallstringvector.h>
 
 namespace ClangBackEnd {
 
 inline namespace Pch {
-
-class ProjectParts final : public ProjectPartsInterface
+class ProjectPartsManager final : public ProjectPartsManagerInterface
 {
 public:
     ProjectPartContainers update(ProjectPartContainers &&projectsParts) override;
diff --git a/src/tools/clangpchmanagerbackend/source/projectpartsinterface.h b/src/tools/clangpchmanagerbackend/source/projectpartsmanagerinterface.h
index d37673af10..f99674ddda 100644
--- a/src/tools/clangpchmanagerbackend/source/projectpartsinterface.h
+++ b/src/tools/clangpchmanagerbackend/source/projectpartsmanagerinterface.h
@@ -29,12 +29,12 @@
 
 namespace ClangBackEnd {
 
-class ProjectPartsInterface
+class ProjectPartsManagerInterface
 {
 public:
-    ProjectPartsInterface() = default;
-    ProjectPartsInterface(const ProjectPartsInterface &) = delete;
-    ProjectPartsInterface &operator=(const ProjectPartsInterface &) = delete;
+    ProjectPartsManagerInterface() = default;
+    ProjectPartsManagerInterface(const ProjectPartsManagerInterface &) = delete;
+    ProjectPartsManagerInterface &operator=(const ProjectPartsManagerInterface &) = delete;
 
     virtual ProjectPartContainers update(ProjectPartContainers &&projectsParts) = 0;
     virtual void remove(const Utils::SmallStringVector &projectPartIds) = 0;
@@ -42,7 +42,7 @@ public:
     virtual void updateDeferred(const ProjectPartContainers &projectsParts) = 0;
     virtual ProjectPartContainers deferredUpdates() = 0;
 protected:
-    ~ProjectPartsInterface() = default;
+    ~ProjectPartsManagerInterface() = default;
 };
 
 } // namespace ClangBackEnd