diff --git a/src/plugins/analyzerbase/analyzerutils.cpp b/src/plugins/analyzerbase/analyzerutils.cpp
index 2872b23353c..ac75620a81f 100644
--- a/src/plugins/analyzerbase/analyzerutils.cpp
+++ b/src/plugins/analyzerbase/analyzerutils.cpp
@@ -74,7 +74,7 @@ CPlusPlus::Symbol *AnalyzerUtils::findSymbolUnderCursor()
     widget->convertPosition(pos, &line, &column);
 
     const CPlusPlus::Snapshot &snapshot = CppTools::CppModelManager::instance()->snapshot();
-    CPlusPlus::Document::Ptr doc = snapshot.document(widget->textDocument()->filePath().toString());
+    CPlusPlus::Document::Ptr doc = snapshot.document(widget->textDocument()->filePath());
     QTC_ASSERT(doc, return 0);
 
     // fetch the expression's code
diff --git a/src/plugins/cppeditor/cppelementevaluator.cpp b/src/plugins/cppeditor/cppelementevaluator.cpp
index 02502aad6b3..d38437d3158 100644
--- a/src/plugins/cppeditor/cppelementevaluator.cpp
+++ b/src/plugins/cppeditor/cppelementevaluator.cpp
@@ -85,7 +85,7 @@ void CppElementEvaluator::execute()
         return;
 
     const Snapshot &snapshot = m_modelManager->snapshot();
-    Document::Ptr doc = snapshot.document(m_editor->textDocument()->filePath().toString());
+    Document::Ptr doc = snapshot.document(m_editor->textDocument()->filePath());
     if (!doc)
         return;
 
diff --git a/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp b/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp
index 49bfeb0c1a9..ee3b5e72ab7 100644
--- a/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp
+++ b/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp
@@ -550,7 +550,7 @@ TextEditorWidget::Link FollowSymbolUnderCursor::findLink(const QTextCursor &curs
     }
 
     // Now we prefer the doc from the snapshot with macros expanded.
-    Document::Ptr doc = snapshot.document(m_widget->textDocument()->filePath().toString());
+    Document::Ptr doc = snapshot.document(m_widget->textDocument()->filePath());
     if (!doc) {
         doc = documentFromSemanticInfo;
         if (!doc)
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index bf3ab5d68c2..36fc5a6d971 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -543,7 +543,7 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName,
             it.next();
             const Utils::FileName &fileName = it.key();
             if (fileName != configFileName)
-                newDocTable.insert(docTable.document(fileName.toString()));
+                newDocTable.insert(docTable.document(fileName));
         }
     }
     docTable = newDocTable;