From 246e753d699a7d9abdf4872a563b42a9d6bac97d Mon Sep 17 00:00:00 2001 From: Chuck Craft Date: Wed, 14 Sep 2022 09:36:13 -0500 Subject: [PATCH] Qt6: add toInt() to QVariant == Qt::Checked A change in Qt6 "==" comparison for QVariant for not defined types. Closes #18336 --- ui/qt/models/coloring_rules_model.cpp | 2 +- ui/qt/models/enabled_protocols_model.cpp | 2 +- ui/qt/models/uat_model.cpp | 4 ++-- ui/qt/widgets/traffic_types_list.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/qt/models/coloring_rules_model.cpp b/ui/qt/models/coloring_rules_model.cpp index 0ed24b0706..a13d60eacb 100644 --- a/ui/qt/models/coloring_rules_model.cpp +++ b/ui/qt/models/coloring_rules_model.cpp @@ -340,7 +340,7 @@ bool ColoringRulesModel::setData(const QModelIndex &dataIndex, const QVariant &v switch (dataIndex.column()) { case colName: - rule->disabled_ = (value == Qt::Checked) ? false : true; + rule->disabled_ = (value.toInt() == Qt::Checked) ? false : true; break; default: return false; diff --git a/ui/qt/models/enabled_protocols_model.cpp b/ui/qt/models/enabled_protocols_model.cpp index 020bb482c2..637a4bd847 100644 --- a/ui/qt/models/enabled_protocols_model.cpp +++ b/ui/qt/models/enabled_protocols_model.cpp @@ -265,7 +265,7 @@ bool EnabledProtocolsModel::setData(const QModelIndex &index, const QVariant &va if (item == NULL) return false; - item->setEnabled(value == Qt::Checked ? true : false); + item->setEnabled(value.toInt() == Qt::Checked ? true : false); QVector roles; roles << role; diff --git a/ui/qt/models/uat_model.cpp b/ui/qt/models/uat_model.cpp index bc9d13fe9b..506cb9835c 100644 --- a/ui/qt/models/uat_model.cpp +++ b/ui/qt/models/uat_model.cpp @@ -257,7 +257,7 @@ QModelIndex UatModel::appendEntry(QVariantList rowData) if (field->mode != PT_TXTMOD_BOOL) { data = rowData[col].toString(); } else { - if (rowData[col] == Qt::Checked) { + if (rowData[col].toInt() == Qt::Checked) { data = QString("TRUE"); } else { data = QString("FALSE"); @@ -314,7 +314,7 @@ bool UatModel::setData(const QModelIndex &index, const QVariant &value, int role const QByteArray &bytes = field->mode == PT_TXTMOD_HEXBYTES ? QByteArray::fromHex(str) : str; field->cb.set(rec, bytes.constData(), (unsigned) bytes.size(), field->cbdata.set, field->fld_data); } else { - if (value == Qt::Checked) { + if (value.toInt() == Qt::Checked) { field->cb.set(rec, "TRUE", 4, field->cbdata.set, field->fld_data); } else { field->cb.set(rec, "FALSE", 5, field->cbdata.set, field->fld_data); diff --git a/ui/qt/widgets/traffic_types_list.cpp b/ui/qt/widgets/traffic_types_list.cpp index a0b0391321..ac8036abb9 100644 --- a/ui/qt/widgets/traffic_types_list.cpp +++ b/ui/qt/widgets/traffic_types_list.cpp @@ -152,7 +152,7 @@ bool TrafficTypesModel::setData(const QModelIndex &idx, const QVariant &value, i if (_allTaps.count() <= idx.row()) return false; - _allTaps[idx.row()].setChecked(value == Qt::Checked); + _allTaps[idx.row()].setChecked(value.toInt() == Qt::Checked); QList selected; prefs_clear_string_list(*_recentList);