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 bafef41f8afc357b22de51deefb1b8e93f772e9a..ceb172fdc8aa80524d1867634c3cb374a4a39ff0 100644 (file)
--- a/src/dolphinbookmarkhandler.h
+++ b/src/dolphinbookmarkhandler.h
@@ -1,32 +1,19 @@
-/***************************************************************************
- *   Copyright (C) 2019 by David Hallas <david@davidhallas.dk>             *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2019 David Hallas <david@davidhallas.dk>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #ifndef DOLPHINBOOKMARKHANDLER_H
 #define DOLPHINBOOKMARKHANDLER_H
 
 #include <KBookmarkManager>
+#include <KBookmarkOwner>
 #include <QObject>
 
 class DolphinMainWindow;
 class DolphinViewContainer;
 class KActionCollection;
-class KBookmarkManager;
 class KBookmarkMenu;
 class QMenu;
 
@@ -48,12 +35,13 @@ private:
     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:
-    DolphinMainWindow* m_mainWindow;
-    KBookmarkManager *m_bookmarkManager;
+    DolphinMainWindow *m_mainWindow;
+    std::unique_ptr<KBookmarkManager> m_bookmarkManager;
     QScopedPointer<KBookmarkMenu> m_bookmarkMenu;
 };