From 67b069e544da2078cf5c9ba0c95ca9af8ba00b03 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Thu, 29 Jan 2015 13:55:18 -0800
Subject: 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>
---
 ui/qt/lbm_lbtru_transport_dialog.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ui/qt/lbm_lbtru_transport_dialog.cpp')

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)
-- 
cgit v1.2.1