SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / dolphinbookmarkhandler.cpp

diff --git a/src/dolphinbookmarkhandler.cpp b/src/dolphinbookmarkhandler.cpp
index be4f447d86a77935a47328fa68d39413115671c5..8592a831c9f7c5c98c4b5591e23d174f8f2cbc62 100644 (file)
--- a/src/dolphinbookmarkhandler.cpp
+++ b/src/dolphinbookmarkhandler.cpp
@@ -10,20 +10,15 @@
 #include "global.h"
 #include <KActionCollection>
 #include <KBookmarkMenu>
 #include "global.h"
 #include <KActionCollection>
 #include <KBookmarkMenu>

-#include <KIO/Global>

 #include <QDebug>
 #include <QDir>
 #include <QStandardPaths>
 
 #include <QDebug>
 #include <QDir>
 #include <QStandardPaths>
 

-DolphinBookmarkHandler::DolphinBookmarkHandler(DolphinMainWindow *mainWindow,
-                                               KActionCollection* collection,
-                                               QMenu* menu,
-                                               QObject* parent) :
-    QObject(parent),
-    m_mainWindow(mainWindow)
+DolphinBookmarkHandler::DolphinBookmarkHandler(DolphinMainWindow *mainWindow, KActionCollection *collection, QMenu *menu, QObject *parent)
+    : QObject(parent)
+    , m_mainWindow(mainWindow)

 {
 {

-    QString bookmarksFile = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
-                                                   QStringLiteral("kfile/bookmarks.xml"));
+    QString bookmarksFile = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kfile/bookmarks.xml"));

     if (bookmarksFile.isEmpty()) {
         QString genericDataLocation = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
         if (genericDataLocation.isEmpty()) {
     if (bookmarksFile.isEmpty()) {
         QString genericDataLocation = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
         if (genericDataLocation.isEmpty()) {


@@ -33,9 +28,8 @@ DolphinBookmarkHandler::DolphinBookmarkHandler(DolphinMainWindow *mainWindow,
         QDir().mkpath(bookmarksFile);
         bookmarksFile += QLatin1String("/bookmarks.xml");
     }
         QDir().mkpath(bookmarksFile);
         bookmarksFile += QLatin1String("/bookmarks.xml");
     }

-    m_bookmarkManager = KBookmarkManager::managerForFile(bookmarksFile, QStringLiteral("dolphin"));
-    m_bookmarkManager->setUpdate(true);
-    m_bookmarkMenu.reset(new KBookmarkMenu(m_bookmarkManager, this, menu));
+    m_bookmarkManager = std::make_unique<KBookmarkManager>(bookmarksFile);
+    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());


@@ -80,43 +74,47 @@ QList<KBookmarkOwner::FutureBookmark> DolphinBookmarkHandler::currentBookmarkLis
 bool DolphinBookmarkHandler::enableOption(KBookmarkOwner::BookmarkOption option) const
 {
     switch (option) {
 bool DolphinBookmarkHandler::enableOption(KBookmarkOwner::BookmarkOption option) const
 {
     switch (option) {

-    case BookmarkOption::ShowAddBookmark: return true;
-    case BookmarkOption::ShowEditBookmark: return true;
+    case BookmarkOption::ShowAddBookmark:
+        return true;
+    case BookmarkOption::ShowEditBookmark:
+        return true;

     }
     return false;
 }
 
     }
     return false;
 }
 

-void DolphinBookmarkHandler::openBookmark(const KBookmark& bookmark, Qt::MouseButtons, Qt::KeyboardModifiers)
+void DolphinBookmarkHandler::openBookmark(const KBookmark &bookmark, Qt::MouseButtons, Qt::KeyboardModifiers)

 {
     m_mainWindow->changeUrl(bookmark.url());
 }
 
 {
     m_mainWindow->changeUrl(bookmark.url());
 }
 

-void DolphinBookmarkHandler::openFolderinTabs(const KBookmarkGroup& bookmarkGroup)
+void DolphinBookmarkHandler::openFolderinTabs(const KBookmarkGroup &bookmarkGroup)

 {
     m_mainWindow->openDirectories(bookmarkGroup.groupUrlList(), false);
 }
 
 {
     m_mainWindow->openDirectories(bookmarkGroup.groupUrlList(), false);
 }
 

-void DolphinBookmarkHandler::openInNewTab(const KBookmark& bookmark)
+void DolphinBookmarkHandler::openInNewTab(const KBookmark &bookmark)

 {
 {

-    m_mainWindow->openNewTabAfterCurrentTab(bookmark.url());
+    m_mainWindow->openNewTab(bookmark.url());

 }
 
 }
 

-void DolphinBookmarkHandler::openInNewWindow(const KBookmark& bookmark)
+void DolphinBookmarkHandler::openInNewWindow(const KBookmark &bookmark)

 {
     Dolphin::openNewWindow({bookmark.url()}, m_mainWindow);
 }
 
 {
     Dolphin::openNewWindow({bookmark.url()}, m_mainWindow);
 }
 

-QString DolphinBookmarkHandler::title(DolphinViewContainer* viewContainer)
+QString DolphinBookmarkHandler::title(DolphinViewContainer *viewContainer)

 {
     return viewContainer->caption();
 }
 
 {
     return viewContainer->caption();
 }
 

-QUrl DolphinBookmarkHandler::url(DolphinViewContainer* viewContainer)
+QUrl DolphinBookmarkHandler::url(DolphinViewContainer *viewContainer)

 {
     return viewContainer->url();
 }
 
 {
     return viewContainer->url();
 }
 

-QString DolphinBookmarkHandler::icon(DolphinViewContainer* viewContainer)
+QString DolphinBookmarkHandler::icon(DolphinViewContainer *viewContainer)

 {
     return KIO::iconNameForUrl(viewContainer->url());
 }
 {
     return KIO::iconNameForUrl(viewContainer->url());
 }

+
+#include "moc_dolphinbookmarkhandler.cpp"