clang-tidy: fix readability stuff

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/src/advanced-exif.h b/src/advanced-exif.h
index 9aaeff9..97cf948 100644 (file)
--- a/src/advanced-exif.h
+++ b/src/advanced-exif.h
@@ -25,7 +25,7 @@
 
 GtkWidget *advanced_exif_new(LayoutWindow *lw);
 
-void advanced_exif_set_fd(GtkWidget *bar, FileData *fd);
+void advanced_exif_set_fd(GtkWidget *window, FileData *fd);
 
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */

diff --git a/src/bar-gps.cc b/src/bar-gps.cc
index 8acf41e..0b247f4 100644 (file)
--- a/src/bar-gps.cc
+++ b/src/bar-gps.cc
@@ -240,8 +240,6 @@ static void bar_pane_gps_close_save_cb(GenericDialog *UNUSED(gd), gpointer data)
                        }
                g_free(location);
                }
-
-       return;
 }
 
 static void bar_pane_gps_dnd_init(gpointer data)

diff --git a/src/bar-gps.h b/src/bar-gps.h
index e96a76d..6938d6f 100644 (file)
--- a/src/bar-gps.h
+++ b/src/bar-gps.h
@@ -22,8 +22,8 @@
 #ifndef BAR_GPS_H
 #define BAR_GPS_H
 
-GtkWidget *bar_pane_gps_new(const gchar *id, const gchar *title, const gchar *map_source, const gint zoom,
-                       const gdouble latitude, const gdouble longitude, gboolean expanded, gint height);
+GtkWidget *bar_pane_gps_new(const gchar *id, const gchar *title, const gchar *map_id, gint zoom,
+                       gdouble latitude, gdouble longitude, gboolean expanded, gint height);
 GtkWidget *bar_pane_gps_new_from_config(const gchar **attribute_names, const gchar **attribute_values);
 void bar_pane_gps_update_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values);
 

diff --git a/src/bar-keywords.cc b/src/bar-keywords.cc
index 2fed208..d5bb7d8 100644 (file)
--- a/src/bar-keywords.cc
+++ b/src/bar-keywords.cc
@@ -419,8 +419,6 @@ void bar_pane_keywords_filter_modify(GtkTreeModel *model, GtkTreeIter *iter, GVa
                        gtk_tree_model_get_value(keyword_tree, &child_iter, KEYWORD_COLUMN_IS_KEYWORD, value);
                        break;
                }
-       return;
-
 }
 
 gboolean bar_pane_keywords_filter_visible(GtkTreeModel *keyword_tree, GtkTreeIter *iter, gpointer data)

diff --git a/src/cellrenderericon.cc b/src/cellrenderericon.cc
index 2b05ea0..2585cfd 100644 (file)
--- a/src/cellrenderericon.cc
+++ b/src/cellrenderericon.cc
@@ -32,13 +32,13 @@ static void gqv_cell_renderer_icon_set_property(GObject             *object,
                                                const GValue    *value,
                                                GParamSpec      *pspec);
 static void gqv_cell_renderer_icon_init_wrapper(void *, void *);
-static void gqv_cell_renderer_icon_init(GQvCellRendererIcon *celltext);
+static void gqv_cell_renderer_icon_init(GQvCellRendererIcon *cellicon);
 static void gqv_cell_renderer_icon_class_init_wrapper(void *, void *);
 static void gqv_cell_renderer_icon_class_init(GQvCellRendererIconClass *icon_class);
 static void gqv_cell_renderer_icon_finalize(GObject *object);
 static void gqv_cell_renderer_icon_get_size(GtkCellRenderer    *cell,
                                            GtkWidget          *widget,
-                                           const GdkRectangle *rectangle,
+                                           const GdkRectangle *cell_area,
                                            gint               *x_offset,
                                            gint               *y_offset,
                                            gint               *width,

diff --git a/src/collect-table.h b/src/collect-table.h
index 15b3317..17b23e5 100644 (file)
--- a/src/collect-table.h
+++ b/src/collect-table.h
@@ -29,7 +29,7 @@ void collection_table_unselect_all(CollectTable *ct);
 
 void collection_table_add_filelist(CollectTable *ct, GList *list);
 
-void collection_table_file_update(CollectTable *ct, CollectInfo *ci);
+void collection_table_file_update(CollectTable *ct, CollectInfo *info);
 void collection_table_file_add(CollectTable *ct, CollectInfo *ci);
 void collection_table_file_insert(CollectTable *ct, CollectInfo *ci);
 void collection_table_file_remove(CollectTable *ct, CollectInfo *ci);

diff --git a/src/exif.h b/src/exif.h
index 2f74028..fcc7d8f 100644 (file)
--- a/src/exif.h
+++ b/src/exif.h
@@ -112,7 +112,7 @@ void exif_free_fd(FileData *fd, ExifData *exif);
  * this function gives access to the original data from the image.
  * original data are part of the processed data and should not be freed separately
  */
-ExifData *exif_get_original(ExifData *processed);
+ExifData *exif_get_original(ExifData *exif);
 
 
 gboolean exif_write(ExifData *exif);

diff --git a/src/filedata.h b/src/filedata.h
index 4c12dae..08712f3 100644 (file)
--- a/src/filedata.h
+++ b/src/filedata.h
@@ -175,7 +175,7 @@ gboolean file_data_unregister_real_time_monitor(FileData *fd);
 void read_exif_time_data(FileData *file);
 void read_exif_time_digitized_data(FileData *file);
 
-gboolean marks_list_save(gchar *path, gboolean clear);
+gboolean marks_list_save(gchar *path, gboolean save);
 gboolean marks_list_load(const gchar *path);
 void marks_clear_all();
 void read_rating_data(FileData *file);

diff --git a/src/image-load.h b/src/image-load.h
index 02dbdc6..0c976af 100644 (file)
--- a/src/image-load.h
+++ b/src/image-load.h
@@ -141,7 +141,7 @@ void image_loader_delay_area_ready(ImageLoader *il, gboolean enable);
  */
 void image_loader_set_requested_size(ImageLoader *il, gint width, gint height);
 
-void image_loader_set_buffer_size(ImageLoader *il, guint size);
+void image_loader_set_buffer_size(ImageLoader *il, guint count);
 
 /**
  * @headerfile image_loader_set_priority

diff --git a/src/layout.cc b/src/layout.cc
index d2f3685..c4492b0 100644 (file)
--- a/src/layout.cc
+++ b/src/layout.cc
@@ -2424,7 +2424,6 @@ void layout_sync_options_with_current_state(LayoutWindow *lw)
                        }
                }
 #endif
-       return;
 }
 
 void layout_apply_options(LayoutWindow *lw, LayoutOptions *lop)

diff --git a/src/preferences.cc b/src/preferences.cc
index 6259118..ac28876 100644 (file)
--- a/src/preferences.cc
+++ b/src/preferences.cc
@@ -4214,8 +4214,6 @@ void show_about_window(LayoutWindow *lw)
        g_object_unref(data_stream);
        g_object_unref(in_stream_authors);
        g_object_unref(in_stream_translators);
-
-       return;
 }
 
 static void image_overlay_set_text_colours()

diff --git a/src/print.cc b/src/print.cc
index 94c1483..f271369 100644 (file)
--- a/src/print.cc
+++ b/src/print.cc
@@ -748,8 +748,6 @@ static void draw_page(GtkPrintOperation *UNUSED(operation), GtkPrintContext *con
                }
 
        if (rotated) g_object_unref(rotated);
-
-       return;
 }
 
 static void begin_print(GtkPrintOperation *operation,

diff --git a/src/thumb-standard.h b/src/thumb-standard.h
index 07e8038..9fd8fed 100644 (file)
--- a/src/thumb-standard.h
+++ b/src/thumb-standard.h
@@ -93,7 +93,7 @@ void thumb_loader_std_calibrate_pixbuf(FileData *fd, GdkPixbuf *pixbuf);
  * calling func_valid with the information when app is idle
  * for thumbnail's without a file: uri, validates against allowed_age in days
  */
-ThumbLoaderStd *thumb_loader_std_thumb_file_validate(const gchar *thumb_path, gint allowed_age,
+ThumbLoaderStd *thumb_loader_std_thumb_file_validate(const gchar *thumb_path, gint allowed_days,
                                                     void (*func_valid)(const gchar *path, gboolean valid, gpointer data),
                                                     gpointer data);
 void thumb_loader_std_thumb_file_validate_cancel(ThumbLoaderStd *tl);

diff --git a/src/ui-utildlg.h b/src/ui-utildlg.h
index b9cf811..eef4c4e 100644 (file)
--- a/src/ui-utildlg.h
+++ b/src/ui-utildlg.h
@@ -101,7 +101,7 @@ void file_dialog_add_path_widgets(FileDialog *fd, const gchar *default_path, con
 void file_dialog_clear_filter(FileDialog *fd);
 void file_dialog_sync_history(FileDialog *fd, gboolean dir_only);
 
-void generic_dialog_windows_load_config(const gchar **window_attributes, const gchar **attribute_values);
+void generic_dialog_windows_load_config(const gchar **attribute_names, const gchar **attribute_values);
 void generic_dialog_windows_write_config(GString *outstr, gint indent);
 
 void appimage_notification();

diff --git a/src/utilops.cc b/src/utilops.cc
index d903712..e972842 100644 (file)
--- a/src/utilops.cc
+++ b/src/utilops.cc
@@ -1196,8 +1196,6 @@ static void file_util_fdlg_ok_cb(FileDialog *fdlg, gpointer data)
        ud->phase = UTILITY_PHASE_ENTERING;
 
        file_util_dialog_run(ud);
-
-       return;
 }
 
 static void file_util_dest_folder_entry_cb(GtkWidget *UNUSED(entry), gpointer data)

diff --git a/src/view-file/view-file-icon.cc b/src/view-file/view-file-icon.cc
index 609552b..c874cd6 100644 (file)
--- a/src/view-file/view-file-icon.cc
+++ b/src/view-file/view-file-icon.cc
@@ -52,7 +52,7 @@ enum {
 };
 
 static void vficon_toggle_filenames(ViewFile *vf);
-static void vficon_selection_remove(ViewFile *vf, FileData *id, SelectionType mask, GtkTreeIter *iter);
+static void vficon_selection_remove(ViewFile *vf, FileData *fd, SelectionType mask, GtkTreeIter *iter);
 static void vficon_move_focus(ViewFile *vf, gint row, gint col, gboolean relative);
 static void vficon_set_focus(ViewFile *vf, FileData *fd);
 static void vficon_populate_at_new_size(ViewFile *vf, gint w, gint h, gboolean force);

diff --git a/src/view-file/view-file.cc b/src/view-file/view-file.cc
index 3dbd9aa..328509c 100644 (file)
--- a/src/view-file/view-file.cc
+++ b/src/view-file/view-file.cc
@@ -1838,8 +1838,6 @@ void vf_read_metadata_in_idle(ViewFile *vf)
                {
                vf->read_metadata_in_idle_id = g_idle_add_full(G_PRIORITY_LOW, vf_read_metadata_in_idle_cb, vf, vf_read_metadata_in_idle_finished_cb);
                }
-
-       return;
 }
 
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */