diff options
author | Pascal Quantin <pascal@wireshark.org> | 2022-01-05 13:13:42 +0100 |
---|---|---|
committer | A Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2022-01-05 20:34:15 +0000 |
commit | adca11dd5ce849098adb3576a27f21f7059e4c60 (patch) | |
tree | 376e64aab1dc429438ce4cea4b4d404ad91bbd70 /ui/qt/utils | |
parent | f1c31deb61798e077051addbe014b3648efe1f0d (diff) |
range_string: follow-up of 893290c
Diffstat (limited to 'ui/qt/utils')
-rw-r--r-- | ui/qt/utils/qt_ui_utils.cpp | 6 | ||||
-rw-r--r-- | ui/qt/utils/qt_ui_utils.h | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/ui/qt/utils/qt_ui_utils.cpp b/ui/qt/utils/qt_ui_utils.cpp index fb2c8e2258..8cdf2cc600 100644 --- a/ui/qt/utils/qt_ui_utils.cpp +++ b/ui/qt/utils/qt_ui_utils.cpp @@ -129,13 +129,11 @@ const QString val_ext_to_qstring(const guint32 val, value_string_ext *vse, const return val_qstr; } -const QString range_to_qstring(const epan_range *range) +const QString range_to_qstring(const range_string *range) { QString range_qstr = QString(); if (range) { - gchar *range_gchar_p = range_convert_range(NULL, range); - range_qstr = range_gchar_p; - wmem_free(NULL, range_gchar_p); + range_qstr += QString("%1-%2").arg(range->value_min).arg(range->value_max); } return range_qstr; } diff --git a/ui/qt/utils/qt_ui_utils.h b/ui/qt/utils/qt_ui_utils.h index 4ce22b0825..bab40ad08d 100644 --- a/ui/qt/utils/qt_ui_utils.h +++ b/ui/qt/utils/qt_ui_utils.h @@ -147,11 +147,11 @@ G_GNUC_PRINTF(3, 0); /** Convert a range to a QString using range_convert_range(). * - * @param range A pointer to an range struct. + * @param range A pointer to a range_string struct. * - * @return A QString representation of the address. May be the null string (QString()) + * @return A QString representation of the range_string. May be the null string (QString()) */ -const QString range_to_qstring(const struct epan_range *range); +const QString range_to_qstring(const range_string *range); /** Convert a bits per second value to a human-readable QString using format_size(). * |