From e5ff53ec2f22ddca8726bd0edc81f796421e2f69 Mon Sep 17 00:00:00 2001 From: dengzhongyuan Date: Tue, 30 Dec 2025 14:23:39 +0800 Subject: [PATCH] fix: Update signal connections for compatibility with Qt 6 - Refactored signal-slot connections in ColorWidgetAction.cpp to use modern syntax for Qt 6 compatibility. - Maintained backward compatibility with Qt versions prior to 6.0.0. This change improves code clarity and ensures proper functionality across different Qt versions. bug: https://pms.uniontech.com/bug-view-304093.html --- reader/widgets/ColorWidgetAction.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/reader/widgets/ColorWidgetAction.cpp b/reader/widgets/ColorWidgetAction.cpp index 5d1ad1f5..46f70fe1 100644 --- a/reader/widgets/ColorWidgetAction.cpp +++ b/reader/widgets/ColorWidgetAction.cpp @@ -67,13 +67,24 @@ void ColorWidgetAction::initWidget(DWidget *pParent) btn->setFixedSize(QSize(tW, tH)); if (colorlst.at(iLoop) == Utils::getCurHiglightColor()) btn->setSelected(true); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) connect(btn, SIGNAL(clicked()), sigMap, SLOT(map())); +#else + connect(btn, &RoundColorWidget::clicked, this, [this, iLoop]() { + slotBtnClicked(iLoop); + }); +#endif sigMap->setMapping(btn, iLoop); buttonLayout->addWidget(btn); qCDebug(appLog) << "Color widget initialization completed"; } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) connect(sigMap, SIGNAL(mapped(int)), SLOT(slotBtnClicked(int))); +#else + connect(sigMap, &QSignalMapper::mappedInt, + this, &ColorWidgetAction::slotBtnClicked); +#endif buttonLayout->addStretch(1);