clang-tidy: readability-inconsistent-declaration-parameter-name

- Fix warnings identified by this flag
- Remove the exclude from .clang-tidy file

diff --git a/.clang-tidy b/.clang-tidy
index 94f0a7b..86e0bf0 100644 (file)
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -49,7 +49,6 @@ Checks: >
   -readability-function-cognitive-complexity,
   -readability-identifier-length,
   -readability-implicit-bool-conversion,
-  -readability-inconsistent-declaration-parameter-name,
   -readability-isolate-declaration,
   -readability-magic-numbers,
   -readability-misleading-indentation,

diff --git a/src/misc.h b/src/misc.h
index 6b8bc64..c75d76d 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -40,9 +40,9 @@ void gq_gtk_grid_attach_default(GtkGrid *grid, GtkWidget *child, guint left_atta
 void gq_gtk_grid_attach(GtkGrid *grid, GtkWidget *child, guint left_attach, guint right_attach, guint top_attach, guint bottom_attach, GtkAttachOptions, GtkAttachOptions, guint, guint);
 
 #ifdef HAVE_GTK4
-void convert_gdkcolor_to_gdkrgba(gpointer gdk_color, GdkRGBA *gdk_rgba);
+void convert_gdkcolor_to_gdkrgba(gpointer data, GdkRGBA *gdk_rgba);
 #else
-void convert_gdkcolor_to_gdkrgba(gpointer gdk_color, GdkRGBA *gdk_rgba);
+void convert_gdkcolor_to_gdkrgba(gpointer data, GdkRGBA *gdk_rgba);
 #endif
 
 gchar *open_archive(FileData *fd);

diff --git a/src/ui-utildlg.h b/src/ui-utildlg.h
index f6588cc..d6f6562 100644 (file)
--- a/src/ui-utildlg.h
+++ b/src/ui-utildlg.h
@@ -72,7 +72,7 @@ GtkWidget *generic_dialog_add_button(GenericDialog *gd, const gchar *icon_name,
                                     void (*func_cb)(GenericDialog *, gpointer), gboolean is_default);
 void generic_dialog_attach_default(GenericDialog *gd, GtkWidget *widget);
 
-GtkWidget *generic_dialog_add_message(GenericDialog *gd, const gchar *icon_stock_id,
+GtkWidget *generic_dialog_add_message(GenericDialog *gd, const gchar *icon_name,
                                      const gchar *heading, const gchar *text, gboolean expand);
 
 gboolean generic_dialog_get_alternative_button_order(GtkWidget *widget);