Documentation: Use G_SOURCE_CONTINUE and G_SOURCE_REMOVE

[geeqie.git] / src / utilops.cc

diff --git a/src/utilops.cc b/src/utilops.cc
index 04355ed..27c2eec 100644 (file)
--- a/src/utilops.cc
+++ b/src/utilops.cc
@@ -41,8 +41,8 @@ static GdkPixbuf *file_util_get_error_icon(FileData *fd, GList *list, GtkWidget
 
 static GtkTargetEntry target_types[] =
 {
-       {(gchar *)"text/plain", 0, CLIPBOARD_TEXT_PLAIN},
-       {(gchar *)"text/uri-list", 0, CLIPBOARD_TEXT_URI_LIST},
+       {(gchar *)const_cast<gchar *>("text/plain"), 0, CLIPBOARD_TEXT_PLAIN},
+       {(gchar *)const_cast<gchar *>("text/uri-list"), 0, CLIPBOARD_TEXT_URI_LIST},
        {(gchar *)"x-special/gnome-copied-files", 0, CLIPBOARD_X_SPECIAL_GNOME_COPIED_FILES},
        {(gchar *)"UTF8_STRING", 0, CLIPBOARD_UTF8_STRING}
 };
@@ -278,11 +278,11 @@ enum {
 
 typedef struct _UtilityDataMessages UtilityDataMessages;
 struct _UtilityDataMessages {
-       gchar *title;
-       gchar *question;
-       gchar *desc_flist;
-       gchar *desc_source_fd;
-       gchar *fail;
+       const gchar *title;
+       const gchar *question;
+       const gchar *desc_flist;
+       const gchar *desc_source_fd;
+       const gchar *fail;
 };
 
 typedef struct _UtilityData UtilityData;
@@ -369,8 +369,8 @@ static void generic_dialog_image_set(UtilityData *ud, FileData *fd)
        FileData *fd2 = NULL;
        gchar *buf;
 
-       imd = g_object_get_data(G_OBJECT(ud->gd->dialog), "img_image");
-       label = g_object_get_data(G_OBJECT(ud->gd->dialog), "img_label");
+       imd = static_cast<ImageWindow *>(g_object_get_data(G_OBJECT(ud->gd->dialog), "img_image"));
+       label = static_cast<GtkWidget *>(g_object_get_data(G_OBJECT(ud->gd->dialog), "img_label"));
 
        if (!imd) return;
 
@@ -381,8 +381,8 @@ static void generic_dialog_image_set(UtilityData *ud, FileData *fd)
 
        if (ud->type == UTILITY_TYPE_RENAME || ud->type == UTILITY_TYPE_COPY || ud->type == UTILITY_TYPE_MOVE)
                {
-               imd = g_object_get_data(G_OBJECT(ud->gd->dialog), "img_image2");
-               label = g_object_get_data(G_OBJECT(ud->gd->dialog), "img_label2");
+               imd = static_cast<ImageWindow *>(g_object_get_data(G_OBJECT(ud->gd->dialog), "img_image2"));
+               label = static_cast<GtkWidget *>(g_object_get_data(G_OBJECT(ud->gd->dialog), "img_label2"));
 
                if (imd)
                        {
@@ -522,7 +522,7 @@ static GtkWidget *file_util_dialog_add_list(GtkWidget *box, GList *list, gboolea
 
        while (list)
                {
-               FileData *fd = list->data;
+               FileData *fd = static_cast<FileData *>(list->data);
                GtkTreeIter iter;
                gchar *sidecars;
 
@@ -590,7 +590,7 @@ static gint file_util_perform_ci_cb(gpointer resume_data, EditorFlags flags, GLi
                g_string_append(msg, "\n");
                while (list)
                        {
-                       FileData *fd = list->data;
+                       FileData *fd = static_cast<FileData *>(list->data);
 
                        g_string_append(msg, fd->path);
                        g_string_append(msg, "\n");
@@ -620,7 +620,7 @@ static gint file_util_perform_ci_cb(gpointer resume_data, EditorFlags flags, GLi
 
        while (list)  /* be careful, file_util_perform_ci_internal can pass ud->flist as list */
                {
-               FileData *fd = list->data;
+               FileData *fd = static_cast<FileData *>(list->data);
                list = list->next;
 
                if (!EDITOR_ERRORS(flags)) /* files were successfully deleted, call the maint functions */
@@ -673,7 +673,7 @@ static gboolean file_util_perform_ci_internal(gpointer data)
 
                /* this is removed when ud is destroyed */
                ud->perform_idle_id = g_idle_add(file_util_perform_ci_internal, ud);
-               return TRUE;
+               return G_SOURCE_CONTINUE;
                }
 
        g_assert(ud->flist);
@@ -687,23 +687,23 @@ static gboolean file_util_perform_ci_internal(gpointer data)
                gboolean last = !ud->flist->next;
                EditorFlags status = EDITOR_ERROR_STATUS;
 
-               if (ud->with_sidecars ? file_data_sc_perform_ci(single_entry->data)
-                                     : file_data_perform_ci(single_entry->data))
-                       status = 0; /* OK */
+               if (ud->with_sidecars ? file_data_sc_perform_ci(static_cast<FileData *>(single_entry->data))
+                                     : file_data_perform_ci(static_cast<FileData *>(single_entry->data)))
+                       status = static_cast<EditorFlags>(0); /* OK */
 
                ret = file_util_perform_ci_cb(GINT_TO_POINTER(!last), status, single_entry, ud);
                g_list_free(single_entry);
 
-               if (ret == EDITOR_CB_SUSPEND || last) return FALSE;
+               if (ret == EDITOR_CB_SUSPEND || last) return G_SOURCE_REMOVE;
 
                if (ret == EDITOR_CB_SKIP)
                        {
                        file_util_perform_ci_cb(NULL, EDITOR_ERROR_SKIPPED, ud->flist, ud);
-                       return FALSE;
+                       return G_SOURCE_REMOVE;
                        }
                }
 
-       return TRUE;
+       return G_SOURCE_CONTINUE;
 }
 
 static void file_util_perform_ci_dir(UtilityData *ud, gboolean internal, gboolean ext_result)
@@ -738,7 +738,7 @@ static void file_util_perform_ci_dir(UtilityData *ud, gboolean internal, gboolea
                                {
                                FileData *fd;
 
-                               fd = work->data;
+                               fd = static_cast<FileData *>(work->data);
                                work = work->next;
 
                                if (!fail)
@@ -814,7 +814,7 @@ static void file_util_perform_ci_dir(UtilityData *ud, gboolean internal, gboolea
                                {
                                FileData *fd;
 
-                               fd = work->data;
+                               fd = static_cast<FileData *>(work->data);
                                work = work->next;
 
                                if (!fail)
@@ -1446,7 +1446,7 @@ static gboolean file_util_rename_idle_cb(gpointer data)
        file_util_rename_preview_update(ud);
 
        ud->update_idle_id = 0;
-       return FALSE;
+       return G_SOURCE_REMOVE;
 }
 
 static void file_util_rename_preview_order_cb(GtkTreeModel *UNUSED(treemodel), GtkTreePath *UNUSED(tpath),
@@ -1731,7 +1731,7 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i
        pref_table_label(table, 0, 1, _("New name:"), 1.0);
 
        ud->rename_entry = gtk_entry_new();
-       gtk_table_attach(GTK_TABLE(table), ud->rename_entry, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+       gtk_table_attach(GTK_TABLE(table), ud->rename_entry, 1, 2, 1, 2, static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), static_cast<GtkAttachOptions>(0), 0, 0);
        generic_dialog_attach_default(GENERIC_DIALOG(ud->gd), ud->rename_entry);
        gtk_widget_grab_focus(ud->rename_entry);
 
@@ -1936,7 +1936,7 @@ static void file_util_warn_op_in_progress(const gchar *title)
 
 static void file_util_details_dialog_close_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       gtk_widget_destroy(data);
+       gtk_widget_destroy(GTK_WIDGET(data));
 
 }
 
@@ -1955,7 +1955,7 @@ static void file_util_details_dialog_ok_cb(GenericDialog *UNUSED(gd), gpointer U
 static void file_util_details_dialog_exclude(GenericDialog *gd, gpointer data, gboolean discard)
 {
        UtilityData *ud = static_cast<UtilityData *>(data);
-       FileData *fd = g_object_get_data(G_OBJECT(gd->dialog), "file_data");
+       FileData *fd = static_cast<FileData *>(g_object_get_data(G_OBJECT(gd->dialog), "file_data"));
 
        if (!fd) return;
        file_util_exclude_fd(ud, fd);
@@ -2111,7 +2111,7 @@ static void file_util_write_metadata_details_dialog(UtilityData *ud, FileData *f
        i = 0;
        while (work)
                {
-               const gchar *key = work->data;
+               const gchar *key = static_cast<const gchar *>(work->data);
                gchar *title = exif_get_description_by_key(key);
                gchar *title_f = g_strdup_printf("%s:", title);
                gchar *value = metadata_read_string(fd, key, METADATA_FORMATTED);
@@ -2507,7 +2507,7 @@ static GList *file_util_delete_dir_remaining_folders(GList *dlist)
                {
                FileData *fd;
 
-               fd = dlist->data;
+               fd = static_cast<FileData *>(dlist->data);
                dlist = dlist->next;
 
                if (!fd->name ||
@@ -2561,7 +2561,7 @@ static gboolean file_util_delete_dir_empty_path(UtilityData *ud, FileData *fd, g
                {
                FileData *lfd;
 
-               lfd = work->data;
+               lfd = static_cast<FileData *>(work->data);
                work = work->next;
 
                ok = file_util_delete_dir_empty_path(ud, lfd, level);
@@ -2572,7 +2572,7 @@ static gboolean file_util_delete_dir_empty_path(UtilityData *ud, FileData *fd, g
                {
                FileData *lfd;
 
-               lfd = work->data;
+               lfd = static_cast<FileData *>(work->data);
                work = work->next;
 
                DEBUG_1("deltree child: %s", lfd->path);
@@ -2605,7 +2605,7 @@ static gboolean file_util_delete_dir_prepare(UtilityData *ud, GList *flist, GLis
                {
                FileData *fd;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                ok = file_util_delete_dir_empty_path(ud, fd, 0);
@@ -2633,7 +2633,7 @@ static gboolean file_util_delete_dir_prepare(UtilityData *ud, GList *flist, GLis
                        {
                        FileData *fd;
 
-                       fd = work->data;
+                       fd = static_cast<FileData *>(work->data);
                        work = work->next;
                        file_data_sc_free_ci(fd);
                        }
@@ -2787,7 +2787,7 @@ static gboolean file_util_rename_dir_scan(UtilityData *ud, FileData *fd)
                {
                FileData *lfd;
 
-               lfd = work->data;
+               lfd = static_cast<FileData *>(work->data);
                work = work->next;
 
                ud->content_list = g_list_prepend(ud->content_list, file_data_ref(lfd));
@@ -2814,7 +2814,7 @@ static gboolean file_util_rename_dir_prepare(UtilityData *ud, const gchar *new_p
                gchar *np;
                FileData *fd;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                g_assert(strncmp(fd->path, ud->dir_fd->path, orig_len) == 0);
@@ -2839,7 +2839,7 @@ static gboolean file_util_rename_dir_prepare(UtilityData *ud, const gchar *new_p
                        {
                        FileData *fd;
 
-                       fd = work->data;
+                       fd = static_cast<FileData *>(work->data);
                        work = work->next;
                        file_data_sc_free_ci(fd);
                        }
@@ -2953,7 +2953,7 @@ static gboolean file_util_write_metadata_first_after_done(gpointer data)
        g_free(dd->dest_path);
        g_free(dd->editor_key);
        g_free(dd);
-       return FALSE;
+       return G_SOURCE_REMOVE;
 }
 
 static void file_util_write_metadata_first_done(gboolean success, const gchar *UNUSED(done_path), gpointer data)