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

Qt: QVariant::type() is deprecated in Qt6. 

Fix

ui/qt/rtp_stream_dialog.cpp:708:26: error: 'type' is deprecated: Use typeId() or metaType(). [-Werror,-Wdeprecated-declarations]
            } else if (v.type() == QVariant::String) {
                         ^

and similar errors. Although the warnings recommend typeId() or
metaType(), userType() exists in both Qt 5 and 6 so use it instead.
This commit is contained in:
Gerald Combs 2022-03-22 14:02:35 -07:00 committed by Roland Knall
parent ea11891f21
commit de0db2ad0a
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/qt/iax2_analysis_dialog.cpp
View File

@ -1166,7 +1166,7 @@ void Iax2AnalysisDialog::saveCsv(Iax2AnalysisDialog::StreamDirection direction)
foreach (QVariant v, ra_ti->rowData()) {
if (!v.isValid()) {
values << "\"\"";
} else if ((int) v.type() == (int) QMetaType::QString) {
} else if (v.userType() == QMetaType::QString) {
values << QString("\"%1\"").arg(v.toString());
} else {
values << v.toString();
@ -1190,7 +1190,7 @@ void Iax2AnalysisDialog::saveCsv(Iax2AnalysisDialog::StreamDirection direction)
foreach (QVariant v, ra_ti->rowData()) {
if (!v.isValid()) {
values << "\"\"";
} else if (v.type() == QVariant::String) {
} else if (v.userType() == QMetaType::QString) {
values << QString("\"%1\"").arg(v.toString());
} else {
values << v.toString();

2
ui/qt/protocol_hierarchy_dialog.cpp
View File

@ -332,7 +332,7 @@ void ProtocolHierarchyDialog::on_actionCopyAsCsv_triggered()
foreach (QVariant v, protoHierRowData(item)) {
if (!v.isValid()) {
separated_value << "\"\"";
} else if (v.type() == QVariant::String) {
} else if (v.userType() == QMetaType::QString) {
separated_value << QString("\"%1\"").arg(v.toString());
} else {
separated_value << v.toString();

2
ui/qt/rtp_stream_dialog.cpp
View File

@ -705,7 +705,7 @@ void RtpStreamDialog::on_actionCopyAsCsv_triggered()
foreach (QVariant v, streamRowData(row)) {
if (!v.isValid()) {
rdsl << "\"\"";
} else if (v.type() == QVariant::String) {
} else if (v.userType() == QMetaType::QString) {
rdsl << QString("\"%1\"").arg(v.toString());
} else {
rdsl << v.toString();

16
ui/qt/tap_parameter_dialog.cpp
View File

@ -213,15 +213,15 @@ QString TapParameterDialog::itemDataToPlain(QVariant var, int width)
QString plain_str;
int align_mul = 1;
switch (var.type()) {
case QVariant::String:
switch (var.userType()) {
case QMetaType::QString:
align_mul = -1;
// Fall through
case QVariant::Int:
case QVariant::UInt:
case QMetaType::Int:
case QMetaType::UInt:
plain_str = var.toString();
break;
case QVariant::Double:
case QMetaType::Double:
plain_str = QString::number(var.toDouble(), 'f', 6);
break;
default:
@ -262,7 +262,7 @@ QByteArray TapParameterDialog::getTreeAsString(st_format_type format)
col_widths.append(ui->statsTreeWidget->headerItem()->text(col).length());
}
QVariant var = ui->statsTreeWidget->headerItem()->data(col, Qt::DisplayRole);
if (var.type() == QVariant::String) {
if (var.userType() == QMetaType::QString) {
col_widths[col] = qMax(col_widths[col], itemDataToPlain(var).length());
}
}
@ -360,7 +360,7 @@ QByteArray TapParameterDialog::getTreeAsString(st_format_type format)
}
case ST_FORMAT_CSV:
foreach (QVariant var, tid) {
if (var.type() == QVariant::String) {
if (var.userType() == QMetaType::QString) {
parts << QString("\"%1\"").arg(var.toString());
} else {
parts << var.toString();
@ -385,7 +385,7 @@ QByteArray TapParameterDialog::getTreeAsString(st_format_type format)
QString indent = "-";
foreach (QVariant var, tid) {
QString entry;
if (var.type() == QVariant::String) {
if (var.userType() == QMetaType::QString) {
entry = QString("\"%1\"").arg(var.toString());
} else {
entry = var.toString();

2
ui/qt/traffic_table_dialog.cpp
View File

@ -309,7 +309,7 @@ void TrafficTableDialog::copyAsCsv()
foreach (QVariant v, curTreeRowData(row)) {
if (!v.isValid()) {
rdsl << "\"\"";
} else if (v.type() == QVariant::String) {
} else if (v.userType() == QMetaType::QString) {
rdsl << QString("\"%1\"").arg(v.toString());
} else {
rdsl << v.toString();