From dd9656cf84081925147b6c07030da354545ba982 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 22 Jun 2020 11:19:01 +0200 Subject: [PATCH] Beautifier: Fix freeze in extensionsInitialized Amends c9a7a3a2d30. Change-Id: Id14412a584c20e3e14b5c377857af43622ccf65d Reviewed-by: Eike Ziller --- src/plugins/beautifier/clangformat/clangformat.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/plugins/beautifier/clangformat/clangformat.cpp b/src/plugins/beautifier/clangformat/clangformat.cpp index 10d32566cf6..a0e3a2b3c46 100644 --- a/src/plugins/beautifier/clangformat/clangformat.cpp +++ b/src/plugins/beautifier/clangformat/clangformat.cpp @@ -54,11 +54,9 @@ using namespace TextEditor; namespace Beautifier { namespace Internal { -const char MENU_ID[] = "ClangFormat.Menu"; - ClangFormat::ClangFormat() { - Core::ActionContainer *menu = Core::ActionManager::createMenu(MENU_ID); + Core::ActionContainer *menu = Core::ActionManager::createMenu("ClangFormat.Menu"); menu->menu()->setTitle(tr("&ClangFormat")); m_formatFile = new QAction(BeautifierPlugin::msgFormatCurrentFile(), this); @@ -80,7 +78,7 @@ ClangFormat::ClangFormat() connect(m_disableFormattingSelectedText, &QAction::triggered, this, &ClangFormat::disableFormattingSelectedText); - Core::ActionManager::actionContainer(MENU_ID)->addMenu(menu); + Core::ActionManager::actionContainer(Constants::MENU_ID)->addMenu(menu); connect(&m_settings, &ClangFormatSettings::supportedMimeTypesChanged, [this] { updateActions(Core::EditorManager::currentEditor()); });