From aff66f9060b6da45ef2730f351f8085fc4c8f8a0 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 13 Dec 2023 16:02:03 +0100 Subject: [PATCH] ClangFormat: Simplify menu action handling Change-Id: Ic4a5a6023c2f8f43b30010c14e245d0879da9ab1 Reviewed-by: Reviewed-by: Eike Ziller --- src/plugins/clangformat/clangformatplugin.cpp | 27 +++++-------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/src/plugins/clangformat/clangformatplugin.cpp b/src/plugins/clangformat/clangformatplugin.cpp index 46eb9d2a028..c0eefa624a1 100644 --- a/src/plugins/clangformat/clangformatplugin.cpp +++ b/src/plugins/clangformat/clangformatplugin.cpp @@ -76,26 +76,13 @@ void ClangFormatPlugin::initialize() ActionBuilder openConfig(this, Constants::OPEN_CURRENT_CONFIG_ID); openConfig.setText(Tr::tr("Open Used .clang-format Configuration File")); openConfig.addToContainer(CppEditor::Constants::M_CONTEXT); - openConfig.addOnTriggered([action=openConfig.contextAction()] { - const FilePath fileName = FilePath::fromVariant(action->data()); - if (!fileName.isEmpty()) - EditorManager::openEditor(configForFile(fileName)); - }); - - if (EditorManager::currentEditor()) { - if (const IDocument *doc = EditorManager::currentEditor()->document()) - openConfig.contextAction()->setData(doc->filePath().toVariant()); - } - - connect(EditorManager::instance(), - &EditorManager::currentEditorChanged, - this, - [action=openConfig.contextAction()](IEditor *editor) { - if (!editor) - return; - if (const IDocument *doc = editor->document()) - action->setData(doc->filePath().toVariant()); - }); + openConfig.addOnTriggered(this, [] { + if (const IDocument *doc = EditorManager::currentDocument()) { + const FilePath filePath = doc->filePath(); + if (!filePath.isEmpty()) + EditorManager::openEditor(configForFile(filePath)); + } + }); } #ifdef WITH_TESTS