osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Qt: Fix 5.15 deprecation warnings 

QString is no longer allowed to be append()ed to QByteArray.

Change-Id: I177e271d01c51d190b57f679f38d11b31b1f96c4
Reviewed-on: https://code.wireshark.org/review/37879
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
This commit is contained in:
Roland Knall 2020-07-16 09:21:04 +02:00
parent d04ce112a7
commit a5533561db
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/qt/interface_toolbar.cpp
View File

@ -238,14 +238,14 @@ QWidget *InterfaceToolbar::createSelector(iface_toolbar_control *control)
QString display = QString().fromUtf8((gchar *)val->display);
QByteArray interface_value;
interface_value.append(value);
interface_value.append(value.toUtf8());
if (display.isEmpty())
{
display = value;
}
else
{
interface_value.append('\0' + display);
interface_value.append(QString('\0' + display).toUtf8());
}
combobox->addItem(display, value);
if (val->is_default)

4
ui/qt/tap_parameter_dialog.cpp
View File

@ -276,8 +276,8 @@ QByteArray TapParameterDialog::getTreeAsString(st_format_type format)
plain_header.append('\n');
ba.append(top_separator);
ba.append(file_header);
ba.append(plain_header);
ba.append(file_header.toUtf8());
ba.append(plain_header.toUtf8());
ba.append(footer);
break;
}