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

[dolphin.git] / src / dolphinbookmarkhandler.h

diff --git a/src/dolphinbookmarkhandler.h b/src/dolphinbookmarkhandler.h
index 854c33534cd9e8e7af99bc440b1d9b8a032ad2c0..ceb172fdc8aa80524d1867634c3cb374a4a39ff0 100644 (file)
--- a/src/dolphinbookmarkhandler.h
+++ b/src/dolphinbookmarkhandler.h
@@ -8,12 +8,12 @@
 #define DOLPHINBOOKMARKHANDLER_H
 
 #include <KBookmarkManager>
 #define DOLPHINBOOKMARKHANDLER_H
 
 #include <KBookmarkManager>

+#include <KBookmarkOwner>

 #include <QObject>
 
 class DolphinMainWindow;
 class DolphinViewContainer;
 class KActionCollection;
 #include <QObject>
 
 class DolphinMainWindow;
 class DolphinViewContainer;
 class KActionCollection;

-class KBookmarkManager;

 class KBookmarkMenu;
 class QMenu;
 
 class KBookmarkMenu;
 class QMenu;
 


@@ -35,12 +35,13 @@ private:
     void openFolderinTabs(const KBookmarkGroup &bookmarkGroup) override;
     void openInNewTab(const KBookmark &bookmark) override;
     void openInNewWindow(const KBookmark &bookmark) override;
     void openFolderinTabs(const KBookmarkGroup &bookmarkGroup) override;
     void openInNewTab(const KBookmark &bookmark) override;
     void openInNewWindow(const KBookmark &bookmark) override;

-    static QString title(DolphinViewContainer* viewContainer);
-    static QUrl url(DolphinViewContainer* viewContainer);
-    static QString icon(DolphinViewContainer* viewContainer);
+    static QString title(DolphinViewContainer *viewContainer);
+    static QUrl url(DolphinViewContainer *viewContainer);
+    static QString icon(DolphinViewContainer *viewContainer);
+

 private:
 private:

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

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