diff options
author | Roland Knall <rknall@gmail.com> | 2020-07-16 09:21:04 +0200 |
---|---|---|
committer | Roland Knall <rknall@gmail.com> | 2020-07-16 08:09:28 +0000 |
commit | a5533561db85d440c2c0aa18ab3a708b3bbe379c (patch) | |
tree | 15b5fc33d1f263f61b67703a6cc421d9cd0c52e6 /ui | |
parent | d04ce112a7a3f9b90f76c8874b6ddbba5e3cd847 (diff) |
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>
Diffstat (limited to 'ui')
-rw-r--r-- | ui/qt/interface_toolbar.cpp | 4 | ||||
-rw-r--r-- | ui/qt/tap_parameter_dialog.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ui/qt/interface_toolbar.cpp b/ui/qt/interface_toolbar.cpp index f4517655ec..55c2469cd4 100644 --- a/ui/qt/interface_toolbar.cpp +++ b/ui/qt/interface_toolbar.cpp @@ -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) diff --git a/ui/qt/tap_parameter_dialog.cpp b/ui/qt/tap_parameter_dialog.cpp index 284ba9ab96..03c4ed1439 100644 --- a/ui/qt/tap_parameter_dialog.cpp +++ b/ui/qt/tap_parameter_dialog.cpp @@ -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; } |