From 6eb620238b31af81bb097260afb53bcac1054221 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Tue, 6 Nov 2018 19:02:00 +0100
Subject: Clang: Refactor FilePathId

We don't need the directory id any more. It's not used widely any way.

Task-number: QTCREATORBUG-21443
Change-Id: Ia95ea4c72fe9530ac56262f61f17faca04d313ba
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
---
 .../clangpchmanagerbackend/source/sourceentry.h    | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'src/tools/clangpchmanagerbackend')

diff --git a/src/tools/clangpchmanagerbackend/source/sourceentry.h b/src/tools/clangpchmanagerbackend/source/sourceentry.h
index 2e0646b987..2a5e4ba06f 100644
--- a/src/tools/clangpchmanagerbackend/source/sourceentry.h
+++ b/src/tools/clangpchmanagerbackend/source/sourceentry.h
@@ -31,7 +31,7 @@
 
 namespace ClangBackEnd {
 
-enum SourceType : unsigned char
+enum class SourceType : unsigned char
 {
     Any,
     TopInclude,
@@ -56,7 +56,21 @@ public:
 
 class SourceEntry
 {
+    using int64 = long long;
 public:
+    SourceEntry(int sourceId, int64 lastModified, int sourceType)
+        : lastModified(lastModified),
+          sourceId(sourceId),
+          sourceType(static_cast<SourceType>(sourceType))
+
+    {}
+
+    SourceEntry(FilePathId sourceId, SourceType sourceType, TimeStamp lastModified)
+        : lastModified(lastModified),
+          sourceId(sourceId),
+          sourceType(sourceType)
+    {}
+
     friend
     bool operator<(SourceEntry first, SourceEntry second)
     {
@@ -66,13 +80,15 @@ public:
     friend
     bool operator==(SourceEntry first, SourceEntry second)
     {
-        return first.sourceId == second.sourceId;
+        return first.sourceId == second.sourceId
+            && first.sourceType == second.sourceType
+            && first.lastModified == second.lastModified ;
     }
 
 public:
+    TimeStamp lastModified;
     FilePathId sourceId;
     SourceType sourceType = SourceType::Any;
-    TimeStamp lastModified;
 };
 
 using SourceEntries = std::vector<SourceEntry>;
-- 
cgit v1.2.1