Documentation: Use G_SOURCE_CONTINUE and G_SOURCE_REMOVE

[geeqie.git] / src / image-overlay.cc

diff --git a/src/image-overlay.cc b/src/image-overlay.cc
index 97a8a14..10ed72f 100644 (file)
--- a/src/image-overlay.cc
+++ b/src/image-overlay.cc
@@ -123,7 +123,7 @@ static OverlayStateData *image_get_osd_data(ImageWindow *imd)
 
        g_assert(imd->pr);
 
-       osd = g_object_get_data(G_OBJECT(imd->pr), "IMAGE_OVERLAY_DATA");
+       osd = static_cast<OverlayStateData *>(g_object_get_data(G_OBJECT(imd->pr), "IMAGE_OVERLAY_DATA"));
        return osd;
 }
 
@@ -207,7 +207,7 @@ void image_osd_toggle(ImageWindow *imd)
        show = image_osd_get(imd);
        if (show == OSD_SHOW_NOTHING)
                {
-               image_osd_set(imd, OSD_SHOW_INFO | OSD_SHOW_STATUS);
+               image_osd_set(imd, static_cast<OsdShowFlags>(OSD_SHOW_INFO | OSD_SHOW_STATUS));
                return;
                }
        else
@@ -218,7 +218,7 @@ void image_osd_toggle(ImageWindow *imd)
                        }
                else
                        {
-                       image_osd_set(imd, show | OSD_SHOW_HISTOGRAM);
+                       image_osd_set(imd, static_cast<OsdShowFlags>(show | OSD_SHOW_HISTOGRAM));
                        }
                }
 }
@@ -570,11 +570,11 @@ static void image_osd_icons_update(OverlayStateData *osd)
                {
                if (osd->icon_time[i] > 0)
                        {
-                       image_osd_icon_show(osd, i);
+                       image_osd_icon_show(osd, static_cast<ImageOSDFlag>(i));
                        }
                else
                        {
-                       image_osd_icon_hide(osd, i);
+                       image_osd_icon_hide(osd, static_cast<ImageOSDFlag>(i));
                        }
                }
 }
@@ -585,7 +585,7 @@ static void image_osd_icons_hide(OverlayStateData *osd)
 
        for (i = 0; i < IMAGE_OSD_COUNT; i++)
                {
-               image_osd_icon_hide(osd, i);
+               image_osd_icon_hide(osd, static_cast<ImageOSDFlag>(i));
                }
 }
 
@@ -611,7 +611,7 @@ static void image_osd_info_hide(OverlayStateData *osd)
 
 static gboolean image_osd_update_cb(gpointer data)
 {
-       OverlayStateData *osd = (OverlayStateData *)data;
+       OverlayStateData *osd = static_cast<OverlayStateData *>(data);
 
        if (osd->show & OSD_SHOW_INFO)
                {
@@ -673,14 +673,14 @@ static gboolean image_osd_update_cb(gpointer data)
                }
 
        osd->changed_states = IMAGE_STATE_NONE;
-       osd->notify = 0;
+       osd->notify = static_cast<NotifyType>(0);
        osd->idle_id = 0;
-       return FALSE;
+       return G_SOURCE_REMOVE;
 }
 
 static void image_osd_update_schedule(OverlayStateData *osd, gboolean force)
 {
-       if (force) osd->changed_states |= IMAGE_STATE_IMAGE;
+       if (force) osd->changed_states = static_cast<ImageState>(osd->changed_states | IMAGE_STATE_IMAGE);
 
        if (!osd->idle_id)
                {
@@ -699,7 +699,7 @@ void image_osd_update(ImageWindow *imd)
 
 static gboolean image_osd_timer_cb(gpointer data)
 {
-       OverlayStateData *osd = (OverlayStateData *)data;
+       OverlayStateData *osd = static_cast<OverlayStateData *>(data);
        gboolean done = TRUE;
        gboolean changed = FALSE;
        gint i;
@@ -742,20 +742,20 @@ static void image_osd_timer_schedule(OverlayStateData *osd)
 
 static void image_osd_state_cb(ImageWindow *UNUSED(imd), ImageState state, gpointer data)
 {
-       OverlayStateData *osd = (OverlayStateData *)data;
+       OverlayStateData *osd = static_cast<OverlayStateData *>(data);
 
-       osd->changed_states |= state;
+       osd->changed_states = static_cast<ImageState>(osd->changed_states | state);
        image_osd_update_schedule(osd, FALSE);
 }
 
 static void image_osd_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-       OverlayStateData *osd = (OverlayStateData *)data;
+       OverlayStateData *osd = static_cast<OverlayStateData *>(data);
 
        if ((type & (NOTIFY_HISTMAP)) && osd->imd && fd == osd->imd->image_fd)
                {
                DEBUG_1("Notify osd: %s %04x", fd->path, type);
-               osd->notify |= type;
+               osd->notify = static_cast<NotifyType>(osd->notify | type);
                image_osd_update_schedule(osd, FALSE);
                }
 }
@@ -788,7 +788,7 @@ static void image_osd_free(OverlayStateData *osd)
 
 static void image_osd_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       OverlayStateData *osd = (OverlayStateData *)data;
+       OverlayStateData *osd = static_cast<OverlayStateData *>(data);
 
        osd->imd = NULL;
        image_osd_free(osd);