From 6e88978fd98cf0dd032245c1b68b5a12cd94e405 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 12 Feb 2015 15:35:59 -0800 Subject: =?UTF-8?q?Qt:=20More=20#include=20=E2=86=92=20forward=20declarati?= =?UTF-8?q?ons.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib6de71f801cd3053374b6c867370acd594dcd396 Reviewed-on: https://code.wireshark.org/review/7089 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs --- ui/qt/qt_ui_utils.h | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'ui/qt/qt_ui_utils.h') diff --git a/ui/qt/qt_ui_utils.h b/ui/qt/qt_ui_utils.h index 6eb9f70919..85208aacc3 100644 --- a/ui/qt/qt_ui_utils.h +++ b/ui/qt/qt_ui_utils.h @@ -29,17 +29,14 @@ * Utility functions for working with the Wireshark and GLib APIs. */ -#include - #include "config.h" #include -#include -#include -#include #include +class QFont; + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -60,16 +57,16 @@ extern "C" { // CAPTURE_AUTH_PWD /**< User/password authentication */ //} capture_auth; -struct remote_host_t { - gchar *remote_host; /**< Host name or network address for remote capturing */ - gchar *remote_port; /**< TCP port of remote RPCAP server */ - gint auth_type; /**< Authentication type */ - gchar *auth_username; /**< Remote authentication parameters */ - gchar *auth_password; /**< Remote authentication parameters */ - gboolean datatx_udp; - gboolean nocap_rpcap; - gboolean nocap_local; -}; +//struct remote_host_t { +// gchar *remote_host; /**< Host name or network address for remote capturing */ +// gchar *remote_port; /**< TCP port of remote RPCAP server */ +// gint auth_type; /**< Authentication type */ +// gchar *auth_username; /**< Remote authentication parameters */ +// gchar *auth_password; /**< Remote authentication parameters */ +// gboolean datatx_udp; +// gboolean nocap_rpcap; +// gboolean nocap_local; +//}; struct _address; @@ -118,7 +115,7 @@ const QString address_to_display_qstring(const struct _address *address); * * @return A QString representation of the value_string. */ -const QString val_to_qstring(const guint32 val, const value_string *vs, const char *fmt) +const QString val_to_qstring(const guint32 val, const struct _value_string *vs, const char *fmt) G_GNUC_PRINTF(3, 0); /** Convert an value_string_ext to a QString using val_to_str_ext_wmem(). @@ -129,7 +126,7 @@ G_GNUC_PRINTF(3, 0); * * @return A QString representation of the value_string_ext. */ -const QString val_ext_to_qstring(const guint32 val, value_string_ext *vse, const char *fmt) +const QString val_ext_to_qstring(const guint32 val, struct _value_string_ext *vse, const char *fmt) G_GNUC_PRINTF(3, 0); /** Convert bits per second value human-readable QString using format_size(). -- cgit v1.2.1