From a7bf65c2888f179a8697912be521ebe1b33d0efd Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 7 Feb 2023 18:11:35 +0100 Subject: [PATCH] Bookmarks: Use more FilePath Change-Id: I8d4337f9dccaf26b37583eb87f364c9d995f94fd Reviewed-by: David Schulz Reviewed-by: --- src/plugins/bookmarks/bookmark.cpp | 8 ++++---- src/plugins/bookmarks/bookmark.h | 2 +- src/plugins/bookmarks/bookmarkmanager.cpp | 6 +++--- src/plugins/bookmarks/bookmarkmanager.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/plugins/bookmarks/bookmark.cpp b/src/plugins/bookmarks/bookmark.cpp index c6ded3986d0..5a2420246b9 100644 --- a/src/plugins/bookmarks/bookmark.cpp +++ b/src/plugins/bookmarks/bookmark.cpp @@ -66,11 +66,11 @@ void Bookmark::updateBlock(const QTextBlock &block) } } -void Bookmark::updateFileName(const FilePath &fileName) +void Bookmark::updateFileName(const FilePath &filePath) { - const FilePath &oldFileName = this->fileName(); - TextMark::updateFileName(fileName); - m_manager->updateBookmarkFileName(this, oldFileName.toString()); + const FilePath oldFilePath = this->fileName(); + TextMark::updateFileName(filePath); + m_manager->updateBookmarkFileName(this, oldFilePath); } void Bookmark::setNote(const QString ¬e) diff --git a/src/plugins/bookmarks/bookmark.h b/src/plugins/bookmarks/bookmark.h index 04a7f66d0a0..a40939be2c1 100644 --- a/src/plugins/bookmarks/bookmark.h +++ b/src/plugins/bookmarks/bookmark.h @@ -17,7 +17,7 @@ public: void updateLineNumber(int lineNumber) override; void move(int line) override; void updateBlock(const QTextBlock &block) override; - void updateFileName(const Utils::FilePath &fileName) override; + void updateFileName(const Utils::FilePath &filePath) override; void removedFromEditor() override; bool isDraggable() const override; diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index 1383335130a..344893a8ec3 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -417,12 +417,12 @@ void BookmarkManager::updateBookmark(Bookmark *bookmark) saveBookmarks(); } -void BookmarkManager::updateBookmarkFileName(Bookmark *bookmark, const QString &oldFileName) +void BookmarkManager::updateBookmarkFileName(Bookmark *bookmark, const FilePath &oldFilePath) { - if (oldFileName == bookmark->fileName().toString()) + if (oldFilePath == bookmark->fileName()) return; - m_bookmarksMap[Utils::FilePath::fromString(oldFileName)].removeAll(bookmark); + m_bookmarksMap[oldFilePath].removeAll(bookmark); m_bookmarksMap[bookmark->fileName()].append(bookmark); updateBookmark(bookmark); } diff --git a/src/plugins/bookmarks/bookmarkmanager.h b/src/plugins/bookmarks/bookmarkmanager.h index be7424b61ed..a4fcf01b58c 100644 --- a/src/plugins/bookmarks/bookmarkmanager.h +++ b/src/plugins/bookmarks/bookmarkmanager.h @@ -31,7 +31,7 @@ public: ~BookmarkManager() final; void updateBookmark(Bookmark *bookmark); - void updateBookmarkFileName(Bookmark *bookmark, const QString &oldFileName); + void updateBookmarkFileName(Bookmark *bookmark, const Utils::FilePath &oldFilePath); void deleteBookmark(Bookmark *bookmark); // Does not remove the mark void removeAllBookmarks(); Bookmark *bookmarkForIndex(const QModelIndex &index) const;