1 files changed, 9 insertions, 14 deletions

diff --git a/src/plugins/cpptools/cpprefactoringchanges.cpp b/src/plugins/cpptools/cpprefactoringchanges.cpp
index 4b416d266d..045633077b 100644
--- a/src/plugins/cpptools/cpprefactoringchanges.cpp
+++ b/src/plugins/cpptools/cpprefactoringchanges.cpp
@@ -38,7 +38,6 @@
 
 using namespace CPlusPlus;
 using namespace CppTools;
-using namespace Utils;
 
 class CppTools::CppRefactoringChangesData : public TextEditor::RefactoringChangesData
 {
@@ -113,10 +112,6 @@ CppRefactoringFileConstPtr CppRefactoringChanges::fileNoEditor(const QString &fi
     CppRefactoringFilePtr result(new CppRefactoringFile(document, fileName));
     result->m_data = m_data;
 
-    Document::Ptr cppDocument = data()->m_snapshot.document(fileName);
-    if (cppDocument)
-        result->setCppDocument(cppDocument);
-
     return result;
 }
 
@@ -195,24 +190,24 @@ bool CppRefactoringFile::isCursorOn(const AST *ast) const
     return false;
 }
 
-ChangeSet::Range CppRefactoringFile::range(unsigned tokenIndex) const
+Utils::ChangeSet::Range CppRefactoringFile::range(unsigned tokenIndex) const
 {
     const Token &token = tokenAt(tokenIndex);
     unsigned line, column;
-    cppDocument()->translationUnit()->getPosition(token.begin(), &line, &column);
+    cppDocument()->translationUnit()->getPosition(token.utf16charsBegin(), &line, &column);
     const int start = document()->findBlockByNumber(line - 1).position() + column - 1;
-    return ChangeSet::Range(start, start + token.length());
+    return Utils::ChangeSet::Range(start, start + token.utf16chars());
 }
 
-ChangeSet::Range CppRefactoringFile::range(AST *ast) const
+Utils::ChangeSet::Range CppRefactoringFile::range(AST *ast) const
 {
-    return ChangeSet::Range(startOf(ast), endOf(ast));
+    return Utils::ChangeSet::Range(startOf(ast), endOf(ast));
 }
 
 int CppRefactoringFile::startOf(unsigned index) const
 {
     unsigned line, column;
-    cppDocument()->translationUnit()->getPosition(tokenAt(index).begin(), &line, &column);
+    cppDocument()->translationUnit()->getPosition(tokenAt(index).utf16charsBegin(), &line, &column);
     return document()->findBlockByNumber(line - 1).position() + column - 1;
 }
 
@@ -224,7 +219,7 @@ int CppRefactoringFile::startOf(const AST *ast) const
 int CppRefactoringFile::endOf(unsigned index) const
 {
     unsigned line, column;
-    cppDocument()->translationUnit()->getPosition(tokenAt(index).end(), &line, &column);
+    cppDocument()->translationUnit()->getPosition(tokenAt(index).utf16charsEnd(), &line, &column);
     return document()->findBlockByNumber(line - 1).position() + column - 1;
 }
 
@@ -239,9 +234,9 @@ void CppRefactoringFile::startAndEndOf(unsigned index, int *start, int *end) con
 {
     unsigned line, column;
     Token token(tokenAt(index));
-    cppDocument()->translationUnit()->getPosition(token.begin(), &line, &column);
+    cppDocument()->translationUnit()->getPosition(token.utf16charsBegin(), &line, &column);
     *start = document()->findBlockByNumber(line - 1).position() + column - 1;
-    *end = *start + token.length();
+    *end = *start + token.utf16chars();
 }
 
 QString CppRefactoringFile::textOf(const AST *ast) const