aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2012-08-14 16:01:47 +0000
committerGerald Combs <gerald@wireshark.org>2012-08-14 16:01:47 +0000
commit6f55c038520b5ba861973467319b5b143e708d8d (patch)
tree0cb76f4aa9cdbd3bb5a9ef772d4ddf28f7c7accd /ui
parentf929edfe096568cb5a47a5c1c1cb1d80f38540e4 (diff)
Fix compilation warnings.
svn path=/trunk/; revision=44489
Diffstat (limited to 'ui')
-rw-r--r--ui/qt/capture_info_dialog.cpp4
-rw-r--r--ui/qt/color_dialog.cpp2
-rw-r--r--ui/qt/main.cpp33
-rw-r--r--ui/qt/main_welcome.cpp2
-rw-r--r--ui/win32/file_dlg_win32.c2
5 files changed, 27 insertions, 16 deletions
diff --git a/ui/qt/capture_info_dialog.cpp b/ui/qt/capture_info_dialog.cpp
index 5db26080f5..850284913d 100644
--- a/ui/qt/capture_info_dialog.cpp
+++ b/ui/qt/capture_info_dialog.cpp
@@ -38,6 +38,8 @@ void capture_info_ui_create(
capture_info *cinfo,
capture_options *capture_opts)
{
+ Q_UNUSED(cinfo);
+ Q_UNUSED(capture_opts);
g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: capture_info_ui_create");
}
@@ -47,6 +49,7 @@ capture_options *capture_opts)
void capture_info_ui_update(
capture_info *cinfo)
{
+ Q_UNUSED(cinfo);
g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: capture_info_ui_update");
}
@@ -54,6 +57,7 @@ capture_info *cinfo)
void capture_info_ui_destroy(
capture_info *cinfo)
{
+ Q_UNUSED(cinfo);
g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: capture_info_ui_destroy");
}
diff --git a/ui/qt/color_dialog.cpp b/ui/qt/color_dialog.cpp
index 4e592fc2cc..5d0664697c 100644
--- a/ui/qt/color_dialog.cpp
+++ b/ui/qt/color_dialog.cpp
@@ -40,6 +40,8 @@
void
color_filter_add_cb(color_filter_t *colorf, gpointer user_data)
{
+ Q_UNUSED(colorf);
+ Q_UNUSED(user_data);
g_log(NULL, G_LOG_LEVEL_DEBUG, "FIX: color_filter_add_cb");
// GtkWidget *color_filters = user_data;
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp
index b97686e659..a1b92b40b0 100644
--- a/ui/qt/main.cpp
+++ b/ui/qt/main.cpp
@@ -154,6 +154,11 @@ extern capture_options global_capture_opts;
// Copied from ui/gtk/gui_utils.c
void pipe_input_set_handler(gint source, gpointer user_data, int *child_process, pipe_input_cb_t input_cb)
{
+ Q_UNUSED(source);
+ Q_UNUSED(user_data);
+ Q_UNUSED(child_process);
+ Q_UNUSED(input_cb);
+
// static pipe_input_t pipe_input;
// pipe_input.source = source;
@@ -619,12 +624,12 @@ int main(int argc, char *argv[])
MainWindow *w;
char *init_progfile_dir_error;
- char *s;
+// char *s;
int opt;
- gboolean arg_error = FALSE;
+// gboolean arg_error = FALSE;
- extern int info_update_freq; /* Found in about_dlg.c. */
- const gchar *filter;
+// extern int info_update_freq; /* Found in about_dlg.c. */
+// const gchar *filter;
#ifdef _WIN32
WSADATA wsaData;
@@ -635,8 +640,8 @@ int main(int argc, char *argv[])
char *gdp_path, *dp_path;
int err;
#ifdef HAVE_LIBPCAP
- gboolean start_capture = FALSE;
- gboolean list_link_layer_types = FALSE;
+// gboolean start_capture = FALSE;
+// gboolean list_link_layer_types = FALSE;
GList *if_list;
gchar *err_str;
#else
@@ -647,17 +652,17 @@ int main(int argc, char *argv[])
#endif
#endif
#endif
- gint pl_size = 280, tv_size = 95, bv_size = 75;
- gchar *rc_file, *cf_name = NULL, *rfilter = NULL, *jfilter = NULL;
- dfilter_t *rfcode = NULL;
- gboolean rfilter_parse_failed = FALSE;
+// gint pl_size = 280, tv_size = 95, bv_size = 75;
+// gchar *rc_file, *cf_name = NULL, *rfilter = NULL, *jfilter = NULL;
+// dfilter_t *rfcode = NULL;
+// gboolean rfilter_parse_failed = FALSE;
e_prefs *prefs_p;
- char badopt;
+// char badopt;
//GtkWidget *splash_win = NULL;
GLogLevelFlags log_flags;
- guint go_to_packet = 0;
- gboolean jump_backwards = FALSE;
- dfilter_t *jump_to_filter = NULL;
+// guint go_to_packet = 0;
+// gboolean jump_backwards = FALSE;
+// dfilter_t *jump_to_filter = NULL;
int optind_initial;
int status;
diff --git a/ui/qt/main_welcome.cpp b/ui/qt/main_welcome.cpp
index 88d4a46301..800aafc799 100644
--- a/ui/qt/main_welcome.cpp
+++ b/ui/qt/main_welcome.cpp
@@ -202,7 +202,7 @@ void MainWelcome::updateRecentFiles() {
rfRow++;
}
- while (m_recent_files.count() > prefs.gui_recent_files_count_max) {
+ while (m_recent_files.count() > (int) prefs.gui_recent_files_count_max) {
m_recent_files.takeItem(m_recent_files.count());
}
}
diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c
index 692d099a64..a86c8cba3e 100644
--- a/ui/win32/file_dlg_win32.c
+++ b/ui/win32/file_dlg_win32.c
@@ -1398,7 +1398,7 @@ preview_set_file_info(HWND of_hwnd, gchar *preview_file) {
double cur_time;
gboolean is_breaked = FALSE;
- for (i = EWFD_PT_FORMAT; i <= EWFD_PTX_ELAPSED; i++) {
+ for (i = EWFD_PTX_FORMAT; i <= EWFD_PTX_ELAPSED; i++) {
cur_ctrl = GetDlgItem(of_hwnd, i);
if (cur_ctrl) {
EnableWindow(cur_ctrl, FALSE);