diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp index c432b3b0e93..be113a943b9 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp +++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp @@ -403,35 +403,6 @@ ActionSeparator::ActionSeparator(Id id) container->addSeparator(); } -// Menu - -Menu::Menu() = default; - -void Menu::setId(Id id) -{ - QTC_ASSERT(!m_menu, return); - m_menu = ActionManager::createMenu(id); -} - -void Menu::setTitle(const QString &title) -{ - QTC_ASSERT(m_menu, return); - m_menu->menu()->setTitle(title); -} - -void Menu::setContainer(Id containerId, Id groupId) -{ - QTC_ASSERT(m_menu, return); - ActionContainer *container = ActionManager::actionContainer(containerId); - container->addMenu(m_menu, groupId); -} - -void Menu::addSeparator() -{ - QTC_ASSERT(m_menu, return); - m_menu->addSeparator(); -} - // MenuBuilder MenuBuilder::MenuBuilder(Id id) diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.h b/src/plugins/coreplugin/actionmanager/actionmanager.h index 8382985671a..d88da91ed19 100644 --- a/src/plugins/coreplugin/actionmanager/actionmanager.h +++ b/src/plugins/coreplugin/actionmanager/actionmanager.h @@ -101,20 +101,6 @@ private: class ActionBuilderPrivate *d = nullptr; }; -class CORE_EXPORT Menu -{ -public: - Menu(); - - void setId(Utils::Id id); - void setTitle(const QString &title); - void setContainer(Utils::Id containerId, Utils::Id groupId = {}); - void addSeparator(); - -private: - ActionContainer *m_menu = nullptr; -}; - class CORE_EXPORT MenuBuilder { public: diff --git a/src/plugins/texteditor/bookmarkmanager.cpp b/src/plugins/texteditor/bookmarkmanager.cpp index 54f79db26c5..b6be7d5228f 100644 --- a/src/plugins/texteditor/bookmarkmanager.cpp +++ b/src/plugins/texteditor/bookmarkmanager.cpp @@ -334,9 +334,9 @@ BookmarkManager::BookmarkManager(QObject *parent) const Id bookmarkMenuId = "Bookmarks.Menu"; const Context editorManagerContext(Core::Constants::C_EDITORMANAGER); - m_bookmarkMenu.setId(bookmarkMenuId); - m_bookmarkMenu.setTitle(Tr::tr("&Bookmarks")); - m_bookmarkMenu.setContainer(Core::Constants::M_TOOLS); + MenuBuilder bookmarkMenu(bookmarkMenuId); + bookmarkMenu.setTitle(Tr::tr("&Bookmarks")); + bookmarkMenu.addToContainer(Core::Constants::M_TOOLS); connect(&m_editBookmarkAction, &QAction::triggered, this, [this] { editByFileAndLine(m_marginActionFileName, m_marginActionLineNumber); @@ -378,7 +378,7 @@ BookmarkManager::BookmarkManager(QObject *parent) } }); - m_bookmarkMenu.addSeparator(); + bookmarkMenu.addSeparator(); ActionBuilder prevAction(this, Constants::BOOKMARKS_PREV_ACTION); prevAction.setContext(editorManagerContext); @@ -400,7 +400,7 @@ BookmarkManager::BookmarkManager(QObject *parent) nextAction.bindContextAction(&m_nextAction); nextAction.addOnTriggered(this, [this] { next(); }); - m_bookmarkMenu.addSeparator(); + bookmarkMenu.addSeparator(); ActionBuilder docPrevAction(this, "Bookmarks.PreviousDocument"); docPrevAction.setContext(editorManagerContext); diff --git a/src/plugins/texteditor/bookmarkmanager.h b/src/plugins/texteditor/bookmarkmanager.h index b82da27c578..53c69e97175 100644 --- a/src/plugins/texteditor/bookmarkmanager.h +++ b/src/plugins/texteditor/bookmarkmanager.h @@ -97,7 +97,6 @@ private: QList m_bookmarksList; QItemSelectionModel *m_selectionModel; - Core::Menu m_bookmarkMenu; QAction *m_toggleAction = nullptr; QAction *m_editAction = nullptr;