From 89bc1fc4c4d28dadbff282fb3e55ce84b51f3add Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@theqtcompany.com>
Date: Tue, 14 Jul 2015 18:22:06 +0200
Subject: [PATCH] Clang: Rename filePaths in ids

UnregisterProjectPartsForCodeCompletionCommand is using them as ids
and not as file paths.

Change-Id: I13a82c1995c60bdb60c72f4fd794aa354fcbb4ef
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
---
 ...egisterprojectsforcodecompletioncommand.cpp | 18 +++++++++---------
 ...nregisterprojectsforcodecompletioncommand.h |  6 +++---
 .../test/clangcodecompletion_test.cpp          |  2 +-
 .../clangbackend/ipcsource/clangipcserver.cpp  |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.cpp b/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.cpp
index 7c6743616c7..18e3eb3e347 100644
--- a/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.cpp
+++ b/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.cpp
@@ -42,44 +42,44 @@ namespace ClangBackEnd {
 
 
 UnregisterProjectPartsForCodeCompletionCommand::UnregisterProjectPartsForCodeCompletionCommand(const Utf8StringVector &filePaths)
-    : filePaths_(filePaths)
+    : projectPartIds_(filePaths)
 {
 }
 
-const Utf8StringVector &UnregisterProjectPartsForCodeCompletionCommand::filePaths() const
+const Utf8StringVector &UnregisterProjectPartsForCodeCompletionCommand::projectPartIds() const
 {
-    return filePaths_;
+    return projectPartIds_;
 }
 
 QDataStream &operator<<(QDataStream &out, const UnregisterProjectPartsForCodeCompletionCommand &command)
 {
-    out << command.filePaths_;
+    out << command.projectPartIds_;
 
     return out;
 }
 
 QDataStream &operator>>(QDataStream &in, UnregisterProjectPartsForCodeCompletionCommand &command)
 {
-    in >> command.filePaths_;
+    in >> command.projectPartIds_;
 
     return in;
 }
 
 bool operator==(const UnregisterProjectPartsForCodeCompletionCommand &first, const UnregisterProjectPartsForCodeCompletionCommand &second)
 {
-    return first.filePaths_ == second.filePaths_;
+    return first.projectPartIds_ == second.projectPartIds_;
 }
 
 bool operator<(const UnregisterProjectPartsForCodeCompletionCommand &first, const UnregisterProjectPartsForCodeCompletionCommand &second)
 {
-    return compareContainer(first.filePaths_, second.filePaths_);
+    return compareContainer(first.projectPartIds_, second.projectPartIds_);
 }
 
 QDebug operator<<(QDebug debug, const UnregisterProjectPartsForCodeCompletionCommand &command)
 {
     debug.nospace() << "UnregisterProjectPartsForCodeCompletionCommand(";
 
-    for (const Utf8String &fileNames_ : command.filePaths())
+    for (const Utf8String &fileNames_ : command.projectPartIds())
         debug.nospace() << fileNames_ << ", ";
 
     debug.nospace() << ")";
@@ -91,7 +91,7 @@ void PrintTo(const UnregisterProjectPartsForCodeCompletionCommand &command, ::st
 {
     *os << "UnregisterProjectPartsForCodeCompletionCommand(";
 
-    for (const Utf8String &fileNames_ : command.filePaths())
+    for (const Utf8String &fileNames_ : command.projectPartIds())
         *os << fileNames_.constData() << ", ";
 
     *os << ")";
diff --git a/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.h b/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.h
index 59bf8ce5c58..592a5ae4ef2 100644
--- a/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.h
+++ b/src/libs/clangbackendipc/cmbunregisterprojectsforcodecompletioncommand.h
@@ -49,12 +49,12 @@ class CMBIPC_EXPORT UnregisterProjectPartsForCodeCompletionCommand
 
 public:
     UnregisterProjectPartsForCodeCompletionCommand() = default;
-    UnregisterProjectPartsForCodeCompletionCommand(const Utf8StringVector &filePaths);
+    UnregisterProjectPartsForCodeCompletionCommand(const Utf8StringVector &projectPartIds);
 
-    const Utf8StringVector &filePaths() const;
+    const Utf8StringVector &projectPartIds() const;
 
 private:
-    Utf8StringVector filePaths_;
+    Utf8StringVector projectPartIds_;
 };
 
 CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const UnregisterProjectPartsForCodeCompletionCommand &command);
diff --git a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
index 95c43eeb200..9cbcaf92727 100644
--- a/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
+++ b/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp
@@ -330,7 +330,7 @@ QString toString(const UnregisterProjectPartsForCodeCompletionCommand &command)
     QTextStream ts(&out);
 
     ts << "UnregisterProjectPartsForCodeCompletionCommand\n"
-       << command.filePaths().join(Utf8String::fromUtf8(",")).toByteArray() << "\n";
+       << command.projectPartIds().join(Utf8String::fromUtf8(",")).toByteArray() << "\n";
     return out;
 }
 
diff --git a/src/tools/clangbackend/ipcsource/clangipcserver.cpp b/src/tools/clangbackend/ipcsource/clangipcserver.cpp
index d192da2193f..e8b860520be 100644
--- a/src/tools/clangbackend/ipcsource/clangipcserver.cpp
+++ b/src/tools/clangbackend/ipcsource/clangipcserver.cpp
@@ -99,7 +99,7 @@ void ClangIpcServer::registerProjectPartsForCodeCompletion(const RegisterProject
 void ClangIpcServer::unregisterProjectPartsForCodeCompletion(const UnregisterProjectPartsForCodeCompletionCommand &command)
 {
     try {
-        projects.remove(command.filePaths());
+        projects.remove(command.projectPartIds());
     } catch (const ProjectPartDoNotExistException &exception) {
         client()->projectPartsDoNotExist(ProjectPartsDoNotExistCommand(exception.projectPartIds()));
     } catch (const std::exception &exception) {