Skip to content

fix: adapt checkbox state handling for Qt6 #775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
18202781743 wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −6
Open

fix: adapt checkbox state handling for Qt6 #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/widgets/dprintpreviewdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1155,11 +1155,11 @@ void DPrintPreviewDialogPrivate::initconnections()
}
});
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QObject::connect(sidebysideCheckBox, &DCheckBox::checkStateChanged, q, [this](int status) {
QObject::connect(sidebysideCheckBox, &DCheckBox::checkStateChanged, q, [this](Qt::CheckState status) {
#else
QObject::connect(sidebysideCheckBox, &DCheckBox::stateChanged, q, [this](int status) {
#endif
if (status == 0) {
if (status == Qt::Unchecked) {
if (isActualPrinter(printDeviceCombo->currentText()))
settingHelper->setSubControlEnabled(DPrintPreviewSettingInterface::SC_PageOrder_SequentialPrint, true);
setPageLayoutEnable(false);
Expand Down Expand Up @@ -1268,7 +1268,8 @@ void DPrintPreviewDialogPrivate::initconnections()
QObject::connect(marginLeftSpin, SIGNAL(valueChanged(double)), q, SLOT(_q_marginspinChanged(double)));
QObject::connect(marginBottomSpin, SIGNAL(valueChanged(double)), q, SLOT(_q_marginspinChanged(double)));
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QObject::connect(duplexCheckBox, SIGNAL(checkStateChanged(int)), q, SLOT(_q_checkStateChanged(int)));
QObject::connect(duplexCheckBox, &DCheckBox::checkStateChanged, q,
[this](Qt::CheckState state) { _q_checkStateChanged(int(state)); });
#else
QObject::connect(duplexCheckBox, SIGNAL(stateChanged(int)), q, SLOT(_q_checkStateChanged(int)));
#endif
Expand Down
6 changes: 3 additions & 3 deletions src/widgets/dsettingswidgetfactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2016 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2016 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

Expand Down Expand Up @@ -275,8 +275,8 @@ QPair<QWidget *, QWidget *> createCheckboxOptionHandle(QObject *opt)
#else
option->connect(rightWidget, &QCheckBox::stateChanged,
#endif
option, [ = ](int status) {
option->setValue(status == Qt::Checked);
option, [ = ] {
option->setValue(rightWidget->isChecked());
});
option->connect(option, &DTK_CORE_NAMESPACE::DSettingsOption::valueChanged,
rightWidget, [ = ](const QVariant & value) {
Expand Down
Loading