address_equal → addresses_equal. Switch from address macros to functions

in the Qt code.

svn path=/trunk/; revision=52108

2 files changed, 8 insertions, 8 deletions

diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp
index aeaeaf3b54..1c3264520b 100644
--- a/ui/qt/follow_stream_dialog.cpp
+++ b/ui/qt/follow_stream_dialog.cpp
@@ -243,10 +243,10 @@ udp_queue_packet_data(void *tapdata, packet_info *pinfo,
 
     if (follow_info->client_port == 0) {
         follow_info->client_port = pinfo->srcport;
-        COPY_ADDRESS(&follow_info->client_ip, &pinfo->src);
+        copy_address(&follow_info->client_ip, &pinfo->src);
     }
 
-    if (ADDRESSES_EQUAL(&follow_info->client_ip, &pinfo->src) && follow_info->client_port == pinfo->srcport)
+    if (addresses_equal(&follow_info->client_ip, &pinfo->src) && follow_info->client_port == pinfo->srcport)
         follow_record->is_server = FALSE;
     else
         follow_record->is_server = TRUE;
@@ -278,7 +278,7 @@ ssl_queue_packet_data(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, co
     /* Compute the packet's sender. */
     if (follow_info->client_port == 0) {
         follow_info->client_port = pinfo->srcport;
-        COPY_ADDRESS(&follow_info->client_ip, &pinfo->src);
+        copy_address(&follow_info->client_ip, &pinfo->src);
     }
     if (ADDRESSES_EQUAL(&follow_info->client_ip, &pinfo->src) &&
             follow_info->client_port == pinfo->srcport) {
diff --git a/ui/qt/tcp_stream_dialog.cpp b/ui/qt/tcp_stream_dialog.cpp
index e12fd0cb49..8b22ad5881 100644
--- a/ui/qt/tcp_stream_dialog.cpp
+++ b/ui/qt/tcp_stream_dialog.cpp
@@ -154,9 +154,9 @@ TCPStreamDialog::TCPStreamDialog(QWidget *parent, capture_file *cf, tcp_graph_ty
 
     memset (&graph_, 0, sizeof(graph_));
     graph_.type = graph_type;
-    COPY_ADDRESS(&graph_.src_address, &current.ip_src);
+    copy_address(&graph_.src_address, &current.ip_src);
     graph_.src_port = current.th_sport;
-    COPY_ADDRESS(&graph_.dst_address, &current.ip_dst);
+    copy_address(&graph_.dst_address, &current.ip_dst);
     graph_.dst_port = current.th_dport;
     graph_.stream = header->th_stream;
     findStream();
@@ -1136,11 +1136,11 @@ void TCPStreamDialog::on_actionSwitchDirection_triggered()
     address tmp_addr;
     guint16 tmp_port;
 
-    COPY_ADDRESS(&tmp_addr, &graph_.src_address);
+    copy_address(&tmp_addr, &graph_.src_address);
     tmp_port = graph_.src_port;
-    COPY_ADDRESS(&graph_.src_address, &graph_.dst_address);
+    copy_address(&graph_.src_address, &graph_.dst_address);
     graph_.src_port = graph_.dst_port;
-    COPY_ADDRESS(&graph_.dst_address, &tmp_addr);
+    copy_address(&graph_.dst_address, &tmp_addr);
     graph_.dst_port = tmp_port;
 
     fillGraph();