From 95dee44a77c8779776ce602b09fb33c703c4a32e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Tue, 5 Jan 2016 12:06:36 +0000 Subject: const gpointer -> gconstpointer 'const gpointer' is the same as 'void *const'. Replace with gconstpointer where straightforward (assuming that was the intent) and use gpointer everywhere else for clarity (that does not change *API* constness contract; it just means a variable is not declared immutable inside the called funtion). Change-Id: Iad2ef13205bfb4ff0056b2bce056353b58942267 Reviewed-on: https://code.wireshark.org/review/13945 Petri-Dish: Anders Broman Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- ui/decode_as_utils.c | 2 +- ui/gtk/dfilter_expr_dlg.c | 8 ++++---- ui/gtk/gui_utils.c | 6 +++--- ui/gtk/gui_utils.h | 6 +++--- ui/gtk/progress_dlg.c | 4 ++-- ui/progress_dlg.h | 5 ++--- ui/qt/progress_frame.cpp | 5 +++-- 7 files changed, 18 insertions(+), 18 deletions(-) (limited to 'ui') diff --git a/ui/decode_as_utils.c b/ui/decode_as_utils.c index d905a76547..0d9788b36f 100644 --- a/ui/decode_as_utils.c +++ b/ui/decode_as_utils.c @@ -183,7 +183,7 @@ load_decode_as_entries(void) void decode_build_reset_list (const gchar *table_name, ftenum_t selector_type, - const gpointer key, gpointer value _U_, + gpointer key, gpointer value _U_, gpointer user_data _U_) { dissector_delete_item_t *item; diff --git a/ui/gtk/dfilter_expr_dlg.c b/ui/gtk/dfilter_expr_dlg.c index bf813f1a2a..713a4b1391 100644 --- a/ui/gtk/dfilter_expr_dlg.c +++ b/ui/gtk/dfilter_expr_dlg.c @@ -75,7 +75,7 @@ static void build_enum_values(GtkWidget *value_list_scrolled_win, GtkWidget *value_list, const value_string *values); static void add_value_list_item(GtkWidget *value_list, const gchar *string, - const gpointer data); + gconstpointer data); static void display_value_fields(header_field_info *hfinfo, gboolean is_comparison, GtkWidget *value_label, GtkWidget *value_entry, @@ -346,7 +346,7 @@ build_boolean_values(GtkWidget *value_list_scrolled_win, GtkWidget *value_list, */ if (values == NULL) values = &tfs_true_false; - add_value_list_item(value_list, values->true_string, (gpointer) values); + add_value_list_item(value_list, values->true_string, values); add_value_list_item(value_list, values->false_string, NULL); /* @@ -387,7 +387,7 @@ build_enum_values(GtkWidget *value_list_scrolled_win _U_, GtkWidget *value_list, * Build the list. */ while (values->strptr != NULL) { - add_value_list_item(value_list, values->strptr, (const gpointer) values); + add_value_list_item(value_list, values->strptr, values); values++; } @@ -398,7 +398,7 @@ build_enum_values(GtkWidget *value_list_scrolled_win _U_, GtkWidget *value_list, } static void -add_value_list_item(GtkWidget *value_list, const gchar *string, const gpointer data) +add_value_list_item(GtkWidget *value_list, const gchar *string, gconstpointer data) { GtkListStore *store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(value_list))); GtkTreeIter iter; diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c index 66127274b0..5ff81a280f 100644 --- a/ui/gtk/gui_utils.c +++ b/ui/gtk/gui_utils.c @@ -1601,8 +1601,8 @@ GtkTreeIter ws_combo_box_append_text_and_pointer_full(GtkComboBox *combo_box, GtkTreeIter *parent_iter, const gchar *text, - const gpointer ptr, - const gboolean sensitive) + gconstpointer ptr, + gboolean sensitive) { GtkTreeIter iter; GtkTreeStore *store; @@ -1629,7 +1629,7 @@ ws_combo_box_append_text_and_pointer_full(GtkComboBox *combo_box, GtkTreeIter ws_combo_box_append_text_and_pointer(GtkComboBox *combo_box, const gchar *text, - const gpointer ptr) + gconstpointer ptr) { return ws_combo_box_append_text_and_pointer_full(combo_box, NULL, text, ptr, TRUE); } diff --git a/ui/gtk/gui_utils.h b/ui/gtk/gui_utils.h index e982752841..0409667411 100644 --- a/ui/gtk/gui_utils.h +++ b/ui/gtk/gui_utils.h @@ -474,8 +474,8 @@ GtkTreeIter ws_combo_box_append_text_and_pointer_full(GtkComboBox *combo_box, GtkTreeIter *parent_iter, const gchar *text, - const gpointer ptr, - const gboolean sensitive); + gconstpointer ptr, + gboolean sensitive); /** * ws_combo_box_append_text_and_pointer: @@ -491,7 +491,7 @@ ws_combo_box_append_text_and_pointer_full(GtkComboBox *combo_box, GtkTreeIter ws_combo_box_append_text_and_pointer(GtkComboBox *combo_box, const gchar *text, - const gpointer ptr); + gconstpointer ptr); /** * ws_combo_box_get_active_pointer: diff --git a/ui/gtk/progress_dlg.c b/ui/gtk/progress_dlg.c index 670662b91f..3e65547345 100644 --- a/ui/gtk/progress_dlg.c +++ b/ui/gtk/progress_dlg.c @@ -78,7 +78,7 @@ struct progdlg { * be read. */ progdlg_t * -create_progress_dlg(const gpointer top_level_window _U_, const gchar *task_title, const gchar *item_title, +create_progress_dlg(gpointer top_level_window _U_, const gchar *task_title, const gchar *item_title, gboolean terminate_is_stop, gboolean *stop_flag) { progdlg_t *dlg; @@ -226,7 +226,7 @@ create_progress_dlg(const gpointer top_level_window _U_, const gchar *task_title } progdlg_t * -delayed_create_progress_dlg(const gpointer top_level_window, const gchar *task_title, +delayed_create_progress_dlg(gpointer top_level_window, const gchar *task_title, const gchar *item_title, gboolean terminate_is_stop, gboolean *stop_flag, const GTimeVal *start_time, gfloat progress) { diff --git a/ui/progress_dlg.h b/ui/progress_dlg.h index 032fa7b51c..531784679e 100644 --- a/ui/progress_dlg.h +++ b/ui/progress_dlg.h @@ -55,7 +55,7 @@ typedef struct progdlg progdlg_t; * set to TRUE if the user hits that button * @return The newly created progress dialog */ -progdlg_t *create_progress_dlg(const gpointer top_level_window, const gchar *task_title, const gchar *item_title, +progdlg_t *create_progress_dlg(gpointer top_level_window, const gchar *task_title, const gchar *item_title, gboolean terminate_is_stop, gboolean *stop_flag); /** @@ -76,8 +76,7 @@ progdlg_t *create_progress_dlg(const gpointer top_level_window, const gchar *tas * @param progress The current progress (0..1) * @return The newly created progress dialog */ -progdlg_t * -delayed_create_progress_dlg(const gpointer top_level_window, const gchar *task_title, const gchar *item_title, +progdlg_t *delayed_create_progress_dlg(gpointer top_level_window, const gchar *task_title, const gchar *item_title, gboolean terminate_is_stop, gboolean *stop_flag, const GTimeVal *start_time, gfloat progress); diff --git a/ui/qt/progress_frame.cpp b/ui/qt/progress_frame.cpp index 1957e7beb7..d7cf65c3a1 100644 --- a/ui/qt/progress_frame.cpp +++ b/ui/qt/progress_frame.cpp @@ -40,7 +40,8 @@ // - Start adding the progress bar to dialogs. // - Don't complain so loudly when the user stops a capture. -progdlg_t *create_progress_dlg(const gpointer top_level_window, const gchar *, const gchar *, +progdlg_t * +create_progress_dlg(gpointer top_level_window, const gchar *, const gchar *, gboolean terminate_is_stop, gboolean *stop_flag) { ProgressFrame *pf; QWidget *main_window; @@ -64,7 +65,7 @@ progdlg_t *create_progress_dlg(const gpointer top_level_window, const gchar *, c } progdlg_t * -delayed_create_progress_dlg(const gpointer top_level_window, const gchar *task_title, const gchar *item_title, +delayed_create_progress_dlg(gpointer top_level_window, const gchar *task_title, const gchar *item_title, gboolean terminate_is_stop, gboolean *stop_flag, const GTimeVal *, gfloat progress) { -- cgit v1.2.1