diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -31,7 +31,7 @@ GROUP_BASE_NAME KF VERSION ${KF5_VERSION} DEPRECATED_BASE_VERSION 0 - DEPRECATION_VERSIONS 5.0 + DEPRECATION_VERSIONS 5.0 5.65 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) diff --git a/src/konqbookmarkmenu.h b/src/konqbookmarkmenu.h --- a/src/konqbookmarkmenu.h +++ b/src/konqbookmarkmenu.h @@ -31,6 +31,7 @@ typedef KBookmarkOwner KonqBookmarkOwner; // KF5: KonqBookmarkOwner is deprecated, use KBookmarkOwner #endif +#if KBOOKMARKS_ENABLE_DEPRECATED_SINCE(5, 65) class KBOOKMARKS_EXPORT KonqBookmarkMenu : public KBookmarkMenu { //friend class KBookmarkBar; @@ -48,6 +49,7 @@ * @param parentMenu menu to be filled * @param collec parent collection for the KActions. */ + KBOOKMARKS_DEPRECATED_VERSION(5, 65, "This class has moved to Konqueror") KonqBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, KBookmarkActionMenu *parentMenu, KActionCollection *collec) : KBookmarkMenu(mgr, owner, parentMenu->menu(), collec) { @@ -59,6 +61,7 @@ * Creates a bookmark submenu. * Only used internally and for bookmark toolbar. */ + KBOOKMARKS_DEPRECATED_VERSION(5, 65, "This class has moved to Konqueror") KonqBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, KBookmarkActionMenu *parentMenu, QString parentAddress) : KBookmarkMenu(mgr, owner, parentMenu->menu(), parentAddress) { @@ -106,6 +109,7 @@ { Q_OBJECT public: + KBOOKMARKS_DEPRECATED_VERSION(5, 65, "This class has moved to Konqueror") KonqBookmarkContextMenu(const KBookmark &bm, KBookmarkManager *mgr, KBookmarkOwner *owner); ~KonqBookmarkContextMenu() override; void addActions() override; @@ -115,5 +119,8 @@ void openInNewWindow(); void toggleShowInToolbar(); }; + +#endif + #endif diff --git a/src/konqbookmarkmenu.cpp b/src/konqbookmarkmenu.cpp --- a/src/konqbookmarkmenu.cpp +++ b/src/konqbookmarkmenu.cpp @@ -39,6 +39,7 @@ #include "kbookmarkmanager.h" #include "konqbookmarkmenu_p.h" +#if KBOOKMARKS_BUILD_DEPRECATED_SINCE(5, 65) KImportedBookmarkMenu::KImportedBookmarkMenu(KBookmarkManager *mgr, KBookmarkOwner *owner, QMenu *parentMenu, @@ -336,3 +337,5 @@ } #include "moc_konqbookmarkmenu.cpp" + +#endif // KBOOKMARKS_BUILD_DEPRECATED_SINCE(5, 65) diff --git a/src/konqbookmarkmenu_p.h b/src/konqbookmarkmenu_p.h --- a/src/konqbookmarkmenu_p.h +++ b/src/konqbookmarkmenu_p.h @@ -30,6 +30,7 @@ class KBookmarkGroup; class KBookmarkOwner; +#if KBOOKMARKS_BUILD_DEPRECATED_SINCE(5, 65) class KImportedBookmarkMenu : public KBookmarkMenu { friend class KBookmarkMenuImporter; @@ -91,3 +92,5 @@ ~KImportedBookmarkActionMenu() {} }; + +#endif