Adapt to KBookmarkManager API change

diff --git a/src/dolphinbookmarkhandler.cpp b/src/dolphinbookmarkhandler.cpp
index 9edaca77d23013f3e3f052125dbbe1903d2fa85e..9f04e74214ceda2a4e21f1eb767fa8da96bed422 100644 (file)
--- a/src/dolphinbookmarkhandler.cpp
+++ b/src/dolphinbookmarkhandler.cpp
@@ -28,9 +28,9 @@ DolphinBookmarkHandler::DolphinBookmarkHandler(DolphinMainWindow *mainWindow, KA
         QDir().mkpath(bookmarksFile);
         bookmarksFile += QLatin1String("/bookmarks.xml");
     }
         QDir().mkpath(bookmarksFile);
         bookmarksFile += QLatin1String("/bookmarks.xml");
     }

-    m_bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile);
+    m_bookmarkManager = std::make_unique<KBookmarkManager>(bookmarksFile);

     m_bookmarkManager->setUpdate(true);
     m_bookmarkManager->setUpdate(true);

-    m_bookmarkMenu.reset(new KBookmarkMenu(m_bookmarkManager, this, menu));
+    m_bookmarkMenu.reset(new KBookmarkMenu(m_bookmarkManager.get(), this, menu));

 
     collection->addAction(QStringLiteral("add_bookmark"), m_bookmarkMenu->addBookmarkAction());
     collection->addAction(QStringLiteral("edit_bookmarks"), m_bookmarkMenu->editBookmarksAction());
 
     collection->addAction(QStringLiteral("add_bookmark"), m_bookmarkMenu->addBookmarkAction());
     collection->addAction(QStringLiteral("edit_bookmarks"), m_bookmarkMenu->editBookmarksAction());

diff --git a/src/dolphinbookmarkhandler.h b/src/dolphinbookmarkhandler.h
index a40c0267548bd0fc25eae3c273d5a46d24dfc06b..ceb172fdc8aa80524d1867634c3cb374a4a39ff0 100644 (file)
--- a/src/dolphinbookmarkhandler.h
+++ b/src/dolphinbookmarkhandler.h
@@ -41,7 +41,7 @@ private:
 
 private:
     DolphinMainWindow *m_mainWindow;
 
 private:
     DolphinMainWindow *m_mainWindow;

-    KBookmarkManager *m_bookmarkManager;
+    std::unique_ptr<KBookmarkManager> m_bookmarkManager;

     QScopedPointer<KBookmarkMenu> m_bookmarkMenu;
 };
 
     QScopedPointer<KBookmarkMenu> m_bookmarkMenu;
 };