osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Qt6: add toInt() to QVariant == Qt::Checked 

A change in Qt6 "==" comparison for QVariant for not defined types.

Closes #18336
This commit is contained in:
Chuck Craft 2022-09-14 09:36:13 -05:00 committed by Gerald Combs
parent cbb2213021
commit 246e753d69
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/qt/models/coloring_rules_model.cpp
View File

@ -340,7 +340,7 @@ bool ColoringRulesModel::setData(const QModelIndex &dataIndex, const QVariant &v
switch (dataIndex.column()) switch (dataIndex.column())
{ {
case colName: case colName:
rule->disabled_ = (value == Qt::Checked) ? false : true; rule->disabled_ = (value.toInt() == Qt::Checked) ? false : true;
break; break;
default: default:
return false; return false;

2
ui/qt/models/enabled_protocols_model.cpp
View File

@ -265,7 +265,7 @@ bool EnabledProtocolsModel::setData(const QModelIndex &index, const QVariant &va
if (item == NULL) if (item == NULL)
return false; return false;
item->setEnabled(value == Qt::Checked ? true : false); item->setEnabled(value.toInt() == Qt::Checked ? true : false);
QVector<int> roles; QVector<int> roles;
roles << role; roles << role;

4
ui/qt/models/uat_model.cpp
View File

@ -257,7 +257,7 @@ QModelIndex UatModel::appendEntry(QVariantList rowData)
if (field->mode != PT_TXTMOD_BOOL) { if (field->mode != PT_TXTMOD_BOOL) {
data = rowData[col].toString(); data = rowData[col].toString();
} else { } else {
if (rowData[col] == Qt::Checked) { if (rowData[col].toInt() == Qt::Checked) {
data = QString("TRUE"); data = QString("TRUE");
} else { } else {
data = QString("FALSE"); 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; 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); field->cb.set(rec, bytes.constData(), (unsigned) bytes.size(), field->cbdata.set, field->fld_data);
} else { } else {
if (value == Qt::Checked) { if (value.toInt() == Qt::Checked) {
field->cb.set(rec, "TRUE", 4, field->cbdata.set, field->fld_data); field->cb.set(rec, "TRUE", 4, field->cbdata.set, field->fld_data);
} else { } else {
field->cb.set(rec, "FALSE", 5, field->cbdata.set, field->fld_data); field->cb.set(rec, "FALSE", 5, field->cbdata.set, field->fld_data);

2
ui/qt/widgets/traffic_types_list.cpp
View File

@ -152,7 +152,7 @@ bool TrafficTypesModel::setData(const QModelIndex &idx, const QVariant &value, i
if (_allTaps.count() <= idx.row()) if (_allTaps.count() <= idx.row())
return false; return false;
_allTaps[idx.row()].setChecked(value == Qt::Checked); _allTaps[idx.row()].setChecked(value.toInt() == Qt::Checked);
QList<int> selected; QList<int> selected;
prefs_clear_string_list(*_recentList); prefs_clear_string_list(*_recentList);