diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-01-29 13:55:18 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-01-29 22:51:43 +0000 |
| commit | 67b069e544da2078cf5c9ba0c95ca9af8ba00b03 (patch) | |
| tree | dda3edf650e2a08f86825bbf3d537a7ab33051f2 /ui/qt/lbm_lbtru_transport_dialog.cpp | |
| parent | 2edf8bbd33e4820c19a52a435ddb2cc8e3e32fdb (diff) | |
| download | wireshark-67b069e544da2078cf5c9ba0c95ca9af8ba00b03.tar.gz | |
Qt: Add address conversion convenience routines
Add address_to_qstring and address_to_display_qstring, which wrap
address_to_string and address_to_display respectively and return
QStrings. Convert most of the instances in ui/qt to the new routines.
Fix a some memory leaks in the process.
Change-Id: Icda80bbfe0b2df723d54c8da84355255f819af89
Reviewed-on: https://code.wireshark.org/review/6848
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/lbm_lbtru_transport_dialog.cpp')
| -rw-r--r-- | ui/qt/lbm_lbtru_transport_dialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp index cfdad456b5..7eef151644 100644 --- a/ui/qt/lbm_lbtru_transport_dialog.cpp +++ b/ui/qt/lbm_lbtru_transport_dialog.cpp @@ -26,6 +26,7 @@ #include "file.h" +#include "qt_ui_utils.h" #include "wireshark_application.h" #include <QClipboard> @@ -36,7 +37,6 @@ #include <epan/packet_info.h> #include <epan/tap.h> #include <epan/to_str.h> -#include <epan/wmem/wmem.h> #include <epan/dissectors/packet-lbm.h> #include <wsutil/nstime.h> @@ -1396,7 +1396,7 @@ void LBMLBTRUTransportDialogInfo::processPacket(const packet_info * pinfo, const { LBMLBTRUSourceEntry * source = NULL; LBMLBTRUSourceMapIterator it; - QString src_address = QString(address_to_str(pinfo->pool, &(pinfo->src))); + QString src_address = address_to_qstring(&(pinfo->src)); it = m_sources.find(src_address); if (m_sources.end() == it) @@ -1425,7 +1425,7 @@ void LBMLBTRUTransportDialogInfo::processPacket(const packet_info * pinfo, const { LBMLBTRUReceiverEntry * receiver = NULL; LBMLBTRUReceiverMapIterator it; - QString src_address = QString(address_to_str(pinfo->pool, &(pinfo->src))); + QString src_address = address_to_qstring(&(pinfo->src)); it = m_receivers.find(src_address); if (m_receivers.end() == it) |