summaryrefslogtreecommitdiff
path: root/ui/qt/qt_ui_utils.h
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-02-12 15:35:59 -0800
committerGerald Combs <gerald@wireshark.org>2015-02-13 02:31:16 +0000
commit6e88978fd98cf0dd032245c1b68b5a12cd94e405 (patch)
treed4816d481f84aaf50f727395215c1ce11baa365f /ui/qt/qt_ui_utils.h
parenta5652c7257835db3f6fce01926d53b236be53405 (diff)
downloadwireshark-6e88978fd98cf0dd032245c1b68b5a12cd94e405.tar.gz
Qt: More #include → forward declarations.
Change-Id: Ib6de71f801cd3053374b6c867370acd594dcd396 Reviewed-on: https://code.wireshark.org/review/7089 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/qt_ui_utils.h')
-rw-r--r--ui/qt/qt_ui_utils.h31
1 files changed, 14 insertions, 17 deletions
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 <stdio.h>
-
#include "config.h"
#include <glib.h>
-#include <epan/timestamp.h>
-#include <epan/value_string.h>
-#include <QFont>
#include <QString>
+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().