Core: Use FileName for file path in IDocument

Change-Id: I85f7398aee59d0d36f0e5c3bf88ff3c96002e394
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

2 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp
index 3e9a3aef89..43dd21b83e 100644
--- a/src/plugins/bookmarks/bookmarkmanager.cpp
+++ b/src/plugins/bookmarks/bookmarkmanager.cpp
@@ -437,7 +437,7 @@ void BookmarkManager::toggleBookmark(bool)
     if (!editor)
         return;
 
-    toggleBookmark(editor->document()->filePath(), editor->currentLine());
+    toggleBookmark(editor->document()->filePath().toString(), editor->currentLine());
 }
 
 void BookmarkManager::toggleBookmark(const QString &fileName, int lineNumber)
@@ -555,7 +555,7 @@ void BookmarkManager::documentPrevNext(bool next)
     if (editorLine <= 0)
         return;
 
-    QFileInfo fi(editor->document()->filePath());
+    const QFileInfo fi = editor->document()->filePath().toFileInfo();
     if (!m_bookmarksMap.contains(fi.path()))
         return;
 
@@ -646,7 +646,7 @@ BookmarkManager::State BookmarkManager::state() const
     if (!editor)
         return HasBookMarks;
 
-    const QFileInfo fi(editor->document()->filePath());
+    const QFileInfo fi = editor->document()->filePath().toFileInfo();
 
     const DirectoryFileBookmarksMap::const_iterator dit = m_bookmarksMap.constFind(fi.path());
     if (dit == m_bookmarksMap.constEnd())
@@ -849,7 +849,7 @@ void BookmarkManager::loadBookmarks()
 
 void BookmarkManager::handleBookmarkTooltipRequest(IEditor *editor, const QPoint &pos, int line)
 {
-    Bookmark *mark = findBookmark(editor->document()->filePath(), line);
+    Bookmark *mark = findBookmark(editor->document()->filePath().toString(), line);
     operateTooltip(editor->widget(), pos, mark);
 }
 
diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp
index 9a5a5f071f..4d1a1b6836 100644
--- a/src/plugins/bookmarks/bookmarksplugin.cpp
+++ b/src/plugins/bookmarks/bookmarksplugin.cpp
@@ -110,7 +110,7 @@ bool BookmarksPlugin::initialize(const QStringList & /*arguments*/, QString *)
 
     connect(m_toggleAction, &QAction::triggered, [this]() {
         if (BaseTextEditor *editor = BaseTextEditor::currentTextEditor())
-            m_bookmarkManager->toggleBookmark(editor->document()->filePath(), editor->currentLine());
+            m_bookmarkManager->toggleBookmark(editor->document()->filePath().toString(), editor->currentLine());
     });
 
     connect(m_prevAction, &QAction::triggered, m_bookmarkManager, &BookmarkManager::prev);
@@ -165,7 +165,7 @@ void BookmarksPlugin::editorOpened(IEditor *editor)
         connect(widget, &TextEditorWidget::markRequested, m_bookmarkManager,
                 [this, editor](TextEditorWidget *, int line, TextMarkRequestKind kind) {
                     if (kind == BookmarkRequest && editor->document())
-                        m_bookmarkManager->toggleBookmark(editor->document()->filePath(), line);
+                        m_bookmarkManager->toggleBookmark(editor->document()->filePath().toString(), line);
                 });
 
 
@@ -196,7 +196,7 @@ void BookmarksPlugin::requestContextMenu(TextEditorWidget *widget,
         return;
 
     m_bookmarkMarginActionLineNumber = lineNumber;
-    m_bookmarkMarginActionFileName = widget->textDocument()->filePath();
+    m_bookmarkMarginActionFileName = widget->textDocument()->filePath().toString();
 
     menu->addAction(m_bookmarkMarginAction);
     if (m_bookmarkManager->hasBookmarkInPosition(m_bookmarkMarginActionFileName, m_bookmarkMarginActionLineNumber))