From fca1e0993b392bb14fcc98f251845c3b752cda96 Mon Sep 17 00:00:00 2001 From: Andre Rummler Date: Sun, 9 Aug 2026 11:51:23 +0200 Subject: [PATCH] Remaining signal/slot migration and clean-up after the latest merge. --- sources/autoNum/ui/autonumberingdockwidget.cpp | 13 ++++--------- sources/elementspanel.cpp | 2 +- sources/qetapp.cpp | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/sources/autoNum/ui/autonumberingdockwidget.cpp b/sources/autoNum/ui/autonumberingdockwidget.cpp index d27a5042f..39f0aa985 100644 --- a/sources/autoNum/ui/autonumberingdockwidget.cpp +++ b/sources/autoNum/ui/autonumberingdockwidget.cpp @@ -123,10 +123,8 @@ void AutoNumberingDockWidget::setProject(QETProject *project, disconnect(m_project, &QETProject::elementAutoNumAdded, this, &AutoNumberingDockWidget::elementAutoNumChanged); //Folio Signals - disconnect (m_project,SIGNAL(folioAutoNumRemoved()), - this,SLOT(folioAutoNumChanged())); - disconnect (m_project,SIGNAL(folioAutoNumAdded()), - this,SLOT(folioAutoNumChanged())); + disconnect(m_project, &QETProject::folioAutoNumRemoved, this, qOverload<>(&AutoNumberingDockWidget::folioAutoNumChanged)); + disconnect(m_project, &QETProject::folioAutoNumAdded, this, qOverload<>(&AutoNumberingDockWidget::folioAutoNumChanged)); disconnect(m_project, &QETProject::defaultTitleBlockPropertiesChanged, this, &AutoNumberingDockWidget::setActive); //Conductor, Element and Folio Signals @@ -150,10 +148,8 @@ void AutoNumberingDockWidget::setProject(QETProject *project, connect(m_project, &QETProject::elementAutoNumAdded, this, &AutoNumberingDockWidget::elementAutoNumChanged); //Folio Signals - connect (m_project,SIGNAL(folioAutoNumRemoved()), - this,SLOT(folioAutoNumChanged())); - connect (m_project,SIGNAL(folioAutoNumAdded()), - this,SLOT(folioAutoNumChanged())); + connect(m_project, &QETProject::folioAutoNumRemoved, this, qOverload<>(&AutoNumberingDockWidget::folioAutoNumChanged)); + connect(m_project, &QETProject::folioAutoNumAdded, this, qOverload<>(&AutoNumberingDockWidget::folioAutoNumChanged)); connect(m_project, &QETProject::defaultTitleBlockPropertiesChanged, this, &AutoNumberingDockWidget::setActive); //Conductor, Element and Folio Signals @@ -358,7 +354,6 @@ void AutoNumberingDockWidget::on_m_folio_cb_activated(int) { if (new_properties != old_properties) diagram->undoStack().push(new ChangeTitleBlockCommand(diagram, old_properties, new_properties)); } - emit(folioAutoNumChanged(current_autonum)); refreshRow(AutoNumCategory::Folio); } diff --git a/sources/elementspanel.cpp b/sources/elementspanel.cpp index 09f12cf96..9e20e2f37 100644 --- a/sources/elementspanel.cpp +++ b/sources/elementspanel.cpp @@ -75,7 +75,7 @@ ElementsPanel::ElementsPanel(QWidget *parent) : // we handle double click on items ourselves connect(this, &ElementsPanel::itemDoubleClicked, this, &ElementsPanel::slot_doubleClick); - connect(this, &GenericPanel::firstActivated, [this]() {QTimer::singleShot(250, this, SLOT(reload()));}); + connect(this, &GenericPanel::firstActivated, [this]() {QTimer::singleShot(250, this, &ElementsPanel::reload);}); connect(this, &ElementsPanel::panelContentChanged, this, &ElementsPanel::panelContentChange); // manage signal itemClicked diff --git a/sources/qetapp.cpp b/sources/qetapp.cpp index 21b22c9cc..95d84a4d0 100644 --- a/sources/qetapp.cpp +++ b/sources/qetapp.cpp @@ -1796,7 +1796,7 @@ void QETApp::checkRemainingWindows() */ static bool sleep = true; if (sleep) { - QTimer::singleShot(500, this, SLOT(checkRemainingWindows())); + QTimer::singleShot(500, this, &QETApp::checkRemainingWindows); } else { if (!diagramEditors().count() && !elementEditors().count()) { qApp->quit();