From ab6c210d1d50a2cb56f76536bc9dcc6b240880c9 Mon Sep 17 00:00:00 2001
From: William Riley <william.riley@renesas.com>
Date: Mon, 23 Mar 2015 09:53:36 +0000
Subject: [PATCH] Bug 462823: Normalise files paths in
 HeaderFileReferenceAdjuster

Change-Id: Iffd3b6012ad492492e430162adbd895b6d8997e4
Signed-off-by: William Riley <william.riley@renesas.com>
---
 .../ui/refactoring/rename/HeaderFileReferenceAdjuster.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/HeaderFileReferenceAdjuster.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/HeaderFileReferenceAdjuster.java
index 6aa398d8323..a5213234f27 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/HeaderFileReferenceAdjuster.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/rename/HeaderFileReferenceAdjuster.java
@@ -118,7 +118,8 @@ public class HeaderFileReferenceAdjuster {
 		this.movedFiles = movedFiles;
 		this.movedFilesByLocation = new HashMap<>();
 		for (Entry<IFile, IFile> entry : movedFiles.entrySet()) {
-			this.movedFilesByLocation.put(entry.getKey().getLocation().toOSString(),
+			//Construct map using normalised file paths
+			this.movedFilesByLocation.put(entry.getKey().getLocation().toString(),
 					entry.getValue().getLocation());
 		}
 		this.renamedContainers = renamedContainers;