Documentation: Use G_SOURCE_CONTINUE and G_SOURCE_REMOVE

[geeqie.git] / src / view-file / view-file.cc

diff --git a/src/view-file/view-file.cc b/src/view-file/view-file.cc
index 3b6a561..b97ac28 100644 (file)
--- a/src/view-file/view-file.cc
+++ b/src/view-file/view-file.cc
@@ -70,7 +70,7 @@ void vf_sort_set(ViewFile *vf, SortType type, gboolean ascend)
 
 FileData *vf_index_get_data(ViewFile *vf, gint row)
 {
-       return g_list_nth_data(vf->list, row);
+       return static_cast<FileData *>(g_list_nth_data(vf->list, row));
 }
 
 gint vf_index_by_fd(ViewFile *vf, FileData *fd)
@@ -344,9 +344,9 @@ GList *vf_selection_get_one(ViewFile *vf, FileData *fd)
 static void vf_pop_menu_edit_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf;
-       const gchar *key = data;
+       const gchar *key = static_cast<const gchar *>(data);
 
-       vf = submenu_item_get_data(widget);
+       vf = static_cast<ViewFile *>(submenu_item_get_data(widget));
 
        if (!vf) return;
 
@@ -368,7 +368,7 @@ static void vf_pop_menu_open_archive_cb(GtkWidget *UNUSED(widget), gpointer data
 {
        ViewFile *vf = (ViewFile *)data;
        LayoutWindow *lw_new;
-       FileData *fd;
+       FileData *fd = NULL;
        gchar *dest_dir;
 
        switch (vf->type)
@@ -479,7 +479,7 @@ static void vf_pop_menu_sort_cb(GtkWidget *widget, gpointer data)
 
        if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return;
 
-       vf = submenu_item_get_data(widget);
+       vf = static_cast<ViewFile *>(submenu_item_get_data(widget));
        if (!vf) return;
 
        type = (SortType)GPOINTER_TO_INT(data);
@@ -558,7 +558,7 @@ static void vf_pop_menu_toggle_mark_sel_cb(GtkWidget *UNUSED(widget), gpointer d
 static void vf_pop_menu_toggle_view_type_cb(GtkWidget *widget, gpointer data)
 {
        ViewFile *vf = (ViewFile *)data;
-       FileViewType new_type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "menu_item_radio_data"));
+       FileViewType new_type = static_cast<FileViewType>(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "menu_item_radio_data")));
        if (!vf->layout) return;
 
        layout_views_set(vf->layout, vf->layout->options.dir_view_type, new_type);
@@ -601,7 +601,7 @@ static void vf_pop_menu_collections_cb(GtkWidget *widget, gpointer data)
        ViewFile *vf;
        GList *selection_list;
 
-       vf = submenu_item_get_data(widget);
+       vf = static_cast<ViewFile *>(submenu_item_get_data(widget));
        selection_list = vf_selection_get_list(vf);
        pop_menu_collections(selection_list, data);
 
@@ -871,7 +871,7 @@ static void vf_marks_tooltip_ok_cb(GenericDialog *gd, gpointer data)
 void vf_marks_filter_on_icon_press(GtkEntry *UNUSED(entry), GtkEntryIconPosition UNUSED(pos),
                                                                        GdkEvent *UNUSED(event), gpointer userdata)
 {
-       MarksTextEntry *mte = userdata;
+       MarksTextEntry *mte = static_cast<MarksTextEntry *>(userdata);
 
        g_free(mte->text_entry);
        mte->text_entry = g_strdup("");
@@ -1100,7 +1100,7 @@ static gboolean vf_file_filter_class_set_all_cb(GtkWidget *widget, gpointer data
        children = gtk_container_get_children(GTK_CONTAINER(parent));
        while (children)
                {
-               child = children->data;
+               child = static_cast<GtkWidget *>(children->data);
                if (i < FILE_FORMAT_CLASSES)
                        {
                        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(child), state);
@@ -1558,17 +1558,17 @@ gboolean vf_stars_cb(gpointer data)
 
                if (vf_star_next(vf))
                        {
-                       return TRUE;
+                       return G_SOURCE_CONTINUE;
                        }
                else
                        {
                        vf->stars_filedata = NULL;
                        vf->stars_id = 0;
-                       return FALSE;
+                       return G_SOURCE_REMOVE;
                        }
                }
 
-       return FALSE;
+       return G_SOURCE_REMOVE;
 }
 
 void vf_star_update(ViewFile *vf)
@@ -1639,26 +1639,26 @@ GRegex *vf_file_filter_get_filter(ViewFile *vf)
 
        if (!gtk_widget_get_visible(vf->file_filter.combo))
                {
-               return g_regex_new("", 0, 0, NULL);
+               return g_regex_new("", GRegexCompileFlags(0), GRegexMatchFlags(0), NULL);
                }
 
        file_filter_text = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(vf->file_filter.combo));
 
        if (file_filter_text[0] != '\0')
                {
-               ret = g_regex_new(file_filter_text, vf->file_filter.case_sensitive ? 0 : G_REGEX_CASELESS, 0, &error);
+               ret = g_regex_new(file_filter_text, vf->file_filter.case_sensitive ? GRegexCompileFlags(0) : G_REGEX_CASELESS, GRegexMatchFlags(0), &error);
                if (error)
                        {
                        log_printf("Error: could not compile regular expression %s\n%s\n", file_filter_text, error->message);
                        g_error_free(error);
                        error = NULL;
-                       ret = g_regex_new("", 0, 0, NULL);
+                       ret = g_regex_new("", GRegexCompileFlags(0), GRegexMatchFlags(0), NULL);
                        }
                g_free(file_filter_text);
                }
        else
                {
-               ret = g_regex_new("", 0, 0, NULL);
+               ret = g_regex_new("", GRegexCompileFlags(0), GRegexMatchFlags(0), NULL);
                }
 
        return ret;
@@ -1703,7 +1703,7 @@ static gboolean vf_refresh_idle_cb(gpointer data)
 
        vf_refresh(vf);
        vf->refresh_idle_id = 0;
-       return FALSE;
+       return G_SOURCE_REMOVE;
 }
 
 void vf_refresh_idle_cancel(ViewFile *vf)
@@ -1738,8 +1738,8 @@ void vf_notify_cb(FileData *fd, NotifyType type, gpointer data)
        ViewFile *vf = (ViewFile *)data;
        gboolean refresh;
 
-       NotifyType interested = NOTIFY_CHANGE | NOTIFY_REREAD | NOTIFY_GROUPING;
-       if (vf->marks_enabled) interested |= NOTIFY_MARKS | NOTIFY_METADATA;
+       NotifyType interested = static_cast<NotifyType>(NOTIFY_CHANGE | NOTIFY_REREAD | NOTIFY_GROUPING);
+       if (vf->marks_enabled) interested = static_cast<NotifyType>(interested | NOTIFY_MARKS | NOTIFY_METADATA);
        /** @FIXME NOTIFY_METADATA should be checked by the keyword-to-mark functions and converted to NOTIFY_MARKS only if there was a change */
 
        if (!(type & interested) || vf->refresh_idle_id || !vf->dir_fd) return;
@@ -1789,7 +1789,7 @@ static gboolean vf_read_metadata_in_idle_cb(gpointer data)
 
        while (work)
                {
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
 
                if (fd && !fd->metadata_in_idle_loaded)
                        {
@@ -1806,7 +1806,7 @@ static gboolean vf_read_metadata_in_idle_cb(gpointer data)
                                read_rating_data(fd);
                                }
                        fd->metadata_in_idle_loaded = TRUE;
-                       return TRUE;
+                       return G_SOURCE_CONTINUE;
                        }
                work = work->next;
                }
@@ -1814,7 +1814,7 @@ static gboolean vf_read_metadata_in_idle_cb(gpointer data)
        vf_thumb_status(vf, 0.0, NULL);
        vf->read_metadata_in_idle_id = 0;
        vf_refresh(vf);
-       return FALSE;
+       return G_SOURCE_REMOVE;
 }
 
 static void vf_read_metadata_in_idle_finished_cb(gpointer data)