Remove UNUSED macro

[geeqie.git] / src / utilops.cc

diff --git a/src/utilops.cc b/src/utilops.cc
index d903712..6ac21ba 100644 (file)
--- a/src/utilops.cc
+++ b/src/utilops.cc
@@ -201,7 +201,7 @@ FileDialog *file_util_file_dlg(const gchar *title,
  * because it does not have a mouse center option,
  * and we must center it before show, implement it here.
  */
-static void file_util_warning_dialog_ok_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
+static void file_util_warning_dialog_ok_cb(GenericDialog *, gpointer)
 {
        /* no op */
 }
@@ -548,7 +548,7 @@ static gint file_util_perform_ci_cb(gpointer resume_data, EditorFlags flags, GLi
 /* call file_util_perform_ci_internal or start_editor_from_filelist_full */
 
 
-static void file_util_resume_cb(GenericDialog *UNUSED(gd), gpointer data)
+static void file_util_resume_cb(GenericDialog *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
        if (ud->external)
@@ -557,7 +557,7 @@ static void file_util_resume_cb(GenericDialog *UNUSED(gd), gpointer data)
                file_util_perform_ci_internal(ud);
 }
 
-static void file_util_abort_cb(GenericDialog *UNUSED(gd), gpointer data)
+static void file_util_abort_cb(GenericDialog *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
        if (ud->external)
@@ -855,7 +855,7 @@ static void file_util_perform_ci_dir(UtilityData *ud, gboolean internal, gboolea
        file_util_dialog_run(ud);
 }
 
-static gint file_util_perform_ci_dir_cb(gpointer UNUSED(resume_data), EditorFlags flags, GList *UNUSED(list), gpointer data)
+static gint file_util_perform_ci_dir_cb(gpointer, EditorFlags flags, GList *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
        file_util_perform_ci_dir(ud, FALSE, !EDITOR_ERRORS_BUT_SKIPPED(flags));
@@ -979,14 +979,14 @@ static GdkPixbuf *file_util_get_error_icon(FileData *fd, GList *list, GtkWidget
                }
 }
 
-static void file_util_check_resume_cb(GenericDialog *UNUSED(gd), gpointer data)
+static void file_util_check_resume_cb(GenericDialog *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
        ud->phase = UTILITY_PHASE_CHECKED;
        file_util_dialog_run(ud);
 }
 
-static void file_util_check_abort_cb(GenericDialog *UNUSED(gd), gpointer data)
+static void file_util_check_abort_cb(GenericDialog *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
        ud->phase = UTILITY_PHASE_START;
@@ -1196,11 +1196,9 @@ 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)
+static void file_util_dest_folder_entry_cb(GtkWidget *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
        file_util_dest_folder_update_path(ud);
@@ -1421,13 +1419,13 @@ static void file_util_rename_preview_update(UtilityData *ud)
 
 }
 
-static void file_util_rename_preview_entry_cb(GtkWidget *UNUSED(entry), gpointer data)
+static void file_util_rename_preview_entry_cb(GtkWidget *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
        file_util_rename_preview_update(ud);
 }
 
-static void file_util_rename_preview_adj_cb(GtkWidget *UNUSED(spin), gpointer data)
+static void file_util_rename_preview_adj_cb(GtkWidget *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
        file_util_rename_preview_update(ud);
@@ -1443,8 +1441,7 @@ static gboolean file_util_rename_idle_cb(gpointer data)
        return G_SOURCE_REMOVE;
 }
 
-static void file_util_rename_preview_order_cb(GtkTreeModel *UNUSED(treemodel), GtkTreePath *UNUSED(tpath),
-                                             GtkTreeIter *UNUSED(iter), gpointer data)
+static void file_util_rename_preview_order_cb(GtkTreeModel *, GtkTreePath *, GtkTreeIter *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
 
@@ -1454,7 +1451,7 @@ static void file_util_rename_preview_order_cb(GtkTreeModel *UNUSED(treemodel), G
 }
 
 
-static gboolean file_util_preview_cb(GtkTreeSelection *UNUSED(selection), GtkTreeModel *store,
+static gboolean file_util_preview_cb(GtkTreeSelection *, GtkTreeModel *store,
                                     GtkTreePath *tpath, gboolean path_currently_selected,
                                     gpointer data)
 {
@@ -1501,7 +1498,7 @@ static void box_append_safe_delete_status(GenericDialog *gd)
        gtk_widget_set_sensitive(label, FALSE);
 }
 
-static void file_util_details_cb(GenericDialog *UNUSED(gd), gpointer data)
+static void file_util_details_cb(GenericDialog *, gpointer data)
 {
        auto ud = static_cast<UtilityData *>(data);
        if (ud->details_func && ud->sel_fd)
@@ -1683,10 +1680,6 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i
        gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_SINGLE);
        gtk_tree_selection_set_select_function(selection, file_util_preview_cb, ud, nullptr);
 
-
-//     column = file_util_rename_multiple_add_column(rd, _("Preview"), RENAME_COLUMN_PREVIEW);
-//     gtk_tree_view_column_set_visible(column, FALSE);
-
        gtk_tree_view_set_reorderable(GTK_TREE_VIEW(ud->listview), TRUE);
 
        store = gtk_tree_view_get_model(GTK_TREE_VIEW(ud->listview));
@@ -1703,7 +1696,6 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i
                generic_dialog_add_image(ud->gd, box, nullptr, nullptr, FALSE, nullptr, nullptr, FALSE);
                }
 
-//     gtk_container_add(GTK_CONTAINER(scrolled), view);
        gtk_widget_show(ud->gd->dialog);
 
 
@@ -1787,8 +1779,6 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i
                                        0.0, 1000000.0, 1.0, 0, options->cp_mv_rn.formatted_start,
                                        G_CALLBACK(file_util_rename_preview_adj_cb), ud);
 
-//     gtk_combo_box_set_active(GTK_COMBO_BOX(ud->combo_type), 0); /* callback will take care of the rest */
-
        file_util_dialog_list_select(ud->listview, 0);
 }
 
@@ -1928,7 +1918,7 @@ static void file_util_warn_op_in_progress(const gchar *title)
        file_util_warning_dialog(title, _("Another operation in progress.\n"), GTK_STOCK_DIALOG_ERROR, nullptr);
 }
 
-static void file_util_details_dialog_close_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void file_util_details_dialog_close_cb(GtkWidget *, gpointer data)
 {
        gtk_widget_destroy(GTK_WIDGET(data));
 
@@ -1941,7 +1931,7 @@ static void file_util_details_dialog_destroy_cb(GtkWidget *widget, gpointer data
 }
 
 
-static void file_util_details_dialog_ok_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
+static void file_util_details_dialog_ok_cb(GenericDialog *, gpointer)
 {
        /* no op */
 }
@@ -2875,8 +2865,6 @@ static void file_util_rename_dir_full(FileData *fd, const gchar *new_path, GtkWi
                return;
                }
 
-//     ud->flist = filelist_recursive(fd);
-
        file_util_dialog_run(ud);
 }
 
@@ -2950,7 +2938,7 @@ static gboolean file_util_write_metadata_first_after_done(gpointer data)
        return G_SOURCE_REMOVE;
 }
 
-static void file_util_write_metadata_first_done(gboolean success, const gchar *UNUSED(done_path), gpointer data)
+static void file_util_write_metadata_first_done(gboolean success, const gchar *, gpointer data)
 {
        auto dd = static_cast<UtilityDelayData *>(data);
 
@@ -3074,10 +3062,13 @@ void file_util_start_editor_from_filelist(const gchar *key, GList *list, const g
        file_util_start_editor_full(key, nullptr, list, nullptr, working_directory, parent, UTILITY_PHASE_ENTERING);
 }
 
-//void file_util_start_filter_from_file(const gchar *key, FileData *fd, const gchar *dest_path, GtkWidget *parent)
-//{
-       //file_util_start_editor_full(key, fd, NULL, dest_path, NULL, parent, UTILITY_PHASE_ENTERING);
-//}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+void file_util_start_filter_from_file_unused(const gchar *key, FileData *fd, const gchar *dest_path, GtkWidget *parent)
+{
+       file_util_start_editor_full(key, fd, NULL, dest_path, NULL, parent, UTILITY_PHASE_ENTERING);
+}
+#pragma GCC diagnostic pop
 
 void file_util_start_filter_from_filelist(const gchar *key, GList *list, const gchar *dest_path, GtkWidget *parent)
 {
@@ -3172,11 +3163,11 @@ static void clipboard_get_func(GtkClipboard *clipboard, GtkSelectionData *select
  *
  *
  */
-static void clipboard_clear_func(GtkClipboard *UNUSED(clipboard), gpointer data)
+static void clipboard_clear_func(GtkClipboard *, gpointer data)
 {
        auto cbd = static_cast<ClipboardData *>(data);
 
-       string_list_free(cbd->path_list);
+       g_list_free_full(cbd->path_list, g_free);
        g_free(cbd);
 }
 
@@ -3264,7 +3255,7 @@ void file_util_copy_path_list_to_clipboard(GList *fd_list, gboolean quoted)
        filelist_free(fd_list);
 }
 
-static void new_folder_entry_activate_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void new_folder_entry_activate_cb(GtkWidget *, gpointer data)
 {
        auto dialog = static_cast<GtkDialog *>(data);