From 451ad3c859487b614e42e9961204c30a40028efe Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 8 Jun 2023 13:19:33 +0300 Subject: [PATCH] kio: remove redundant bookmark classes destructors Signed-off-by: Ivailo Monev --- kio/bookmarks/kbookmarkdialog.cc | 4 ---- kio/bookmarks/kbookmarkmenu.cc | 16 ++-------------- kio/bookmarks/kbookmarkmenu.h | 6 ++---- kio/bookmarks/kbookmarkmenu_p.h | 2 +- 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/kio/bookmarks/kbookmarkdialog.cc b/kio/bookmarks/kbookmarkdialog.cc index d02d8524..59f3c5bf 100644 --- a/kio/bookmarks/kbookmarkdialog.cc +++ b/kio/bookmarks/kbookmarkdialog.cc @@ -431,10 +431,6 @@ KBookmarkTreeItem::KBookmarkTreeItem(QTreeWidgetItem * parent, QTreeWidget * tre m_address = bk.address(); } -KBookmarkTreeItem::~KBookmarkTreeItem() -{ -} - QString KBookmarkTreeItem::address() { return m_address; diff --git a/kio/bookmarks/kbookmarkmenu.cc b/kio/bookmarks/kbookmarkmenu.cc index 10d08df4..97191443 100644 --- a/kio/bookmarks/kbookmarkmenu.cc +++ b/kio/bookmarks/kbookmarkmenu.cc @@ -274,10 +274,6 @@ void KBookmarkContextMenu::addActions() } } -KBookmarkContextMenu::~KBookmarkContextMenu() -{ -} - void KBookmarkContextMenu::addBookmark() { if (m_pOwner && m_pOwner->enableOption(KBookmarkOwner::ShowAddBookmark)) { @@ -630,7 +626,7 @@ void KBookmarkMenu::slotNewFolder() KBookmarkAction::KBookmarkAction(const KBookmark &bk, KBookmarkOwner *owner, QObject *parent) - : KAction( bk.text().replace('&', "&&"), parent), + : KAction(bk.text().replace('&', "&&"), parent), KBookmarkActionInterface(bk), m_pOwner(owner) { @@ -647,16 +643,12 @@ KBookmarkAction::KBookmarkAction(const KBookmark &bk, KBookmarkOwner *owner, QOb ); } -KBookmarkAction::~KBookmarkAction() -{ -} - void KBookmarkAction::slotSelected(Qt::MouseButtons mb, Qt::KeyboardModifiers km) { if (!m_pOwner) { new KRun(bookmark().url(), (QWidget*)0); } else { - m_pOwner->openBookmark( bookmark(), mb, km ); + m_pOwner->openBookmark(bookmark(), mb, km); } } @@ -674,8 +666,4 @@ KBookmarkActionMenu::KBookmarkActionMenu(const KBookmark &bm, const QString &tex { } -KBookmarkActionMenu::~KBookmarkActionMenu() -{ -} - #include "moc_kbookmarkmenu.cpp" diff --git a/kio/bookmarks/kbookmarkmenu.h b/kio/bookmarks/kbookmarkmenu.h index 0c38c28b..3a1f3522 100644 --- a/kio/bookmarks/kbookmarkmenu.h +++ b/kio/bookmarks/kbookmarkmenu.h @@ -153,7 +153,7 @@ class KIO_EXPORT KBookmarkContextMenu : public KMenu Q_OBJECT public: KBookmarkContextMenu(const KBookmark &bm, KBookmarkManager *manager, KBookmarkOwner *owner, QWidget *parent = 0); - virtual ~KBookmarkContextMenu(); + virtual void addActions(); public Q_SLOTS: @@ -203,8 +203,7 @@ class KIO_EXPORT KBookmarkActionMenu : public KActionMenu, public KBookmarkActio { public: KBookmarkActionMenu(const KBookmark &bm, QObject *parent); - KBookmarkActionMenu(const KBookmark &bm, const QString & text, QObject *parent); - virtual ~KBookmarkActionMenu(); + KBookmarkActionMenu(const KBookmark &bm, const QString &text, QObject *parent); }; /*** @@ -219,7 +218,6 @@ class KIO_EXPORT KBookmarkAction : public KAction, public KBookmarkActionInterfa Q_OBJECT public: KBookmarkAction(const KBookmark &bk, KBookmarkOwner* owner, QObject *parent); - virtual ~KBookmarkAction(); public Q_SLOTS: void slotSelected(Qt::MouseButtons mb, Qt::KeyboardModifiers km); diff --git a/kio/bookmarks/kbookmarkmenu_p.h b/kio/bookmarks/kbookmarkmenu_p.h index b6132858..d74c9288 100644 --- a/kio/bookmarks/kbookmarkmenu_p.h +++ b/kio/bookmarks/kbookmarkmenu_p.h @@ -31,7 +31,7 @@ class KBookmarkTreeItem : public QTreeWidgetItem public: KBookmarkTreeItem(QTreeWidget *tree); KBookmarkTreeItem(QTreeWidgetItem *parent, QTreeWidget *tree, const KBookmarkGroup &bk); - ~KBookmarkTreeItem(); + QString address(); private: QString m_address;