diff --git a/src/plugins/cppeditor/cppquickfix.cpp b/src/plugins/cppeditor/cppquickfix.cpp
index 89185c64b6b75fb59c48ab65d73c73def71189e0..72bc705ed50f373384bafcfedf038467bf6e17cf 100644
--- a/src/plugins/cppeditor/cppquickfix.cpp
+++ b/src/plugins/cppeditor/cppquickfix.cpp
@@ -933,8 +933,7 @@ int CppQuickFixOperation::match(TextEditor::QuickFixState *state)
     _document = s->info.doc;
     if (_refactoringChanges)
         delete _refactoringChanges;
-    CPPEditor *cppEditor = qobject_cast<CPPEditor*>(editor());
-    _refactoringChanges = new CppRefactoringChanges(s->info.snapshot, cppEditor->modelManager());
+    _refactoringChanges = new CppRefactoringChanges(s->info.snapshot);
     return match(s->path);
 }
 
diff --git a/src/plugins/cppeditor/cpprefactoringchanges.cpp b/src/plugins/cppeditor/cpprefactoringchanges.cpp
index 72ad416d7674b09eaa0fbb5a7b04a7f5c8420c53..6d6e095e62d80b6a3e1e6f7420b1d6e22d0c8ea9 100644
--- a/src/plugins/cppeditor/cpprefactoringchanges.cpp
+++ b/src/plugins/cppeditor/cpprefactoringchanges.cpp
@@ -34,13 +34,12 @@ using namespace CppTools;
 using namespace TextEditor;
 using namespace CppEditor;
 
-CppRefactoringChanges::CppRefactoringChanges(const Snapshot &snapshot,
-                                             CppModelManagerInterface *modelManager)
+CppRefactoringChanges::CppRefactoringChanges(const Snapshot &snapshot)
     : m_snapshot(snapshot)
-    , m_modelManager(modelManager)
-    , m_workingCopy(modelManager->workingCopy())
+    , m_modelManager(CppTools::CppModelManagerInterface::instance())
 {
-    Q_ASSERT(modelManager);
+    Q_ASSERT(m_modelManager);
+    m_workingCopy = m_modelManager->workingCopy();
 }
 
 QStringList CppRefactoringChanges::apply()
@@ -50,17 +49,14 @@ QStringList CppRefactoringChanges::apply()
     return changedFiles;
 }
 
-Document::Ptr CppRefactoringChanges::parsedDocumentForFile(const QString &fileName) const
+Document::Ptr CppRefactoringChanges::document(const QString &fileName) const
 {
-    Document::Ptr doc = m_snapshot.document(fileName);
-
     QString source;
+    unsigned editorRevision = 0;
     if (m_workingCopy.contains(fileName)) {
-        QPair<QString, unsigned> workingCopy = m_workingCopy.get(fileName);
-        if (doc && doc->editorRevision() == workingCopy.second)
-            return doc;
-        else
-            source = workingCopy.first;
+        const QPair<QString, unsigned> workingCopy = m_workingCopy.get(fileName);
+        source = workingCopy.first;
+        editorRevision = workingCopy.second;
     } else {
         QFile file(fileName);
         if (! file.open(QFile::ReadOnly))
@@ -71,7 +67,8 @@ Document::Ptr CppRefactoringChanges::parsedDocumentForFile(const QString &fileNa
     }
 
     const QByteArray contents = m_snapshot.preprocessedCode(source, fileName);
-    doc = m_snapshot.documentFromSource(contents, fileName);
+    Document::Ptr doc = m_snapshot.documentFromSource(contents, fileName);
+    doc->setEditorRevision(editorRevision);
     doc->check();
     return doc;
 }
diff --git a/src/plugins/cppeditor/cpprefactoringchanges.h b/src/plugins/cppeditor/cpprefactoringchanges.h
index 3371ca42c7309756b4489c46671793ec22cce073..9b684772f20dd3ddb056c39ebdb049b37abb0d2e 100644
--- a/src/plugins/cppeditor/cpprefactoringchanges.h
+++ b/src/plugins/cppeditor/cpprefactoringchanges.h
@@ -42,14 +42,14 @@ namespace CppEditor {
 class CPPEDITOR_EXPORT CppRefactoringChanges: public TextEditor::RefactoringChanges
 {
 public:
-    CppRefactoringChanges(const CPlusPlus::Snapshot &snapshot, CppTools::CppModelManagerInterface *modelManager);
+    CppRefactoringChanges(const CPlusPlus::Snapshot &snapshot);
 
     virtual QStringList apply();
 
     const CPlusPlus::Snapshot &snapshot() const
     { return m_snapshot; }
 
-    CPlusPlus::Document::Ptr parsedDocumentForFile(const QString &fileName) const;
+    CPlusPlus::Document::Ptr document(const QString &fileName) const;
 
 private:
     CPlusPlus::Snapshot m_snapshot;
diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp
index 7aa2491ff6c83dcd31c4e9448673144eb86a81a1..45eec47a32df4e53654a07427ac7d6f880e95e21 100644
--- a/src/plugins/texteditor/refactoringchanges.cpp
+++ b/src/plugins/texteditor/refactoringchanges.cpp
@@ -103,7 +103,7 @@ QStringList RefactoringChanges::apply()
             }
 
             QTextCursor changeSetCursor = editor->textCursor();
-            Utils::ChangeSet changeSet = m_changesByFile[fileName];
+            Utils::ChangeSet changeSet = m_changesByFile.value(fileName);
             changeSet.apply(&changeSetCursor);
 
             foreach (const CursorPair &cursorPair, cursorPairs) {
diff --git a/src/plugins/texteditor/refactoringchanges.h b/src/plugins/texteditor/refactoringchanges.h
index 51c55af383ea0ae76e33718de000d1cbc4666e06..93b576496c427dff7c88ecfb6b560c05d95252ae 100644
--- a/src/plugins/texteditor/refactoringchanges.h
+++ b/src/plugins/texteditor/refactoringchanges.h
@@ -57,7 +57,7 @@ public:
 
     virtual QStringList apply();
 
-    int positionInFile(const QString &fileName, int line, int column = 0) const;
+    Q_DECL_DEPRECATED int positionInFile(const QString &fileName, int line, int column = 0) const;
 
     static BaseTextEditor *editorForFile(const QString &fileName,
                                          bool openIfClosed = false);