From f75b4c1f6f3363687493dba4a46c94790d8f698e Mon Sep 17 00:00:00 2001 From: Kubat <mael.martin31@gmail.com> Date: Mon, 30 Aug 2021 19:00:06 +0200 Subject: [PATCH] UI: Get ride of one macro in the MainWindow constructor --- src/UI/MainWindow.cc | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/src/UI/MainWindow.cc b/src/UI/MainWindow.cc index a322dab0..d789104f 100644 --- a/src/UI/MainWindow.cc +++ b/src/UI/MainWindow.cc @@ -136,22 +136,18 @@ MainWindow::MainWindow() noexcept } }; - { -#define CONNECT_ENABLE(act, func) \ - connect(documents, &QTabWidget::currentChanged, act, std::bind_front(func, act)); - - connect(documents, &QTabWidget::currentChanged, this, - [this](int) noexcept -> void { documentViewActionsChanged(); }); - - CONNECT_ENABLE(saveFileAct, enableSaveOnDocument); - CONNECT_ENABLE(saveFileAsAct, enableSaveAsOnDocument); + auto enableConnection = [this](QAction *const act, auto func) noexcept -> void { + connect(documents, &QTabWidget::currentChanged, act, std::bind_front(func, act)); + }; - CONNECT_ENABLE(loadSubDocumentAssAct, enableLoadSubOnDocument); - CONNECT_ENABLE(loadSubDocumentVideoAct, enableLoadSubOnDocument); - CONNECT_ENABLE(loadSubDocumentAudioAct, enableLoadSubOnDocument); + connect(documents, &QTabWidget::currentChanged, this, + [this](int) noexcept -> void { documentViewActionsChanged(); }); -#undef CONNECT_ENABLE - } + enableConnection(saveFileAct, enableSaveOnDocument); + enableConnection(saveFileAsAct, enableSaveAsOnDocument); + enableConnection(loadSubDocumentAssAct, enableLoadSubOnDocument); + enableConnection(loadSubDocumentVideoAct, enableLoadSubOnDocument); + enableConnection(loadSubDocumentAudioAct, enableLoadSubOnDocument); // Main window has finished its construction statusBar()->showMessage("QSimulate has started"); -- GitLab