diff options
author | hjk <hjk@qt.io> | 2020-06-22 11:19:01 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2020-06-22 10:12:32 +0000 |
commit | dd9656cf84081925147b6c07030da354545ba982 (patch) | |
tree | 9c11284ef39e67218b61541d41c08dcec4c1865c /src/plugins/beautifier | |
parent | 8836cdb75afb8a18c4a764f731beb8d769c96a48 (diff) |
Beautifier: Fix freeze in extensionsInitialized
Amends c9a7a3a2d30.
Change-Id: Id14412a584c20e3e14b5c377857af43622ccf65d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/beautifier')
-rw-r--r-- | src/plugins/beautifier/clangformat/clangformat.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/beautifier/clangformat/clangformat.cpp b/src/plugins/beautifier/clangformat/clangformat.cpp index 10d32566cf..a0e3a2b3c4 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()); }); |