diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2016-06-26 21:38:19 -0400 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-06-27 11:40:47 +0000 |
| commit | 58ccf8e6b65b3911426d08d28997089ce8d611a1 (patch) | |
| tree | 8567f42416f5e4bea628cdc9d5acb46abe8bedcd /ui | |
| parent | 010f5bba636a81db2c0a4ab5a500c7f23e689fde (diff) | |
endpoint dialog: fix compilation when we don't HAVE_GEOIP.
Also fix some indentation and white space.
Remove a break-after-return.
Bug: 12562
Change-Id: I912ccdac62aceaabcffec8f7739da56cc6036abf
Reviewed-on: https://code.wireshark.org/review/16159
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/endpoint_dialog.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ui/qt/endpoint_dialog.cpp b/ui/qt/endpoint_dialog.cpp index 2610e01a3a..3bcba47124 100644 --- a/ui/qt/endpoint_dialog.cpp +++ b/ui/qt/endpoint_dialog.cpp @@ -265,7 +265,11 @@ public: // Column text raw representation. // Return a string, qulonglong, double, or invalid QVariant representing the raw column data. +#ifdef HAVE_GEOIP QVariant colData(int col, bool resolve_names, bool strings_only) const { +#else + QVariant colData(int col, bool resolve_names, bool strings_only _U_) const { +#endif hostlist_talker_t *endp_item = &g_array_index(conv_array_, hostlist_talker_t, conv_idx_); if (!endp_item) { @@ -274,12 +278,12 @@ public: switch (col) { case ENDP_COLUMN_ADDR: - { + { char* addr_str = get_conversation_address(NULL, &endp_item->myaddress, resolve_names); QString q_addr_str(addr_str); wmem_free(NULL, addr_str); return q_addr_str; - } + } case ENDP_COLUMN_PORT: if (resolve_names) { char* port_str = get_conversation_port(NULL, endp_item->port, endp_item->ptype, resolve_names); @@ -340,7 +344,6 @@ public: } return geoip_str; - break; } #else default: @@ -348,6 +351,7 @@ public: #endif } } + virtual QVariant colData(int col, bool resolve_names) const { return colData(col, resolve_names, false); } bool operator< (const QTreeWidgetItem &other) const |