Fix c++ compiler warnings
authorColin Clark <colin.clark@cclark.uk>
Fri, 31 Mar 2023 16:59:46 +0000 (17:59 +0100)
committerColin Clark <colin.clark@cclark.uk>
Fri, 31 Mar 2023 16:59:46 +0000 (17:59 +0100)
An awk script was used to generate the changes. Hand editing was also
required:

function ltrim(s) { sub(/^[ \t\r\n]+/, "", s); return s }
function rtrim(s) { sub(/[ \t\r\n]+$/, "", s); return s }
function trim(s) { return rtrim(ltrim(s)); }

BEGIN {
}

/invalid conversion from ‘gpointer’/ {

split($0, file, ":");  # file-name line-number
split($0, fields, "[‘’]"); # get the typecast - these two characters are
UTF8 and are NOT the same

split(fields[6], cast, "*")

getline;

split($0, code, "[|=;]");

print "sed -i '" file[2]"s/"code[3]"/ static_cast<" cast[1] " *>("
trim(code[3]) ")/' " "./src/"file[1] ;

84 files changed:
src/advanced-exif.cc
src/bar-comment.cc
src/bar-exif.cc
src/bar-gps.cc
src/bar-histogram.cc
src/bar-keywords.cc
src/bar-rating.cc
src/bar-sort.cc
src/bar.cc
src/cache-maint.cc
src/collect-dlg.cc
src/collect-io.cc
src/collect-table.cc
src/collect.cc
src/color-man.cc
src/debug.cc
src/desktop-file.cc
src/dupe.cc
src/editors.cc
src/exif-common.cc
src/filecache.cc
src/filedata.cc
src/filefilter.cc
src/fullscreen.cc
src/history-list.cc
src/image-load-collection.cc
src/image-load-external.cc
src/image-load-ffmpegthumbnailer.cc
src/image-load-psd.cc
src/image-load-tiff.cc
src/image-load.cc
src/image-overlay.cc
src/image.cc
src/img-view.cc
src/layout-config.cc
src/layout-image.cc
src/layout-util.cc
src/layout.cc
src/logwindow.cc
src/main.cc
src/md5-util.cc
src/menu.cc
src/metadata.cc
src/misc.cc
src/osd.cc
src/pan-view/pan-calendar.cc
src/pan-view/pan-folder.cc
src/pan-view/pan-grid.cc
src/pan-view/pan-item.cc
src/pan-view/pan-timeline.cc
src/pan-view/pan-util.cc
src/pan-view/pan-view-filter.cc
src/pan-view/pan-view-search.cc
src/pan-view/pan-view.cc
src/pixbuf-renderer.cc
src/preferences.cc
src/print.cc
src/rcfile.cc
src/remote.cc
src/renderer-tiles.cc
src/search.cc
src/similar.cc
src/slideshow.cc
src/thumb-standard.cc
src/toolbar.cc
src/trash.cc
src/ui-bookmark.cc
src/ui-fileops.cc
src/ui-help.cc
src/ui-menu.cc
src/ui-misc.cc
src/ui-pathsel.cc
src/ui-spinner.cc
src/ui-tabcomp.cc
src/ui-tree-edit.cc
src/uri-utils.cc
src/utilops.cc
src/view-dir-list.cc
src/view-dir-tree.cc
src/view-dir.cc
src/view-file/view-file-icon.cc
src/view-file/view-file-list.cc
src/view-file/view-file.cc
src/window.cc

index 6ef17c5..4c77bb7 100644 (file)
@@ -164,7 +164,7 @@ void advanced_exif_set_fd(GtkWidget *window, FileData *fd)
 {
        ExifWin *ew;
 
-       ew = g_object_get_data(G_OBJECT(window), "advanced_exif_data");
+       ew = static_cast<ExifWin *>(g_object_get_data(G_OBJECT(window), "advanced_exif_data"));
        if (!ew) return;
 
        /* store this, advanced view toggle needs to reload data */
index 0dffcfb..385082b 100644 (file)
@@ -152,7 +152,7 @@ static void bar_pane_comment_set_fd(GtkWidget *bar, FileData *fd)
 {
        PaneCommentData *pcd;
 
-       pcd = g_object_get_data(G_OBJECT(bar), "pane_data");
+       pcd = static_cast<PaneCommentData *>(g_object_get_data(G_OBJECT(bar), "pane_data"));
        if (!pcd) return;
 
        file_data_unref(pcd->fd);
@@ -165,7 +165,7 @@ static gint bar_pane_comment_event(GtkWidget *bar, GdkEvent *event)
 {
        PaneCommentData *pcd;
 
-       pcd = g_object_get_data(G_OBJECT(bar), "pane_data");
+       pcd = static_cast<PaneCommentData *>(g_object_get_data(G_OBJECT(bar), "pane_data"));
        if (!pcd) return FALSE;
 
        if (gtk_widget_has_focus(pcd->comment_view)) return gtk_widget_event(pcd->comment_view, event);
@@ -178,7 +178,7 @@ static void bar_pane_comment_write_config(GtkWidget *pane, GString *outstr, gint
        PaneCommentData *pcd;
        gint w, h;
 
-       pcd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       pcd = static_cast<PaneCommentData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!pcd) return;
 
        gtk_widget_get_size_request(GTK_WIDGET(pane), &w, &h);
@@ -370,7 +370,7 @@ void bar_pane_comment_update_from_config(GtkWidget *pane, const gchar **attribut
 {
        PaneCommentData *pcd;
 
-       pcd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       pcd = static_cast<PaneCommentData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!pcd) return;
 
        gchar *title = NULL;
index 0474654..7483686 100644 (file)
@@ -195,9 +195,9 @@ static GtkWidget *bar_pane_exif_add_entry(PaneExifData *ped, const gchar *key, c
 
 static void bar_pane_exif_reparent_entry(GtkWidget *entry, GtkWidget *pane)
 {
-       PaneExifData *ped = g_object_get_data(G_OBJECT(pane), "pane_data");
+       PaneExifData *ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        PaneExifData *old_ped;
-       ExifEntry *ee = g_object_get_data(G_OBJECT(entry), "entry_data");
+       ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
 
        if (!ped || !ee) return;
 
@@ -225,7 +225,7 @@ static void bar_pane_exif_entry_update_title(ExifEntry *ee)
 static void bar_pane_exif_update_entry(PaneExifData *ped, GtkWidget *entry, gboolean update_title)
 {
        gchar *text;
-       ExifEntry *ee = g_object_get_data(G_OBJECT(entry), "entry_data");
+       ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
        gshort rating;
 
        if (!ee) return;
@@ -291,7 +291,7 @@ void bar_pane_exif_set_fd(GtkWidget *widget, FileData *fd)
 {
        PaneExifData *ped;
 
-       ped = g_object_get_data(G_OBJECT(widget), "pane_data");
+       ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(widget), "pane_data"));
        if (!ped) return;
 
        file_data_unref(ped->fd);
@@ -306,7 +306,7 @@ gint bar_pane_exif_event(GtkWidget *bar, GdkEvent *event)
        gboolean ret = FALSE;
        GList *list, *work;
 
-       ped = g_object_get_data(G_OBJECT(bar), "pane_data");
+       ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(bar), "pane_data"));
        if (!ped) return FALSE;
 
        list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
@@ -314,7 +314,7 @@ gint bar_pane_exif_event(GtkWidget *bar, GdkEvent *event)
        while (!ret && work)
                {
                GtkWidget *entry = static_cast<GtkWidget *>(work->data);
-               ExifEntry *ee = g_object_get_data(G_OBJECT(entry), "entry_data");
+               ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
                work = work->next;
 
                if (ee->editable && gtk_widget_has_focus(ee->value_widget)) ret = gtk_widget_event(ee->value_widget, event);
@@ -357,7 +357,7 @@ static void bar_pane_exif_entry_dnd_get(GtkWidget *entry, GdkDragContext *UNUSED
                                     GtkSelectionData *selection_data, guint info,
                                     guint UNUSED(time), gpointer UNUSED(data))
 {
-       ExifEntry *ee = g_object_get_data(G_OBJECT(entry), "entry_data");
+       ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
 
        switch (info)
                {
@@ -384,7 +384,7 @@ static void bar_pane_exif_dnd_receive(GtkWidget *pane, GdkDragContext *UNUSED(co
        gint pos;
        GtkWidget *new_entry = NULL;
 
-       ped = g_object_get_data(G_OBJECT(pane), "pane_data");
+       ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!ped) return;
 
        switch (info)
@@ -427,7 +427,7 @@ static void bar_pane_exif_dnd_receive(GtkWidget *pane, GdkDragContext *UNUSED(co
 
 static void bar_pane_exif_entry_dnd_begin(GtkWidget *entry, GdkDragContext *context, gpointer UNUSED(data))
 {
-       ExifEntry *ee = g_object_get_data(G_OBJECT(entry), "entry_data");
+       ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
 
        if (!ee) return;
        dnd_set_drag_label(entry, context, ee->key);
@@ -439,7 +439,7 @@ static void bar_pane_exif_entry_dnd_end(GtkWidget *UNUSED(widget), GdkDragContex
 
 static void bar_pane_exif_entry_dnd_init(GtkWidget *entry)
 {
-       ExifEntry *ee = g_object_get_data(G_OBJECT(entry), "entry_data");
+       ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
 
        gtk_drag_source_set(entry, GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
                            bar_pane_exif_drag_types, n_exif_entry_drag_types,
@@ -485,8 +485,8 @@ static void bar_pane_exif_edit_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
        ConfDialogData *cdd = static_cast<ConfDialogData *>(data);
 
        /* either one or the other */
-       PaneExifData *ped = g_object_get_data(G_OBJECT(cdd->widget), "pane_data");
-       ExifEntry *ee = g_object_get_data(G_OBJECT(cdd->widget), "entry_data");
+       PaneExifData *ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(cdd->widget), "pane_data"));
+       ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(cdd->widget), "entry_data"));
 
        if (ped)
                {
@@ -503,7 +503,7 @@ static void bar_pane_exif_edit_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
 
                while (pane)
                        {
-                       ped = g_object_get_data(G_OBJECT(pane), "pane_data");
+                       ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
                        if (ped) break;
                        pane = gtk_widget_get_parent(pane);
                        }
@@ -544,7 +544,7 @@ static void bar_pane_exif_conf_dialog(GtkWidget *widget)
 
        /* the widget can be either ExifEntry (for editing) or Pane (for new entry)
           we can decide it by the attached data */
-       ExifEntry *ee = g_object_get_data(G_OBJECT(widget), "entry_data");
+       ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(widget), "entry_data"));
 
        cdd = g_new0(ConfDialogData, 1);
 
@@ -613,7 +613,7 @@ static void bar_pane_exif_copy_entry_cb(GtkWidget *UNUSED(menu_widget), gpointer
        const gchar *value;
        ExifEntry *ee;
 
-       ee = g_object_get_data(G_OBJECT(widget), "entry_data");
+       ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(widget), "entry_data"));
        value = gtk_label_get_text(GTK_LABEL(ee->value_widget));
        clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
        gtk_clipboard_set_text(clipboard, value, -1);
@@ -631,7 +631,7 @@ static void bar_pane_exif_menu_popup(GtkWidget *widget, PaneExifData *ped)
        GtkWidget *menu;
        /* the widget can be either ExifEntry (for editing) or Pane (for new entry)
           we can decide it by the attached data */
-       ExifEntry *ee = g_object_get_data(G_OBJECT(widget), "entry_data");
+       ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(widget), "entry_data"));
 
        menu = popup_menu_short_lived();
 
@@ -677,7 +677,7 @@ static gboolean bar_pane_exif_copy_cb(GtkWidget *widget, GdkEventButton *bevent,
 
        if (bevent->button == MOUSE_BUTTON_LEFT)
                {
-               ee = g_object_get_data(G_OBJECT(widget), "entry_data");
+               ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(widget), "entry_data"));
                value = gtk_label_get_text(GTK_LABEL(ee->value_widget));
                clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
                gtk_clipboard_set_text(clipboard, value, -1);
@@ -692,7 +692,7 @@ static gboolean bar_pane_exif_copy_cb(GtkWidget *widget, GdkEventButton *bevent,
 
 static void bar_pane_exif_entry_write_config(GtkWidget *entry, GString *outstr, gint indent)
 {
-       ExifEntry *ee = g_object_get_data(G_OBJECT(entry), "entry_data");
+       ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
        if (!ee) return;
 
        WRITE_NL(); WRITE_STRING("<entry ");
@@ -708,7 +708,7 @@ static void bar_pane_exif_write_config(GtkWidget *pane, GString *outstr, gint in
        PaneExifData *ped;
        GList *work, *list;
 
-       ped = g_object_get_data(G_OBJECT(pane), "pane_data");
+       ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!ped) return;
 
        WRITE_NL(); WRITE_STRING("<pane_exif ");
@@ -746,19 +746,19 @@ GList * bar_pane_exif_list()
        ExifEntry *ee;
 
        work_windows = layout_window_list;
-       lw = work_windows->data;
+       lw = static_cast<LayoutWindow *>(work_windows->data);
        bar = lw->bar;
        pane = bar_find_pane_by_id(bar, PANE_EXIF, "exif");
        if (pane)
                {
-               ped = g_object_get_data(G_OBJECT(pane), "pane_data");
+               ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
 
                list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
                while (list)
                        {
-                       entry = list->data;
+                       entry = static_cast<GtkWidget *>(list->data);
                        list = list->next;
-                       ee = g_object_get_data(G_OBJECT(entry), "entry_data");
+                       ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
                        exif_list = g_list_append(exif_list, g_strdup(ee->title));
                        exif_list = g_list_append(exif_list, g_strdup(ee->key));
                        }
@@ -877,7 +877,7 @@ void bar_pane_exif_update_from_config(GtkWidget *pane, const gchar **attribute_n
        PaneExifData *ped;
        gchar *title = NULL;
 
-       ped = g_object_get_data(G_OBJECT(pane), "pane_data");
+       ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!ped) return;
 
        while (*attribute_names)
@@ -914,7 +914,7 @@ void bar_pane_exif_entry_add_from_config(GtkWidget *pane, const gchar **attribut
        gboolean if_set = TRUE;
        gboolean editable = FALSE;
 
-       ped = g_object_get_data(G_OBJECT(pane), "pane_data");
+       ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!ped) return;
 
        while (*attribute_names)
index 6316644..c93fbd0 100644 (file)
@@ -115,7 +115,7 @@ static void bar_pane_gps_close_save_cb(GenericDialog *UNUSED(gd), gpointer data)
        work = g_list_first(pgd->geocode_list);
        while (work)
                {
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                if (fd->name && !fd->parent)
                        {
                        work = work->next;
@@ -142,7 +142,7 @@ static void bar_pane_gps_close_save_cb(GenericDialog *UNUSED(gd), gpointer data)
        gchar *location;
        gchar **latlong;
 
-       pgd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       pgd = static_cast<PaneGPSData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!pgd) return;
 
        if (info == TARGET_URI_LIST)
@@ -161,7 +161,7 @@ static void bar_pane_gps_close_save_cb(GenericDialog *UNUSED(gd), gpointer data)
                        work = list;
                        while (work)
                                {
-                               fd = work->data;
+                               fd = static_cast<FileData *>(work->data);
                                work = work->next;
                                if (fd->name && !fd->parent)
                                        {
@@ -182,7 +182,7 @@ static void bar_pane_gps_close_save_cb(GenericDialog *UNUSED(gd), gpointer data)
                                message = g_string_new("");
                                if (count == 1)
                                        {
-                                       fd_found = g_list_first(pgd->geocode_list)->data;
+                                       fd_found = static_cast<FileData *>(g_list_first(pgd->geocode_list)->data);
                                        g_string_append_printf(message,
                                                        _("\nDo you want to geocode image %s?"), fd_found->name);
                                        }
@@ -279,7 +279,7 @@ static void bar_pane_gps_thumb_done_cb(ThumbLoader *tl, gpointer data)
        ClutterActor *actor;
 
        marker = CLUTTER_ACTOR(data);
-       fd = g_object_get_data(G_OBJECT(marker), "file_fd");
+       fd = static_cast<FileData *>(g_object_get_data(G_OBJECT(marker), "file_fd"));
        if (fd->thumb_pixbuf != NULL)
                {
                actor = gtk_clutter_texture_new();
@@ -313,7 +313,7 @@ static gboolean bar_pane_gps_marker_keypress_cb(GtkWidget *widget, ClutterButton
        if (bevent->button == MOUSE_BUTTON_LEFT)
                {
                label_marker = CLUTTER_ACTOR(widget);
-               fd = g_object_get_data(G_OBJECT(label_marker), "file_fd");
+               fd = static_cast<FileData *>(g_object_get_data(G_OBJECT(label_marker), "file_fd"));
 
                /* If the marker is showing a thumbnail, delete it
                 */
@@ -452,7 +452,7 @@ static gboolean bar_pane_gps_create_markers_cb(gpointer data)
 
        if(pgd->not_added)
                {
-               fd = pgd->not_added->data;
+               fd = static_cast<FileData *>(pgd->not_added->data);
                pgd->not_added = pgd->not_added->next;
 
                latitude = metadata_read_GPS_coord(fd, "Xmp.exif.GPSLatitude", 0);
@@ -623,7 +623,7 @@ static void bar_pane_gps_change_map_cb(GtkWidget *widget, gpointer data)
 
        if (!pgd) return;
 
-       mapsource = g_object_get_data(G_OBJECT(widget), "menu_item_radio_data");
+       mapsource = static_cast<gchar *>(g_object_get_data(G_OBJECT(widget), "menu_item_radio_data"));
        bar_pane_gps_set_map_source(pgd, mapsource);
 }
 
@@ -633,7 +633,7 @@ static void bar_pane_gps_notify_selection(GtkWidget *bar, gint count)
 
        if (count == 0) return;
 
-       pgd = g_object_get_data(G_OBJECT(bar), "pane_data");
+       pgd = static_cast<PaneGPSData *>(g_object_get_data(G_OBJECT(bar), "pane_data"));
        if (!pgd) return;
 
        bar_pane_gps_update(pgd);
@@ -643,7 +643,7 @@ static void bar_pane_gps_set_fd(GtkWidget *bar, FileData *fd)
 {
        PaneGPSData *pgd;
 
-       pgd = g_object_get_data(G_OBJECT(bar), "pane_data");
+       pgd = static_cast<PaneGPSData *>(g_object_get_data(G_OBJECT(bar), "pane_data"));
        if (!pgd) return;
 
        file_data_unref(pgd->fd);
@@ -656,7 +656,7 @@ static gint bar_pane_gps_event(GtkWidget *bar, GdkEvent *event)
 {
        PaneGPSData *pgd;
 
-       pgd = g_object_get_data(G_OBJECT(bar), "pane_data");
+       pgd = static_cast<PaneGPSData *>(g_object_get_data(G_OBJECT(bar), "pane_data"));
        if (!pgd) return FALSE;
 
        if (gtk_widget_has_focus(pgd->widget)) return gtk_widget_event(GTK_WIDGET(pgd->widget), event);
@@ -676,7 +676,7 @@ static void bar_pane_gps_write_config(GtkWidget *pane, GString *outstr, gint ind
        gint int_position;
        gint w, h;
 
-       pgd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       pgd = static_cast<PaneGPSData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!pgd) return;
 
        WRITE_NL();
@@ -1078,7 +1078,7 @@ void bar_pane_gps_update_from_config(GtkWidget *pane, const gchar **attribute_na
        gint int_longitude, int_latitude;
        gdouble longitude, latitude;
 
-       pgd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       pgd = static_cast<PaneGPSData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!pgd)
                return;
 
index de3f0d2..a35d7b0 100644 (file)
@@ -111,7 +111,7 @@ static void bar_pane_histogram_set_fd(GtkWidget *pane, FileData *fd)
 {
        PaneHistogramData *phd;
 
-       phd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       phd = static_cast<PaneHistogramData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!phd) return;
 
        file_data_unref(phd->fd);
@@ -124,7 +124,7 @@ static void bar_pane_histogram_write_config(GtkWidget *pane, GString *outstr, gi
 {
        PaneHistogramData *phd;
 
-       phd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       phd = static_cast<PaneHistogramData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!phd) return;
 
        WRITE_NL(); WRITE_STRING("<pane_histogram ");
@@ -347,7 +347,7 @@ void bar_pane_histogram_update_from_config(GtkWidget *pane, const gchar **attrib
 {
        PaneHistogramData *phd;
 
-       phd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       phd = static_cast<PaneHistogramData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!phd) return;
 
        gint histogram_channel = phd->histogram->histogram_channel;
index ee54bae..709032d 100644 (file)
@@ -88,7 +88,7 @@ static void keyword_list_push(GtkWidget *textview, GList *list)
 
        while (list)
                {
-               const gchar *word = list->data;
+               const gchar *word = static_cast<const gchar *>(list->data);
                GtkTextIter iter;
 
                gtk_text_buffer_get_end_iter(buffer, &iter);
@@ -256,7 +256,7 @@ void bar_pane_keywords_set_fd(GtkWidget *pane, FileData *fd)
 {
        PaneKeywordsData *pkd;
 
-       pkd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       pkd = static_cast<PaneKeywordsData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!pkd) return;
 
        file_data_unref(pkd->fd);
@@ -300,7 +300,7 @@ static void bar_pane_keywords_write_config(GtkWidget *pane, GString *outstr, gin
        GList *path_expanded = NULL;
        gint w, h;
 
-       pkd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       pkd = static_cast<PaneKeywordsData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!pkd) return;
 
        gtk_widget_get_size_request(GTK_WIDGET(pane), &w, &h);
@@ -336,7 +336,7 @@ gint bar_pane_keywords_event(GtkWidget *bar, GdkEvent *event)
 {
        PaneKeywordsData *pkd;
 
-       pkd = g_object_get_data(G_OBJECT(bar), "pane_data");
+       pkd = static_cast<PaneKeywordsData *>(g_object_get_data(G_OBJECT(bar), "pane_data"));
        if (!pkd) return FALSE;
 
        if (gtk_widget_has_focus(pkd->keyword_view)) return gtk_widget_event(pkd->keyword_view, event);
@@ -632,7 +632,7 @@ static gboolean bar_pane_keywords_dnd_skip_existing(GtkTreeModel *keyword_tree,
        GList *work = *keywords;
        while (work)
                {
-               gchar *keyword = work->data;
+               gchar *keyword = static_cast<gchar *>(work->data);
                if (keyword_exists(keyword_tree, NULL, dest_kw_iter, keyword, FALSE, NULL))
                        {
                        GList *next = work->next;
@@ -766,7 +766,7 @@ static void bar_pane_keywords_dnd_receive(GtkWidget *tree_view, GdkDragContext *
        work = new_keywords;
        while (work)
                {
-               gchar *keyword = work->data;
+               gchar *keyword = static_cast<gchar *>(work->data);
                keyword_set(GTK_TREE_STORE(keyword_tree), &new_kw_iter, keyword, TRUE);
                work = work->next;
 
@@ -1143,7 +1143,7 @@ static void bar_pane_keywords_revert_cb(GtkWidget *UNUSED(menu_widget), gpointer
        work = pkd->expanded_rows;
        while (work)
                {
-               path = work->data;
+               path = static_cast<gchar *>(work->data);
                tree_path = gtk_tree_path_new_from_string(path);
                gtk_tree_view_expand_to_path(GTK_TREE_VIEW(pkd->keyword_treeview), tree_path);
                work = work->next;
@@ -1674,7 +1674,7 @@ void bar_pane_keywords_update_from_config(GtkWidget *pane, const gchar **attribu
 {
        PaneKeywordsData *pkd;
 
-       pkd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       pkd = static_cast<PaneKeywordsData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!pkd) return;
 
        gchar *title = NULL;
@@ -1711,7 +1711,7 @@ void bar_pane_keywords_entry_add_from_config(GtkWidget *pane, const gchar **attr
        gchar *path = NULL;
        GtkTreePath *tree_path;
 
-       pkd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       pkd = static_cast<PaneKeywordsData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!pkd) return;
 
        while (*attribute_names)
index d76771d..3b00532 100644 (file)
@@ -62,7 +62,7 @@ static void bar_pane_rating_set_fd(GtkWidget *pane, FileData *fd)
 {
        PaneRatingData *prd;
 
-       prd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       prd = static_cast<PaneRatingData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!prd) return;
 
        file_data_unref(prd->fd);
@@ -75,7 +75,7 @@ static void bar_pane_rating_write_config(GtkWidget *pane, GString *outstr, gint
 {
        PaneRatingData *prd;
 
-       prd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       prd = static_cast<PaneRatingData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!prd) return;
 
        WRITE_NL();
@@ -230,7 +230,7 @@ void bar_pane_rating_update_from_config(GtkWidget *pane, const gchar **attribute
        PaneRatingData *prd;
        gchar *title = NULL;
 
-       prd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       prd = static_cast<PaneRatingData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!prd) return;
 
        while (*attribute_names)
index 37827a8..26df9dd 100644 (file)
@@ -101,7 +101,7 @@ static void bar_sort_collection_list_build(GtkWidget *bookmarks)
                FileData *fd;
                gchar *name;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                if (file_extension_match(fd->path, GQ_COLLECTION_EXT))
@@ -179,7 +179,7 @@ static void bar_sort_undo_set(SortData *sd, GList *src_list, const gchar *dest)
                GList *work = sd->undo_src_list;
                while(work)
                        {
-                       gchar *filename =  g_strdup(filename_from_path(work->data));
+                       gchar *filename = g_strdup(filename_from_path(work->data));
                        gchar *dest_path = g_build_filename(g_strdup(dest), filename, NULL);
                        sd->undo_dest_list = g_list_prepend(sd->undo_dest_list, g_strdup(dest_path));
                        work = work->next;
@@ -214,12 +214,12 @@ static void bar_sort_undo_folder(SortData *sd, GtkWidget *button)
                                {
                                GList *work = NULL;
 
-                               src_path = g_strdup(sd->undo_src_list->data);
+                               src_path = g_strdup(static_cast<const gchar *>(sd->undo_src_list->data));
                                src_dir = remove_level_from_path(src_path);
                                list = sd->undo_dest_list;
                                while (list)
                                        {
-                                       work = g_list_prepend(work, file_data_new_group(list->data));
+                                       work = g_list_prepend(work, file_data_new_group(static_cast<const gchar *>(list->data)));
                                        list=list->next;
                                        }
                                file_util_move_simple(work, src_dir, sd->lw->window);
@@ -239,7 +239,7 @@ static void bar_sort_undo_folder(SortData *sd, GtkWidget *button)
                                delete_list = sd->undo_dest_list;
                                while (delete_list)
                                        {
-                                       work = g_list_append(work, file_data_new_group(delete_list->data));
+                                       work = g_list_append(work, file_data_new_group(static_cast<const gchar *>(delete_list->data)));
                                        delete_list = delete_list->next;
                                        }
                                options->file_ops.safe_delete_enable = TRUE;
@@ -252,7 +252,7 @@ static void bar_sort_undo_folder(SortData *sd, GtkWidget *button)
                }
 
        layout_refresh(sd->lw);
-       origin = (sd->undo_src_list)->data;
+       origin = static_cast<gchar *>((sd->undo_src_list)->data);
 
        if (isfile(origin))
                {
@@ -270,7 +270,7 @@ static void bar_sort_undo_collection(SortData *sd)
        while (work)
                {
                gchar *source;
-               source = work->data;
+               source = static_cast<gchar *>(work->data);
                work = work->next;
                collect_manager_remove(file_data_new_group(source), sd->undo_collection);
                }
@@ -359,7 +359,7 @@ static void bar_sort_bookmark_select_collection(SortData *sd, FileData *source,
                {
                FileData *image_fd;
 
-               image_fd = list->data;
+               image_fd = static_cast<FileData *>(list->data);
                list = list->next;
                collect_manager_add(image_fd, path);
                }
@@ -417,7 +417,7 @@ static void bar_sort_set_filter_cb(GtkWidget *button, gpointer data)
        const gchar *key;
 
        if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) return;
-       key = g_object_get_data(G_OBJECT(button), "filter_key");
+       key = static_cast<const gchar *>(g_object_get_data(G_OBJECT(button), "filter_key"));
        bar_sort_set_action(sd, BAR_SORT_FILTER, key);
 }
 
@@ -606,7 +606,7 @@ void bar_sort_close(GtkWidget *bar)
 {
        SortData *sd;
 
-       sd = g_object_get_data(G_OBJECT(bar), "bar_sort_data");
+       sd = static_cast<SortData *>(g_object_get_data(G_OBJECT(bar), "bar_sort_data"));
        if (!sd) return;
 
        gtk_widget_destroy(sd->vbox);
@@ -826,7 +826,7 @@ void bar_sort_write_config(GtkWidget *bar, GString *outstr, gint indent)
        SortData *sd;
 
        if (!bar) return;
-       sd = g_object_get_data(G_OBJECT(bar), "bar_sort_data");
+       sd = static_cast<SortData *>(g_object_get_data(G_OBJECT(bar), "bar_sort_data"));
        if (!sd) return;
 
        WRITE_NL(); WRITE_STRING("<bar_sort ");
index a5f90c7..2bcb0c4 100644 (file)
@@ -298,7 +298,7 @@ static void bar_expander_height_cb(GtkWidget *UNUSED(widget), gpointer data)
        gdk_device_get_position(device, NULL, &x, &y);
 
        list = gtk_container_get_children(GTK_CONTAINER(expander));
-       data_box = list->data;
+       data_box = static_cast<GtkWidget *>(list->data);
 
        window = gtk_window_new(GTK_WINDOW_POPUP);
 
@@ -334,7 +334,7 @@ static void bar_expander_add_cb(GtkWidget *widget, gpointer UNUSED(data))
 {
        //GtkWidget *bar = static_cast<//GtkWidget *>(data);
        const KnownPanes *pane = known_panes;
-       const gchar *id = g_object_get_data(G_OBJECT(widget), "pane_add_id");
+       const gchar *id = static_cast<const gchar *>(g_object_get_data(G_OBJECT(widget), "pane_add_id"));
        const gchar *config;
 
        if (!id) return;
@@ -369,7 +369,7 @@ static void bar_menu_popup(GtkWidget *widget)
                                                        (g_strcmp0(label, "Keywords") == 0) ||
                                                        (g_strcmp0(label, "GPS Map") == 0);
 
-       bd = g_object_get_data(G_OBJECT(widget), "bar_data");
+       bd = static_cast<BarData *>(g_object_get_data(G_OBJECT(widget), "bar_data"));
        if (bd)
                {
                expander = NULL;
@@ -467,7 +467,7 @@ static gboolean bar_menu_add_cb(GtkWidget *widget, GdkEventButton *UNUSED(bevent
 static void bar_pane_set_fd_cb(GtkWidget *expander, gpointer data)
 {
        GtkWidget *widget = gtk_bin_get_child(GTK_BIN(expander));
-       PaneData *pd = g_object_get_data(G_OBJECT(widget), "pane_data");
+       PaneData *pd = static_cast<PaneData *>(g_object_get_data(G_OBJECT(widget), "pane_data"));
        if (!pd) return;
        if (pd->pane_set_fd) pd->pane_set_fd(widget, data);
 }
@@ -475,7 +475,7 @@ static void bar_pane_set_fd_cb(GtkWidget *expander, gpointer data)
 void bar_set_fd(GtkWidget *bar, FileData *fd)
 {
        BarData *bd;
-       bd = g_object_get_data(G_OBJECT(bar), "bar_data");
+       bd = static_cast<BarData *>(g_object_get_data(G_OBJECT(bar), "bar_data"));
        if (!bd) return;
 
        file_data_unref(bd->fd);
@@ -490,7 +490,7 @@ void bar_set_fd(GtkWidget *bar, FileData *fd)
 static void bar_pane_notify_selection_cb(GtkWidget *expander, gpointer data)
 {
        GtkWidget *widget = gtk_bin_get_child(GTK_BIN(expander));
-       PaneData *pd = g_object_get_data(G_OBJECT(widget), "pane_data");
+       PaneData *pd = static_cast<PaneData *>(g_object_get_data(G_OBJECT(widget), "pane_data"));
        if (!pd) return;
        if (pd->pane_notify_selection) pd->pane_notify_selection(widget, GPOINTER_TO_INT(data));
 }
@@ -498,7 +498,7 @@ static void bar_pane_notify_selection_cb(GtkWidget *expander, gpointer data)
 void bar_notify_selection(GtkWidget *bar, gint count)
 {
        BarData *bd;
-       bd = g_object_get_data(G_OBJECT(bar), "bar_data");
+       bd = static_cast<BarData *>(g_object_get_data(G_OBJECT(bar), "bar_data"));
        if (!bd) return;
 
        gtk_container_foreach(GTK_CONTAINER(bd->vbox), bar_pane_notify_selection_cb, GINT_TO_POINTER(count));
@@ -510,7 +510,7 @@ gboolean bar_event(GtkWidget *bar, GdkEvent *event)
        GList *list, *work;
        gboolean ret = FALSE;
 
-       bd = g_object_get_data(G_OBJECT(bar), "bar_data");
+       bd = static_cast<BarData *>(g_object_get_data(G_OBJECT(bar), "bar_data"));
        if (!bd) return FALSE;
 
        list = gtk_container_get_children(GTK_CONTAINER(bd->vbox));
@@ -519,7 +519,7 @@ gboolean bar_event(GtkWidget *bar, GdkEvent *event)
        while (work)
                {
                GtkWidget *widget = gtk_bin_get_child(GTK_BIN(work->data));
-               PaneData *pd = g_object_get_data(G_OBJECT(widget), "pane_data");
+               PaneData *pd = static_cast<PaneData *>(g_object_get_data(G_OBJECT(widget), "pane_data"));
                if (!pd) continue;
 
                if (pd->pane_event && pd->pane_event(widget, event))
@@ -541,7 +541,7 @@ GtkWidget *bar_find_pane_by_id(GtkWidget *bar, PaneType type, const gchar *id)
 
        if (!id || !id[0]) return NULL;
 
-       bd = g_object_get_data(G_OBJECT(bar), "bar_data");
+       bd = static_cast<BarData *>(g_object_get_data(G_OBJECT(bar), "bar_data"));
        if (!bd) return NULL;
 
        list = gtk_container_get_children(GTK_CONTAINER(bd->vbox));
@@ -550,7 +550,7 @@ GtkWidget *bar_find_pane_by_id(GtkWidget *bar, PaneType type, const gchar *id)
        while (work)
                {
                GtkWidget *widget = gtk_bin_get_child(GTK_BIN(work->data));
-               PaneData *pd = g_object_get_data(G_OBJECT(widget), "pane_data");
+               PaneData *pd = static_cast<PaneData *>(g_object_get_data(G_OBJECT(widget), "pane_data"));
                if (!pd) continue;
 
                if (type == pd->type && strcmp(id, pd->id) == 0)
@@ -569,7 +569,7 @@ void bar_clear(GtkWidget *bar)
        BarData *bd;
        GList *list, *work;
 
-       bd = g_object_get_data(G_OBJECT(bar), "bar_data");
+       bd = static_cast<BarData *>(g_object_get_data(G_OBJECT(bar), "bar_data"));
        if (!bd) return;
 
        list = gtk_container_get_children(GTK_CONTAINER(bd->vbox));
@@ -591,7 +591,7 @@ void bar_write_config(GtkWidget *bar, GString *outstr, gint indent)
 
        if (!bar) return;
 
-       bd = g_object_get_data(G_OBJECT(bar), "bar_data");
+       bd = static_cast<BarData *>(g_object_get_data(G_OBJECT(bar), "bar_data"));
        if (!bd) return;
 
        WRITE_NL(); WRITE_STRING("<bar ");
@@ -608,7 +608,7 @@ void bar_write_config(GtkWidget *bar, GString *outstr, gint indent)
                {
                GtkWidget *expander = static_cast<GtkWidget *>(work->data);
                GtkWidget *widget = gtk_bin_get_child(GTK_BIN(expander));
-               PaneData *pd = g_object_get_data(G_OBJECT(widget), "pane_data");
+               PaneData *pd = static_cast<PaneData *>(g_object_get_data(G_OBJECT(widget), "pane_data"));
                if (!pd) continue;
 
                pd->expanded = gtk_expander_get_expanded(GTK_EXPANDER(expander));
@@ -625,7 +625,7 @@ void bar_write_config(GtkWidget *bar, GString *outstr, gint indent)
 
 void bar_update_expander(GtkWidget *pane)
 {
-       PaneData *pd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       PaneData *pd = static_cast<PaneData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        GtkWidget *expander;
 
        if (!pd) return;
@@ -638,8 +638,8 @@ void bar_update_expander(GtkWidget *pane)
 void bar_add(GtkWidget *bar, GtkWidget *pane)
 {
        GtkWidget *expander;
-       BarData *bd = g_object_get_data(G_OBJECT(bar), "bar_data");
-       PaneData *pd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       BarData *bd = static_cast<BarData *>(g_object_get_data(G_OBJECT(bar), "bar_data"));
+       PaneData *pd = static_cast<PaneData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
 
        if (!bd) return;
 
@@ -703,7 +703,7 @@ void bar_close(GtkWidget *bar)
 {
        BarData *bd;
 
-       bd = g_object_get_data(G_OBJECT(bar), "bar_data");
+       bd = static_cast<BarData *>(g_object_get_data(G_OBJECT(bar), "bar_data"));
        if (!bd) return;
 
        gtk_widget_destroy(bd->widget);
index 06e4df3..61262e4 100644 (file)
@@ -219,7 +219,7 @@ static gboolean cache_maintain_home_cb(gpointer data)
                return FALSE;
                }
 
-       fd = cm->list->data;
+       fd = static_cast<FileData *>(cm->list->data);
 
        DEBUG_1("purge chk (%d) \"%s\"", (cm->clear && !cm->metadata), fd->path);
 
@@ -292,7 +292,7 @@ static gboolean cache_maintain_home_cb(gpointer data)
                                }
                        }
 
-               fd = cm->list->data;
+               fd = static_cast<FileData *>(cm->list->data);
                cm->done_list = g_list_remove(cm->done_list, fd);
                cm->list = g_list_remove(cm->list, fd);
                file_data_unref(fd);
@@ -302,7 +302,7 @@ static gboolean cache_maintain_home_cb(gpointer data)
                {
                const gchar *buf;
 
-               fd = cm->list->data;
+               fd = static_cast<FileData *>(cm->list->data);
                if (strlen(fd->path) > base_length)
                        {
                        buf = fd->path + base_length;
@@ -738,7 +738,7 @@ static gboolean cache_manager_render_file(CacheOpsData *cd)
                FileData *fd;
                gint success;
 
-               fd = cd->list->data;
+               fd = static_cast<FileData *>(cd->list->data);
                cd->list = g_list_remove(cd->list, fd);
 
                cd->tl = (ThumbLoaderStd *)thumb_loader_new(options->thumbnails.max_width, options->thumbnails.max_height);
@@ -771,7 +771,7 @@ static gboolean cache_manager_render_file(CacheOpsData *cd)
                {
                FileData *fd;
 
-               fd = cd->list_dir->data;
+               fd = static_cast<FileData *>(cd->list_dir->data);
                cd->list_dir = g_list_remove(cd->list_dir, fd);
 
                cache_manager_render_folder(cd, fd);
@@ -1010,7 +1010,7 @@ static gint cache_manager_standard_clean_clear_cb(gpointer data)
                {
                FileData *next_fd;
 
-               next_fd = cd->list->data;
+               next_fd = static_cast<FileData *>(cd->list->data);
                cd->list = g_list_remove(cd->list, next_fd);
 
                DEBUG_1("thumb removed: %s", next_fd->path);
@@ -1064,7 +1064,7 @@ static void cache_manager_standard_clean_valid_cb(const gchar *path, gboolean va
                {
                FileData *next_fd;
 
-               next_fd = cd->list->data;
+               next_fd = static_cast<FileData *>(cd->list->data);
                cd->list = g_list_remove(cd->list, next_fd);
 
                cd->tl = thumb_loader_std_thumb_file_validate(next_fd->path, cd->days,
@@ -1416,7 +1416,7 @@ static gboolean cache_manager_sim_file(CacheOpsData *cd)
        if (cd->list)
                {
                FileData *fd;
-               fd = cd->list->data;
+               fd = static_cast<FileData *>(cd->list->data);
                cd->list = g_list_remove(cd->list, fd);
 
                load_mask = CACHE_LOADER_DIMENSIONS | CACHE_LOADER_DATE | CACHE_LOADER_MD5SUM | CACHE_LOADER_SIMILARITY;
@@ -1440,7 +1440,7 @@ static gboolean cache_manager_sim_file(CacheOpsData *cd)
                {
                FileData *fd;
 
-               fd = cd->list_dir->data;
+               fd = static_cast<FileData *>(cd->list_dir->data);
                cd->list_dir = g_list_remove(cd->list_dir, fd);
 
                cache_manager_sim_folder((CacheOpsData *)cd, fd);
index e4cd3eb..700a7d5 100644 (file)
@@ -41,7 +41,7 @@ static gboolean collection_save_confirmed(FileDialog *fd, gboolean overwrite, Co
 static void collection_confirm_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
        FileDialog *fd = static_cast<FileDialog *>(data);
-       CollectionData *cd = GENERIC_DIALOG(fd)->data;
+       CollectionData *cd = static_cast<CollectionData *>(GENERIC_DIALOG(fd)->data);
 
        if (!collection_save_confirmed(fd, TRUE, cd))
                {
index 296e278..6997cea 100644 (file)
@@ -321,12 +321,12 @@ static void collection_load_thumb_step(CollectionData *cd)
                }
 
        work = cd->list;
-       ci = work->data;
+       ci = static_cast<CollectInfo *>(work->data);
        work = work->next;
        /* find first unloaded thumb */
        while (work && ci->pixbuf)
                {
-               ci = work->data;
+               ci = static_cast<CollectInfo *>(work->data);
                work = work->next;
                }
 
@@ -550,7 +550,7 @@ static void collect_manager_entry_free_data(CollectManagerEntry *entry)
                {
                CollectManagerAction *action;
 
-               action = work->data;
+               action = static_cast<CollectManagerAction *>(work->data);
                work = work->next;
 
                collect_manager_action_unref(action);
@@ -614,7 +614,7 @@ static CollectManagerEntry *collect_manager_get_entry(const gchar *path)
                {
                CollectManagerEntry *entry;
 
-               entry = work->data;
+               entry = static_cast<CollectManagerEntry *>(work->data);
                work = work->next;
                if (strcmp(entry->path, path) == 0)
                        {
@@ -640,7 +640,7 @@ static void collect_manager_entry_add_action(CollectManagerEntry *entry, Collect
                        return;
                        }
 
-               orig_action = g_hash_table_lookup(entry->newpath_hash, action->newpath);
+               orig_action = static_cast<CollectManagerAction *>(g_hash_table_lookup(entry->newpath_hash, action->newpath));
                if (orig_action)
                        {
                        /* target already exists */
@@ -654,7 +654,7 @@ static void collect_manager_entry_add_action(CollectManagerEntry *entry, Collect
                return;
                }
 
-       orig_action = g_hash_table_lookup(entry->newpath_hash, action->oldpath);
+       orig_action = static_cast<CollectManagerAction *>(g_hash_table_lookup(entry->newpath_hash, action->oldpath));
        if (orig_action)
                {
                /* new action with the same file */
@@ -681,7 +681,7 @@ static void collect_manager_entry_add_action(CollectManagerEntry *entry, Collect
                }
 
 
-       orig_action = g_hash_table_lookup(entry->oldpath_hash, action->oldpath);
+       orig_action = static_cast<CollectManagerAction *>(g_hash_table_lookup(entry->oldpath_hash, action->oldpath));
        if (orig_action)
                {
                /* another action for the same source, ignore */
@@ -708,7 +708,7 @@ static gboolean collect_manager_process_action(CollectManagerEntry *entry, gchar
                /* get new files */
                if (entry->add_list)
                        {
-                       action = entry->add_list->data;
+                       action = static_cast<CollectManagerAction *>(entry->add_list->data);
                        g_assert(action->oldpath == NULL);
                        entry->add_list = g_list_remove(entry->add_list, action);
                        path = g_strdup(action->newpath);
@@ -719,7 +719,7 @@ static gboolean collect_manager_process_action(CollectManagerEntry *entry, gchar
                return (path != NULL);
                }
 
-       action = g_hash_table_lookup(entry->oldpath_hash, path);
+       action = static_cast<CollectManagerAction *>(g_hash_table_lookup(entry->oldpath_hash, path));
 
        if (action)
                {
@@ -746,7 +746,7 @@ static void collect_manager_refresh(void)
                CollectManagerEntry *entry;
                GList *list_step;
 
-               entry = work->data;
+               entry = static_cast<CollectManagerEntry *>(work->data);
                work = work->next;
 
                list_step = list;
@@ -754,7 +754,7 @@ static void collect_manager_refresh(void)
                        {
                        FileData *fd;
 
-                       fd = list_step->data;
+                       fd = static_cast<FileData *>(list_step->data);
                        list_step = list_step->next;
 
                        if (strcmp(fd->path, entry->path) == 0)
@@ -778,7 +778,7 @@ static void collect_manager_refresh(void)
                {
                FileData *fd;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                collect_manager_entry_new(fd->path);
@@ -796,13 +796,13 @@ static void collect_manager_process_actions(gint max)
                CollectManagerAction *action;
                GList *work;
 
-               action = collection_manager_action_list->data;
+               action = static_cast<CollectManagerAction *>(collection_manager_action_list->data);
                work = collection_manager_entry_list;
                while (work)
                        {
                        CollectManagerEntry *entry;
 
-                       entry = work->data;
+                       entry = static_cast<CollectManagerEntry *>(work->data);
                        work = work->next;
 
                        if (action->type == COLLECTION_MANAGER_UPDATE)
@@ -869,7 +869,7 @@ static gboolean collect_manager_process_entry_list(void)
                {
                CollectManagerEntry *entry;
 
-               entry = work->data;
+               entry = static_cast<CollectManagerEntry *>(work->data);
                work = work->next;
                if (collect_manager_process_entry(entry)) return TRUE;
                }
@@ -1054,7 +1054,7 @@ void collect_manager_list(GList **names_exc, GList **names_inc, GList **paths)
 
        while (list)
                {
-               fd = list->data;
+               fd = static_cast<FileData *>(list->data);
                filename = g_strdup(filename_from_path((gchar *)fd->path));
 
                if (file_extension_match(filename, GQ_COLLECTION_EXT))
index be51bb1..6a28730 100644 (file)
@@ -503,7 +503,7 @@ static void collection_table_select_region_util(CollectTable *ct, CollectInfo *s
                work = g_list_find(ct->cd->list, start);
                while (work)
                        {
-                       info = work->data;
+                       info = static_cast<CollectInfo *>(work->data);
                        collection_table_select_util(ct, info, select);
 
                        if (work->data != end)
@@ -661,7 +661,7 @@ static void tip_update(CollectTable *ct, CollectInfo *info)
                                return;
                                }
 
-                       label = g_object_get_data(G_OBJECT(ct->tip_window), "tip_label");
+                       label = static_cast<GtkWidget *>(g_object_get_data(G_OBJECT(ct->tip_window), "tip_label"));
                        gtk_label_set_text(GTK_LABEL(label), ct->show_text ? ct->tip_info->fd->path : ct->tip_info->fd->name);
                        }
                }
@@ -711,9 +711,9 @@ static GList *collection_table_popup_file_list(CollectTable *ct)
 static void collection_table_popup_edit_cb(GtkWidget *widget, gpointer data)
 {
        CollectTable *ct;
-       const gchar *key = data;
+       const gchar *key = static_cast<const gchar *>(data);
 
-       ct = submenu_item_get_data(widget);
+       ct = static_cast<CollectTable *>(submenu_item_get_data(widget));
 
        if (!ct) return;
 
@@ -776,7 +776,7 @@ static void collection_table_popup_sort_cb(GtkWidget *widget, gpointer data)
        CollectTable *ct;
        SortType type;
 
-       ct = submenu_item_get_data(widget);
+       ct = static_cast<CollectTable *>(submenu_item_get_data(widget));
 
        if (!ct) return;
 
@@ -789,7 +789,7 @@ static void collection_table_popup_randomize_cb(GtkWidget *widget, gpointer UNUS
 {
        CollectTable *ct;
 
-       ct = submenu_item_get_data(widget);
+       ct = static_cast<CollectTable *>(submenu_item_get_data(widget));
 
        if (!ct) return;
 
@@ -900,7 +900,7 @@ static void collection_table_popup_goto_original_cb(GtkWidget *UNUSED(widget), g
        list = collection_table_selection_get_list(ct);
        if (list)
                {
-               fd = list->data;
+               fd = static_cast<FileData *>(list->data);
                if (fd)
                        {
                        layout_set_fd(lw, fd);
@@ -1408,7 +1408,7 @@ static CollectInfo *collection_table_insert_find(CollectTable *ct, CollectInfo *
                gtk_tree_model_get(store, &iter, CTABLE_COLUMN_POINTER, &list, -1);
 
                n = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), "column_number"));
-               info = g_list_nth_data(list, n);
+               info = static_cast<CollectInfo *>(g_list_nth_data(list, n));
 
                if (info)
                        {
@@ -1428,7 +1428,7 @@ static CollectInfo *collection_table_insert_find(CollectTable *ct, CollectInfo *
                        {
                        gint col;
 
-                       info = work->data;
+                       info = static_cast<CollectInfo *>(work->data);
                        *after = TRUE;
 
                        if (collection_table_find_iter(ct, info, &iter, &col))
@@ -1459,7 +1459,7 @@ static CollectInfo *collection_table_insert_point(CollectTable *ct, gint x, gint
                work = g_list_find(ct->cd->list, info);
                if (work && work->next)
                        {
-                       info = work->next->data;
+                       info = static_cast<CollectInfo *>(work->next->data);
                        }
                else
                        {
@@ -1851,7 +1851,7 @@ static void collection_table_populate(CollectTable *ct, gboolean resize)
                        gtk_tree_view_column_set_fixed_width(column, thumb_width + (THUMB_BORDER_PADDING * 6));
 
                        list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
-                       cell = (list) ? list->data : NULL;
+                       cell = static_cast<GtkCellRenderer *>((list) ? list->data : NULL);
                        g_list_free(list);
 
                        if (cell && GQV_IS_CELL_RENDERER_ICON(cell))
@@ -1940,7 +1940,7 @@ static void collection_table_sync(CollectTable *ct)
                        CollectInfo *info;
                        if (work)
                                {
-                               info = work->data;
+                               info = static_cast<CollectInfo *>(work->data);
                                work = work->next;
                                c++;
                                }
@@ -2502,7 +2502,7 @@ static void collection_table_cell_data_cb(GtkTreeViewColumn *UNUSED(tree_column)
         */
        if (cd->number == COLLECT_TABLE_MAX_COLUMNS) return;
 
-       info = g_list_nth_data(list, cd->number);
+       info = static_cast<CollectInfo *>(g_list_nth_data(list, cd->number));
 
        style = gtk_widget_get_style(ct->listview);
        if (info && (info->flag_mask & SELECTION_SELECTED) )
index e0a14bd..f32b4db 100644 (file)
@@ -403,7 +403,7 @@ void collection_contents(const gchar *name, GString **contents)
                work = cd->list;
                while (work)
                        {
-                       ci = work->data;
+                       ci = static_cast<CollectInfo *>(work->data);
                        fd = ci->fd;
                        *contents = g_string_append(*contents, g_strdup(fd->path));
                        *contents = g_string_append(*contents, "\n");
@@ -437,7 +437,7 @@ GList *collection_contents_fd(const gchar *name)
                work = cd->list;
                while (work)
                        {
-                       ci = work->data;
+                       ci = static_cast<CollectInfo *>(work->data);
                        list = g_list_append(list, ci->fd);
 
                        work = work->next;
@@ -586,7 +586,7 @@ CollectionData *collection_from_dnd_data(const gchar *data, GList **list, GList
                else
                        while (*ptr == '\n') ptr++;
 
-               info = g_list_nth_data(cd->list, item_number);
+               info = static_cast<CollectInfo *>(g_list_nth_data(cd->list, item_number));
                if (!info) continue;
 
                if (list) *list = g_list_append(*list, file_data_ref(info->fd));
@@ -638,7 +638,7 @@ gchar *collection_info_list_to_dnd_data(CollectionData *cd, GList *list, gint *l
        while (work)
                {
                gint len;
-               gchar *text = work->data;
+               gchar *text = static_cast<gchar *>(work->data);
 
                work = work->prev;
 
@@ -866,7 +866,7 @@ void collection_remove_by_info_list(CollectionData *cd, GList *list)
        work = list;
        while (work)
                {
-               cd->list = collection_list_remove(cd->list, work->data);
+               cd->list = collection_list_remove(cd->list, static_cast<CollectInfo *>(work->data));
                work = work->next;
                }
        cd->changed = (cd->list != NULL);
index b8cadd8..4260240 100644 (file)
@@ -221,7 +221,7 @@ static void color_man_cache_reset(void)
                {
                ColorManCache *cc;
 
-               cc = cm_cache_list->data;
+               cc = static_cast<ColorManCache *>(cm_cache_list->data);
                color_man_cache_free(cc);
                }
 }
@@ -238,7 +238,7 @@ static ColorManCache *color_man_cache_find(ColorManProfileType in_type, const gc
                ColorManCache *cc;
                gboolean match = FALSE;
 
-               cc = work->data;
+               cc = static_cast<ColorManCache *>(work->data);
                work = work->next;
 
                if (cc->profile_in_type == in_type &&
@@ -311,7 +311,7 @@ void color_man_correct_region(ColorMan *cm, GdkPixbuf *pixbuf, gint x, gint y, g
        pixbuf_width = gdk_pixbuf_get_width(pixbuf);
        pixbuf_height = gdk_pixbuf_get_height(pixbuf);
 
-       cc = cm->profile;
+       cc = static_cast<ColorManCache *>(cm->profile);
 
        pix = gdk_pixbuf_get_pixels(pixbuf);
        rs = gdk_pixbuf_get_rowstride(pixbuf);
@@ -466,7 +466,7 @@ gboolean color_man_get_status(ColorMan *cm, gchar **image_profile, gchar **scree
        ColorManCache *cc;
        if (!cm) return FALSE;
 
-       cc = cm->profile;
+       cc = static_cast<ColorManCache *>(cm->profile);
 
        if (image_profile) *image_profile = color_man_get_profile_name(cc->profile_in_type, cc->profile_in);
        if (screen_profile) *screen_profile = color_man_get_profile_name(cc->profile_out_type, cc->profile_out);
index 0de94c9..67b5781 100644 (file)
@@ -39,7 +39,7 @@ static gchar *regexp = NULL;
 
 static gboolean log_msg_cb(gpointer data)
 {
-       gchar *buf = data;
+       gchar *buf = static_cast<gchar *>(data);
        log_window_append(buf, LOG_MSG);
        g_free(buf);
        return FALSE;
@@ -55,7 +55,7 @@ static gboolean log_msg_cb(gpointer data)
  */
 static gboolean log_normal_cb(gpointer data)
 {
-       gchar *buf = data;
+       gchar *buf = static_cast<gchar *>(data);
        gchar *buf_casefold = g_utf8_casefold(buf, -1);
        gchar *error_casefold = g_utf8_casefold(_("error"), -1);
        gchar *warning_casefold = g_utf8_casefold(_("warning"), -1);
index 4e80e8c..9f771a8 100644 (file)
@@ -495,7 +495,7 @@ static void plugin_disable_cb(GtkCellRendererToggle *UNUSED(renderer), gchar *pa
                list = options->disabled_plugins;
                while (list)
                        {
-                       haystack = list->data;
+                       haystack = static_cast<gchar *>(list->data);
 
                        if (haystack && strcmp(haystack, path) == 0)
                                {
index 9a62c4e..edc8e3a 100644 (file)
@@ -175,8 +175,8 @@ hard_coded_window_keys dupe_window_keys[] = {
  */
 static void dupe_comparison_func(gpointer d1, gpointer d2)
 {
-       DupeQueueItem *dqi = d1;
-       DupeWindow *dw = d2;
+       DupeQueueItem *dqi = static_cast<DupeQueueItem *>(d1);
+       DupeWindow *dw = static_cast<DupeWindow *>(d2);
        DupeSearchMatch *dsm;
        DupeItem *di;
        GList *matches = NULL;
@@ -187,7 +187,7 @@ static void dupe_comparison_func(gpointer d1, gpointer d2)
                GList *work = dqi->work;
                while (work)
                        {
-                       di = work->data;
+                       di = static_cast<DupeItem *>(work->data);
 
                        /* forward for second set, back for simple compare */
                        if (dw->second_set)
@@ -664,7 +664,7 @@ static void dupe_listview_add(DupeWindow *dw, DupeItem *parent, DupeItem *child)
 
                if (child->group)
                        {
-                       dm = child->group->data;
+                       dm = static_cast<DupeMatch *>(child->group->data);
                        rank = (gint)floor(dm->rank);
                        }
                else
@@ -759,7 +759,7 @@ static void dupe_listview_populate(DupeWindow *dw)
                temp = g_list_last(parent->group);
                while (temp)
                        {
-                       DupeMatch *dm = temp->data;
+                       DupeMatch *dm = static_cast<DupeMatch *>(temp->data);
                        DupeItem *child;
 
                        child = dm->di;
@@ -2260,7 +2260,7 @@ static void dupe_loader_done_cb(ImageLoader *il, gpointer data)
 
        if (dw->setup_point)
                {
-               DupeItem *di = dw->setup_point->data;
+               DupeItem *di = static_cast<DupeItem *>(dw->setup_point->data);
 
                if (!di->simd)
                        {
@@ -2328,7 +2328,7 @@ static gboolean create_checksums_dimensions(DupeWindow *dw, GList *list)
 
                        while (dw->setup_point)
                                {
-                               DupeItem *di = dw->setup_point->data;
+                               DupeItem *di = static_cast<DupeItem *>(dw->setup_point->data);
 
                                dw->setup_point = dupe_setup_point_step(dw, dw->setup_point);
                                dw->setup_n++;
@@ -2365,7 +2365,7 @@ static gboolean create_checksums_dimensions(DupeWindow *dw, GList *list)
 
                        while (dw->setup_point)
                                {
-                               DupeItem *di = dw->setup_point->data;
+                               DupeItem *di = static_cast<DupeItem *>(dw->setup_point->data);
 
                                dw->setup_point = dupe_setup_point_step(dw, dw->setup_point);
                                dw->setup_n++;
@@ -2459,7 +2459,7 @@ static gboolean dupe_check_cb(gpointer data)
 
                        while (dw->setup_point)
                                {
-                               DupeItem *di = dw->setup_point->data;
+                               DupeItem *di = static_cast<DupeItem *>(dw->setup_point->data);
 
                                if (!di->simd)
                                        {
@@ -2536,7 +2536,7 @@ static gboolean dupe_check_cb(gpointer data)
                                {
                                dw->setup_n++;
                                dupe_window_update_progress(dw, _("Sorting..."), 0.0, FALSE);
-                               search_match_list_item = dw->search_matches_sorted->data;
+                               search_match_list_item = static_cast<DupeSearchMatch *>(dw->search_matches_sorted->data);
 
                                if (!dupe_match_link_exists(search_match_list_item->a, search_match_list_item->b))
                                        {
@@ -2698,7 +2698,7 @@ static void dupe_item_remove(DupeWindow *dw, DupeItem *di)
                                DupeItem *new_parent;
                                DupeMatch *dm;
 
-                               dm = parent->group->data;
+                               dm = static_cast<DupeMatch *>(parent->group->data);
                                new_parent = dm->di;
                                dupe_match_reparent(dw, parent, new_parent);
                                dupe_listview_remove(dw, parent);
@@ -2767,7 +2767,7 @@ static gboolean dupe_files_add_queue_cb(gpointer data)
                return FALSE;
                }
 
-       fd = queue->data;
+       fd = static_cast<FileData *>(queue->data);
        if (fd)
                {
                if (isfile(fd->path))
@@ -2888,7 +2888,7 @@ static void dupe_files_add(DupeWindow *dw, CollectionData *UNUSED(collection), C
        work = g_list_first(dw->list);
        while (work)
                {
-               di_list = work->data;
+               di_list = static_cast<DupeItem *>(work->data);
                if (di_list->fd == di->fd)
                        {
                        return;
@@ -2904,7 +2904,7 @@ static void dupe_files_add(DupeWindow *dw, CollectionData *UNUSED(collection), C
                work = g_list_first(dw->second_list);
                while (work)
                        {
-                       di_list = work->data;
+                       di_list = static_cast<DupeItem *>(work->data);
                        if (di_list->fd == di->fd)
                                {
                                return;
@@ -2933,14 +2933,14 @@ static void dupe_init_list_cache(DupeWindow *dw)
 
        for (GList *i = dw->list; i != NULL; i = i->next)
                {
-                       DupeItem *di = i->data;
+                       DupeItem *di = static_cast<DupeItem *>(i->data);
 
                        g_hash_table_add(dw->list_cache, di->fd);
                }
 
        for (GList *i = dw->second_list; i != NULL; i = i->next)
                {
-                       DupeItem *di = i->data;
+                       DupeItem *di = static_cast<DupeItem *>(i->data);
 
                        g_hash_table_add(dw->second_list_cache, di->fd);
                }
@@ -3269,7 +3269,7 @@ static void dupe_window_remove_selection(DupeWindow *dw, GtkWidget *listview)
                {
                DupeItem *di;
 
-               di = work->data;
+               di = static_cast<DupeItem *>(work->data);
                work = work->next;
                dupe_item_remove(dw, di);
                }
@@ -3366,9 +3366,9 @@ static void dupe_menu_select_dupes_set2_cb(GtkWidget *UNUSED(widget), gpointer d
 static void dupe_menu_edit_cb(GtkWidget *widget, gpointer data)
 {
        DupeWindow *dw;
-       const gchar *key = data;
+       const gchar *key = static_cast<const gchar *>(data);
 
-       dw = submenu_item_get_data(widget);
+       dw = static_cast<DupeWindow *>(submenu_item_get_data(widget));
        if (!dw) return;
 
        dupe_window_edit_selected(dw, key);
@@ -3493,7 +3493,7 @@ static void dupe_pop_menu_collections_cb(GtkWidget *widget, gpointer data)
        DupeWindow *dw;
        GList *selection_list;
 
-       dw = submenu_item_get_data(widget);
+       dw = static_cast<DupeWindow *>(submenu_item_get_data(widget));
        selection_list = dupe_listview_get_selection(dw, dw->listview);
        pop_menu_collections(selection_list, data);
 
@@ -4101,7 +4101,7 @@ static void dupe_listview_set_height(GtkWidget *listview, gboolean thumb)
 
        list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
        if (!list) return;
-       cell = list->data;
+       cell = static_cast<GtkCellRenderer *>(list->data);
        g_list_free(list);
 
        g_object_set(G_OBJECT(cell), "height", (thumb) ? options->thumbnails.max_height : -1, NULL);
@@ -4224,7 +4224,7 @@ static gboolean dupe_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, g
                GList *last;
 
                last = g_list_last(slist);
-               tpath = last->data;
+               tpath = static_cast<GtkTreePath *>(last->data);
 
                /* last is newest selected file */
                gtk_tree_model_get_iter(store, &iter, tpath);
@@ -5255,7 +5255,7 @@ static void export_duplicates_data_save_cb(FileDialog *fdlg, gpointer data)
        slist = gtk_tree_selection_get_selected_rows(selection, &store);
        work = slist;
 
-       tpath = work->data;
+       tpath = static_cast<GtkTreePath *>(work->data);
        gtk_tree_model_get_iter(store, &iter, tpath);
        gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, DUPE_COLUMN_COLOR, &color_new, -1);
        color_old = !color_new;
@@ -5263,7 +5263,7 @@ static void export_duplicates_data_save_cb(FileDialog *fdlg, gpointer data)
 
        while (work)
                {
-               tpath = work->data;
+               tpath = static_cast<GtkTreePath *>(work->data);
                gtk_tree_model_get_iter(store, &iter, tpath);
 
                gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, DUPE_COLUMN_POINTER, &di, -1);
@@ -5348,7 +5348,7 @@ static void export_duplicates_data_save_cb(FileDialog *fdlg, gpointer data)
 static void pop_menu_export(GList *UNUSED(selection_list), gpointer dupe_window, gpointer data)
 {
        const gint index = GPOINTER_TO_INT(data);
-       DupeWindow *dw = dupe_window;
+       DupeWindow *dw = static_cast<DupeWindow *>(dupe_window);
        gchar *title = "Export duplicates data";
        gchar *default_path = "/tmp/";
        gchar *file_extension;
@@ -5394,7 +5394,7 @@ static void dupe_pop_menu_export_cb(GtkWidget *widget, gpointer data)
        DupeWindow *dw;
        GList *selection_list;
 
-       dw = submenu_item_get_data(widget);
+       dw = static_cast<DupeWindow *>(submenu_item_get_data(widget));
        selection_list = dupe_listview_get_selection(dw, dw->listview);
        pop_menu_export(selection_list, dw, data);
 
index 293ae7b..6e59dfc 100644 (file)
@@ -380,7 +380,7 @@ gboolean editor_read_desktop_file(const gchar *path)
 
 static gboolean editor_remove_desktop_file_cb(gpointer UNUSED(key), gpointer value, gpointer UNUSED(user_data))
 {
-       EditorDescription *editor = value;
+       EditorDescription *editor = static_cast<EditorDescription *>(value);
        return editor->hidden || editor->ignored;
 }
 
@@ -476,7 +476,7 @@ GList *editor_get_desktop_files(void)
 static void editor_list_add_cb(gpointer UNUSED(key), gpointer value, gpointer data)
 {
        GList **listp = static_cast<GList **>(data);
-       EditorDescription *editor = value;
+       EditorDescription *editor = static_cast<EditorDescription *>(value);
 
        /* do not show the special commands in any list, they are called explicitly */
        if (strcmp(editor->key, CMD_COPY) == 0 ||
@@ -724,7 +724,7 @@ static gchar *editor_command_path_parse(const FileData *fd, gboolean consider_si
                        while (work)
                                {
                                GList *work2;
-                               gchar *ext = work->data;
+                               gchar *ext = static_cast<gchar *>(work->data);
                                work = work->next;
 
                                if (strcmp(ext, "*") == 0 ||
@@ -737,7 +737,7 @@ static gchar *editor_command_path_parse(const FileData *fd, gboolean consider_si
                                work2 = consider_sidecars ? fd->sidecar_files : NULL;
                                while (work2)
                                        {
-                                       FileData *sfd = work2->data;
+                                       FileData *sfd = static_cast<FileData *>(work2->data);
                                        work2 = work2->next;
 
                                        if (g_ascii_strcasecmp(ext, sfd->extension) == 0)
@@ -1040,7 +1040,7 @@ static void editor_child_exit_cb(GPid pid, gint status, gpointer data)
 static EditorFlags editor_command_one(const EditorDescription *editor, GList *list, EditorData *ed)
 {
        gchar *command;
-       FileData *fd = (ed->flags & EDITOR_NO_PARAM) ? NULL : list->data;;
+       FileData *fd = static_cast<FileData *>((ed->flags & EDITOR_NO_PARAM) ? NULL : list->data);;
        GPid pid;
        gint standard_output;
        gint standard_error;
@@ -1156,7 +1156,7 @@ static EditorFlags editor_command_next_start(EditorData *ed)
                FileData *fd;
                EditorFlags error;
 
-               fd = (ed->flags & EDITOR_NO_PARAM) ? NULL : ed->list->data;
+               fd = static_cast<FileData *>((ed->flags & EDITOR_NO_PARAM) ? NULL : ed->list->data);
 
                if (ed->vd)
                        {
@@ -1313,7 +1313,7 @@ EditorFlags start_editor_from_filelist_full(const gchar *key, GList *list, const
        EditorDescription *editor;
        if (!key) return EDITOR_ERROR_EMPTY;
 
-       editor = g_hash_table_lookup(editors, key);
+       editor = static_cast<EditorDescription *>(g_hash_table_lookup(editors, key));
 
        if (!editor) return EDITOR_ERROR_EMPTY;
        if (!list && !(editor->flags & EDITOR_NO_PARAM)) return EDITOR_ERROR_NO_FILE;
@@ -1368,7 +1368,7 @@ gboolean editor_window_flag_set(const gchar *key)
        EditorDescription *editor;
        if (!key) return TRUE;
 
-       editor = g_hash_table_lookup(editors, key);
+       editor = static_cast<EditorDescription *>(g_hash_table_lookup(editors, key));
        if (!editor) return TRUE;
 
        return !!(editor->flags & EDITOR_KEEP_FS);
@@ -1379,7 +1379,7 @@ gboolean editor_is_filter(const gchar *key)
        EditorDescription *editor;
        if (!key) return TRUE;
 
-       editor = g_hash_table_lookup(editors, key);
+       editor = static_cast<EditorDescription *>(g_hash_table_lookup(editors, key));
        if (!editor) return TRUE;
 
        return !!(editor->flags & EDITOR_DEST);
@@ -1390,7 +1390,7 @@ gboolean editor_no_param(const gchar *key)
        EditorDescription *editor;
        if (!key) return FALSE;
 
-       editor = g_hash_table_lookup(editors, key);
+       editor = static_cast<EditorDescription *>(g_hash_table_lookup(editors, key));
        if (!editor) return FALSE;
 
        return !!(editor->flags & EDITOR_NO_PARAM);
@@ -1401,7 +1401,7 @@ gboolean editor_blocks_file(const gchar *key)
        EditorDescription *editor;
        if (!key) return FALSE;
 
-       editor = g_hash_table_lookup(editors, key);
+       editor = static_cast<EditorDescription *>(g_hash_table_lookup(editors, key));
        if (!editor) return FALSE;
 
        /* Decide if the image file should be blocked during editor execution
index 950958c..ed39bb7 100644 (file)
@@ -1106,7 +1106,7 @@ gboolean exif_jpeg_parse_color(ExifData *exif, guchar *data, guint size)
                guint i;
 
                for (i = 0; i < chunk_count; i++) cp_length += chunk_length[i];
-               cp_data = g_malloc(cp_length);
+               cp_data = static_cast<guchar *>(g_malloc(cp_length));
 
                for (i = 0; i < chunk_count; i++)
                        {
index f05b853..6819a93 100644 (file)
@@ -101,7 +101,7 @@ void file_cache_set_size(FileCacheData *fc, gulong size)
        while (fc->size > size && work)
                {
                GList *prev;
-               last_fe = work->data;
+               last_fe = static_cast<FileCacheEntry *>(work->data);
                prev = work->prev;
                fc->list = g_list_delete_link(fc->list, work);
                work = prev;
@@ -157,7 +157,7 @@ static void file_cache_remove_fd(FileCacheData *fc, FileData *fd)
        while (work)
                {
                GList *current = work;
-               fe = work->data;
+               fe = static_cast<FileCacheEntry *>(work->data);
                work = work->next;
 
                if (fe->fd == fd)
index b5dca50..84390e2 100644 (file)
@@ -244,7 +244,7 @@ gboolean file_data_check_changed_files(FileData *fd)
                work = sidecars;
                while (work)
                        {
-                       sfd = work->data;
+                       sfd = static_cast<FileData *>(work->data);
                        work = work->next;
 
                        file_data_disconnect_sidecar_file(fd, sfd);
@@ -376,7 +376,7 @@ static FileData *file_data_new(const gchar *path_utf8, struct stat *st, gboolean
        if (!file_data_pool)
                file_data_pool = g_hash_table_new(g_str_hash, g_str_equal);
 
-       fd = g_hash_table_lookup(file_data_pool, path_utf8);
+       fd = static_cast<FileData *>(g_hash_table_lookup(file_data_pool, path_utf8));
        if (fd)
                {
                file_data_ref(fd);
@@ -384,7 +384,7 @@ static FileData *file_data_new(const gchar *path_utf8, struct stat *st, gboolean
 
        if (!fd && file_data_planned_change_hash)
                {
-               fd = g_hash_table_lookup(file_data_planned_change_hash, path_utf8);
+               fd = static_cast<FileData *>(g_hash_table_lookup(file_data_planned_change_hash, path_utf8));
                if (fd)
                        {
                        DEBUG_1("planned change: using %s -> %s", path_utf8, fd->path);
@@ -481,7 +481,7 @@ FileData *file_data_new_simple(const gchar *path_utf8)
                st.st_mtime = 0;
                }
 
-       fd = g_hash_table_lookup(file_data_pool, path_utf8);
+       fd = static_cast<FileData *>(g_hash_table_lookup(file_data_pool, path_utf8));
        if (!fd) fd = file_data_new(path_utf8, &st, TRUE);
        if (fd)
                {
@@ -709,7 +709,7 @@ void file_data_dump()
 
                while (list)
                        {
-                       fd = list->data;
+                       fd = static_cast<FileData *>(list->data);
                        log_printf("%-4d %s", fd->ref, fd->path);
                        list = list->next;
                        }
@@ -933,7 +933,7 @@ static gint sidecar_file_priority(const gchar *extension)
        work = sidecar_ext_get_list();
 
        while (work) {
-               gchar *ext = work->data;
+               gchar *ext = static_cast<gchar *>(work->data);
 
                work = work->next;
                if (g_ascii_strcasecmp(extension, ext) == 0) return i;
@@ -970,7 +970,7 @@ static void file_data_check_sidecars(const GList *basename_list)
                s_work = fd->sidecar_files;
                while (s_work)
                        {
-                       FileData *sfd = s_work->data;
+                       FileData *sfd = static_cast<FileData *>(s_work->data);
                        s_work = s_work->next;
                        g_assert(sfd->magick == FD_MAGICK);
                        DEBUG_2("                  sidecar: %p %s", (void *)sfd, sfd->name);
@@ -979,7 +979,7 @@ static void file_data_check_sidecars(const GList *basename_list)
                g_assert(fd->parent == NULL || fd->sidecar_files == NULL);
                }
 
-       parent_fd = basename_list->data;
+       parent_fd = static_cast<FileData *>(basename_list->data);
 
        /* check if the second and next entries of basename_list are already connected
           as sidecars of the first entry (parent_fd) */
@@ -1022,7 +1022,7 @@ static void file_data_check_sidecars(const GList *basename_list)
 
                while (fd->sidecar_files)
                        {
-                       FileData *sfd = fd->sidecar_files->data;
+                       FileData *sfd = static_cast<FileData *>(fd->sidecar_files->data);
                        g_assert(sfd->parent == NULL || sfd->sidecar_files == NULL);
                        file_data_ref(sfd);
                        file_data_disconnect_sidecar_file(fd, sfd);
@@ -1259,7 +1259,7 @@ static GList * file_data_basename_hash_insert(GHashTable *basename_hash, FileDat
        GList *list;
        gchar *basename = g_strndup(fd->path, fd->extension - fd->path);
 
-       list = g_hash_table_lookup(basename_hash, basename);
+       list = static_cast<GList *>(g_hash_table_lookup(basename_hash, basename));
 
        if (!list)
                {
@@ -1271,11 +1271,11 @@ static GList * file_data_basename_hash_insert(GHashTable *basename_hash, FileDat
                        DEBUG_1("TG: parent extension %s",parent_extension);
                        gchar *parent_basename = g_strndup(basename, parent_extension - basename);
                        DEBUG_1("TG: parent basename %s",parent_basename);
-                       FileData *parent_fd = g_hash_table_lookup(file_data_pool, basename);
+                       FileData *parent_fd = static_cast<FileData *>(g_hash_table_lookup(file_data_pool, basename));
                        if (parent_fd)
                                {
                                DEBUG_1("TG: parent fd found");
-                               list = g_hash_table_lookup(basename_hash, parent_basename);
+                               list = static_cast<GList *>(g_hash_table_lookup(basename_hash, parent_basename));
                                if (!g_list_find(list, parent_fd))
                                        {
                                        DEBUG_1("TG: parent fd doesn't fit");
@@ -1507,7 +1507,7 @@ FileData *file_data_new_group(const gchar *path_utf8)
 
        filelist_read_real(dir, &files, NULL, TRUE);
 
-       fd = g_hash_table_lookup(file_data_pool, path_utf8);
+       fd = static_cast<FileData *>(g_hash_table_lookup(file_data_pool, path_utf8));
        if (!fd) fd = file_data_new(path_utf8, &st, TRUE);
        if (fd)
                {
@@ -1545,7 +1545,7 @@ GList *filelist_copy(GList *list)
                {
                FileData *fd;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                new_list = g_list_prepend(new_list, file_data_ref(fd));
@@ -1564,7 +1564,7 @@ GList *filelist_from_path_list(GList *list)
                {
                gchar *path;
 
-               path = work->data;
+               path = static_cast<gchar *>(work->data);
                work = work->next;
 
                new_list = g_list_prepend(new_list, file_data_new_group(path));
@@ -1583,7 +1583,7 @@ GList *filelist_to_path_list(GList *list)
                {
                FileData *fd;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                new_list = g_list_prepend(new_list, g_strdup(fd->path));
@@ -1962,7 +1962,7 @@ GList *file_data_filter_class_list(GList *list, guint filter)
 
 static void file_data_notify_mark_func(gpointer UNUSED(key), gpointer value, gpointer UNUSED(user_data))
 {
-       FileData *fd = value;
+       FileData *fd = static_cast<FileData *>(value);
        file_data_increment_version(fd);
        file_data_send_notification(fd, NOTIFY_MARKS);
 }
@@ -2375,7 +2375,7 @@ static void file_data_update_planned_change_hash(FileData *fd, const gchar *old_
                        file_data_unref(fd);
                        }
 
-               ofd = g_hash_table_lookup(file_data_planned_change_hash, new_path);
+               ofd = static_cast<FileData *>(g_hash_table_lookup(file_data_planned_change_hash, new_path));
                if (ofd != fd)
                        {
                        if (ofd)
@@ -2747,7 +2747,7 @@ gint file_data_verify_ci(FileData *fd, GList *list)
                work = list;
                while (work)
                        {
-                       fd1 = work->data;
+                       fd1 = static_cast<FileData *>(work->data);
                        work = work->next;
                        if (fd1 != NULL && fd != fd1 )
                                {
@@ -2891,7 +2891,7 @@ gint file_data_verify_ci_list(GList *list, gchar **desc, gboolean with_sidecars)
                FileData *fd;
                gint error;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                error = with_sidecars ? file_data_sc_verify_ci(fd, list) : file_data_verify_ci(fd, list);
@@ -2923,7 +2923,7 @@ gint file_data_verify_ci_list(GList *list, gchar **desc, gboolean with_sidecars)
                        FileData *fd;
                        gint error;
 
-                       fd = work->data;
+                       fd = static_cast<FileData *>(work->data);
                        work = work->next;
 
                        error = errors[i] & ~common_errors;
@@ -3270,7 +3270,7 @@ static guint realtime_monitor_id = 0; /* event source id */
 
 static void realtime_monitor_check_cb(gpointer key, gpointer UNUSED(value), gpointer UNUSED(data))
 {
-       FileData *fd = key;
+       FileData *fd = static_cast<FileData *>(key);
 
        file_data_check_changed_files(fd);
 
@@ -3348,13 +3348,13 @@ gboolean file_data_unregister_real_time_monitor(FileData *fd)
 
 static void marks_get_files(gpointer key, gpointer value, gpointer userdata)
 {
-       gchar *file_name = key;
-       GString *result = userdata;
+       gchar *file_name = static_cast<gchar *>(key);
+       GString *result = static_cast<GString *>(userdata);
        FileData *fd;
 
        if (isfile(file_name))
                {
-               fd = value;
+               fd = static_cast<FileData *>(value);
                if (fd && fd->marks > 0)
                        {
                        g_string_append_printf(result, "%s,%i\n", fd->path, fd->marks);
@@ -3439,14 +3439,14 @@ gboolean marks_list_save(gchar *path, gboolean save)
 
 static void marks_clear(gpointer key, gpointer value, gpointer UNUSED(userdata))
 {
-       gchar *file_name = key;
+       gchar *file_name = static_cast<gchar *>(key);
        gint mark_no;
        gint n;
        FileData *fd;
 
        if (isfile(file_name))
                {
-               fd = value;
+               fd = static_cast<FileData *>(value);
                if (fd && fd->marks > 0)
                        {
                        n = 0;
index a9eb7ae..e7f259a 100644 (file)
@@ -214,7 +214,7 @@ void filter_add_defaults(void)
                GString *filter = NULL;
                guint i;
 
-               format = work->data;
+               format = static_cast<GdkPixbufFormat *>(work->data);
                work = work->next;
 
                name = gdk_pixbuf_format_get_name(format);
@@ -395,7 +395,7 @@ void filter_rebuild(void)
                {
                FilterEntry *fe;
 
-               fe = work->data;
+               fe = static_cast<FilterEntry *>(work->data);
                work = work->next;
 
                if (fe->enabled)
@@ -445,7 +445,7 @@ static const gchar *filter_name_find(GList *filter, const gchar *name)
        work = filter;
        while (work)
                {
-               gchar *filter = work->data;
+               gchar *filter = static_cast<gchar *>(work->data);
                guint lf = strlen(filter);
 
                if (ln >= lf)
@@ -583,7 +583,7 @@ static void sidecar_ext_free_list(void)
        work = sidecar_ext_list;
        while (work)
                {
-               gchar *ext = work->data;
+               gchar *ext = static_cast<gchar *>(work->data);
                work = work->next;
                g_free(ext);
                }
index df3f0cb..6f712c9 100644 (file)
@@ -615,7 +615,7 @@ enum {
 
 static void fullscreen_prefs_selection_cb(GtkWidget *combo, gpointer data)
 {
-       gint *value = data;
+       gint *value = static_cast<gint *>(data);
        GtkTreeModel *store;
        GtkTreeIter iter;
        GtkWidget *button;
@@ -626,7 +626,7 @@ static void fullscreen_prefs_selection_cb(GtkWidget *combo, gpointer data)
        if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combo), &iter)) return;
        gtk_tree_model_get(store, &iter, FS_MENU_COLUMN_VALUE, value, -1);
 
-       button = g_object_get_data(G_OBJECT(combo), BUTTON_ABOVE_KEY);
+       button = static_cast<GtkWidget *>(g_object_get_data(G_OBJECT(combo), BUTTON_ABOVE_KEY));
        if (button)
                {
                gtk_widget_set_sensitive(button, *value != -1);
index 9772787..a377c47 100644 (file)
@@ -83,7 +83,7 @@ void history_chain_append_end(const gchar *path)
                else
                        {
                        work = g_list_last(history_chain);
-                       if (g_strcmp0(work->data , path) != 0)
+                       if (g_strcmp0(work->data , path) != static_cast<const char *>(0))
                                {
                                history_chain = g_list_append (history_chain, g_strdup(path));
                                chain_index = g_list_length(history_chain) - 1;
@@ -158,7 +158,7 @@ void image_chain_append_end(const gchar *path)
                else
                        {
                        work = g_list_last(image_chain);
-                       if (g_strcmp0(work->data , path) != 0)
+                       if (g_strcmp0(work->data , path) != static_cast<const char *>(0))
                                {
                                image_chain = g_list_append(image_chain, g_strdup(path));
                                image_chain_index = g_list_length(image_chain) - 1;
@@ -300,7 +300,7 @@ gboolean history_list_save(const gchar *path)
                HistoryData *hd;
                GList *work;
 
-               hd = list->data;
+               hd = static_cast<HistoryData *>(list->data);
                list = list->prev;
 
                secure_fprintf(ssi, "[%s]\n", hd->key);
@@ -403,7 +403,7 @@ void history_list_add_to_key(const gchar *key, const gchar *path, gint max)
        work = hd->list;
        while (work)
                {
-               gchar *buf = work->data;
+               gchar *buf = static_cast<gchar *>(work->data);
 
                if (strcmp(buf, path) == 0)
                        {
@@ -459,7 +459,7 @@ void history_list_item_change(const gchar *key, const gchar *oldpath, const gcha
        work = hd->list;
        while (work)
                {
-               gchar *buf = work->data;
+               gchar *buf = static_cast<gchar *>(work->data);
                if (strcmp(buf, oldpath) == 0)
                        {
                        if (newpath)
@@ -490,7 +490,7 @@ void history_list_item_move(const gchar *key, const gchar *path, gint direction)
        work = hd->list;
        while (work)
                {
-               gchar *buf = work->data;
+               gchar *buf = static_cast<gchar *>(work->data);
                if (strcmp(buf, path) == 0)
                        {
                        p += direction;
@@ -552,13 +552,13 @@ gchar *get_recent_viewed_folder_image(gchar *path)
 
        while (work)
                {
-               dirname = g_path_get_dirname(work->data);
+               dirname = static_cast<const gchar *>(g_path_get_dirname(work->data));
 
                if (g_strcmp0(dirname, path) == 0)
                        {
                        if (isfile(work->data))
                                {
-                               ret = g_strdup(work->data);
+                               ret = static_cast<const gchar *>(g_strdup(work->data));
                                }
                        g_free(dirname);
                        break;
@@ -598,7 +598,7 @@ static void update_recent_viewed_folder_image_list(const gchar *path)
 
        while (work)
                {
-               list_dir = g_path_get_dirname(work->data);
+               list_dir = static_cast<const gchar *>(g_path_get_dirname(work->data));
 
                /* If folder already in list, update and move to start of list */
                if (g_strcmp0(list_dir, image_dir) == 0)
index bec04b0..81f99bd 100644 (file)
@@ -41,7 +41,7 @@ struct _ImageLoaderCOLLECTION {
 static gboolean image_loader_collection_load(gpointer loader, const guchar *UNUSED(buf), gsize UNUSED(count), GError **UNUSED(error))
 {
        ImageLoaderCOLLECTION *ld = (ImageLoaderCOLLECTION *) loader;
-       ImageLoader *il = ld->data;
+       ImageLoader *il = static_cast<ImageLoader *>(ld->data);
 
        #define LINE_LENGTH 1000
 
index 9a7a6f5..40a234e 100644 (file)
@@ -41,7 +41,7 @@ struct _ImageLoaderExternal {
 static gboolean image_loader_external_load(gpointer loader, const guchar *UNUSED(buf), gsize UNUSED(count), GError **UNUSED(error))
 {
        ImageLoaderExternal *ld = (ImageLoaderExternal *) loader;
-       ImageLoader *il = ld->data;
+       ImageLoader *il = static_cast<ImageLoader *>(ld->data);
        gchar *cmd_line;
        gchar *randname;
        gchar *tilde_filename;
index 9f5ad97..58fe950 100644 (file)
@@ -100,7 +100,7 @@ static void image_loader_ft_set_size(gpointer loader, int width, int height)
 static gboolean image_loader_ft_load (gpointer loader, const guchar *UNUSED(buf), gsize UNUSED(count), GError **UNUSED(error))
 {
        ImageLoaderFT *lft = (ImageLoaderFT *) loader;
-       ImageLoader *il = lft->data;
+       ImageLoader *il = static_cast<ImageLoader *>(lft->data);
 
        image_data *image = video_thumbnailer_create_image_data();
 
index f13efc1..2af9e60 100644 (file)
@@ -295,7 +295,7 @@ static gboolean image_loader_psd_load(gpointer loader, const guchar *buf, gsize
        ctx->state = PSD_STATE_HEADER;
 
        /* we'll allocate larger buffer once we know image size */
-       ctx->buffer = g_malloc(PSD_HEADER_SIZE);
+       ctx->buffer = static_cast<guchar *>(g_malloc(PSD_HEADER_SIZE));
        reset_context_buffer(ctx);
 
        ctx->ch_bufs = NULL;
index 6e569f2..6f9844f 100644 (file)
@@ -221,7 +221,7 @@ static gboolean image_loader_tiff_load (gpointer loader, const guchar *buf, gsiz
        lt->requested_height = height;
        lt->size_cb(loader, lt->requested_width, lt->requested_height, lt->data);
 
-       pixels = g_try_malloc (bytes);
+       pixels = static_cast<guchar *>(g_try_malloc (bytes));
 
        if (!pixels)
                {
index a5bd583..46cba4c 100644 (file)
@@ -771,7 +771,7 @@ static void image_loader_setup_loader(ImageLoader *il)
        else
                image_loader_backend_set_default(&il->backend);
 
-       il->loader = il->backend.loader_new(image_loader_area_updated_cb, image_loader_size_cb, image_loader_area_prepared_cb, il);
+       il->loader = static_cast<void *>(il->backend.loader_new(image_loader_area_updated_cb, image_loader_size_cb, image_loader_area_prepared_cb, il));
 
 #ifdef HAVE_TIFF
        format = il->backend.get_format_name(il->loader);
index 019f92e..2ba3e6c 100644 (file)
@@ -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;
 }
 
index ed7aaba..d14c399 100644 (file)
@@ -1971,7 +1971,7 @@ gboolean image_color_profile_get_status(ImageWindow *imd, gchar **image_profile,
        ColorMan *cm;
        if (!imd) return FALSE;
 
-       cm = imd->cm;
+       cm = static_cast<ColorMan *>(imd->cm);
        if (!cm) return FALSE;
        return color_man_get_status(cm, image_profile, screen_profile);
 
@@ -2076,7 +2076,7 @@ void image_options_sync(void)
                {
                ImageWindow *imd;
 
-               imd = work->data;
+               imd = static_cast<ImageWindow *>(work->data);
                work = work->next;
 
                image_options_set(imd);
index 7cb7b4b..6219f98 100644 (file)
@@ -260,7 +260,7 @@ static void view_list_step(ViewWindow *vw, gboolean next)
                        {
                        FileData *temp;
 
-                       temp = work->data;
+                       temp = static_cast<FileData *>(work->data);
 
                        if (fd == temp)
                                {
@@ -289,12 +289,12 @@ static void view_list_step(ViewWindow *vw, gboolean next)
        if (!work) return;
 
        vw->list_pointer = work;
-       fd = work->data;
+       fd = static_cast<FileData *>(work->data);
        image_change_fd(imd, fd, image_zoom_get_default(imd));
 
        if (options->image.enable_read_ahead && work_ahead)
                {
-               FileData *next_fd = work_ahead->data;
+               FileData *next_fd = static_cast<FileData *>(work_ahead->data);
                image_prebuffer_set(imd, next_fd);
                }
 }
@@ -320,12 +320,12 @@ static void view_list_step_to_end(ViewWindow *vw, gboolean last)
                }
 
        vw->list_pointer = work;
-       fd = work->data;
+       fd = static_cast<FileData *>(work->data);
        image_change_fd(imd, fd, image_zoom_get_default(imd));
 
        if (options->image.enable_read_ahead && work_ahead)
                {
-               FileData *next_fd = work_ahead->data;
+               FileData *next_fd = static_cast<FileData *>(work_ahead->data);
                image_prebuffer_set(imd, next_fd);
                }
 }
@@ -807,7 +807,7 @@ static void view_slideshow_stop_func(SlideShowData *UNUSED(fs), gpointer data)
                {
                FileData *temp;
 
-               temp = work->data;
+               temp = static_cast<FileData *>(work->data);
                if (fd == temp)
                        {
                        vw->list_pointer = work;
@@ -947,7 +947,7 @@ static ViewWindow *real_view_window_new(FileData *fd, GList *list, CollectionDat
                vw->list_pointer = vw->list;
                image_change_fd(vw->imd, (FileData *)vw->list->data, image_zoom_get_default(NULL));
                /* Set fd to first in list */
-               fd = vw->list->data;
+               fd = static_cast<FileData *>(vw->list->data);
 
                if (options->image.enable_read_ahead)
                        {
@@ -1142,9 +1142,9 @@ static void view_edit_cb(GtkWidget *widget, gpointer data)
 {
        ViewWindow *vw;
        ImageWindow *imd;
-       const gchar *key = data;
+       const gchar *key = static_cast<const gchar *>(data);
 
-       vw = submenu_item_get_data(widget);
+       vw = static_cast<ViewWindow *>(submenu_item_get_data(widget));
        if (!vw) return;
 
        if (!editor_window_flag_set(key))
@@ -1161,7 +1161,7 @@ static void view_alter_cb(GtkWidget *widget, gpointer data)
        ViewWindow *vw;
        AlterType type;
 
-       vw = submenu_item_get_data(widget);
+       vw = static_cast<ViewWindow *>(submenu_item_get_data(widget));
        type = GPOINTER_TO_INT(data);
 
        if (!vw) return;
@@ -1360,7 +1360,7 @@ static void image_pop_menu_collections_cb(GtkWidget *widget, gpointer data)
        FileData *fd;
        GList *selection_list = NULL;
 
-       vw = submenu_item_get_data(widget);
+       vw = static_cast<ViewWindow *>(submenu_item_get_data(widget));
        imd = view_window_active_image(vw);
        fd = image_get_fd(imd);
        selection_list = g_list_append(selection_list, fd);
@@ -1521,13 +1521,13 @@ static void view_dir_list_do(ViewWindow *vw, GList *list, gboolean skip, gboolea
                FileData *fd;
 
                vw->list_pointer = vw->list;
-               fd = vw->list->data;
+               fd = static_cast<FileData *>(vw->list->data);
                image_change_fd(vw->imd, fd, image_zoom_get_default(vw->imd));
 
                work = vw->list->next;
                if (options->image.enable_read_ahead && work)
                        {
-                       fd = work->data;
+                       fd = static_cast<FileData *>(work->data);
                        image_prebuffer_set(vw->imd, fd);
                        }
                }
@@ -1644,7 +1644,7 @@ static void view_window_get_dnd_data(GtkWidget *UNUSED(widget), GdkDragContext *
                        {
                        FileData *fd;
 
-                       fd = list->data;
+                       fd = static_cast<FileData *>(list->data);
                        if (isfile(fd->path))
                                {
                                view_slideshow_stop(vw);
@@ -1767,7 +1767,7 @@ static void view_real_removed(ViewWindow *vw, FileData *fd)
                        FileData *chk_fd;
                        GList *chk_link;
 
-                       chk_fd = work->data;
+                       chk_fd = static_cast<FileData *>(work->data);
                        chk_link = work;
                        work = work->next;
 
@@ -1789,7 +1789,7 @@ static void view_real_removed(ViewWindow *vw, FileData *fd)
 
                        if (vw->list_pointer)
                                {
-                               fd = vw->list_pointer->data;
+                               fd = static_cast<FileData *>(vw->list_pointer->data);
                                }
                        else
                                {
index a7e4278..f43a7ae 100644 (file)
@@ -165,12 +165,12 @@ void layout_config_set(GtkWidget *widget, gint style, const gchar *order)
        GtkWidget *button;
        gint a, b, c;
 
-       lc = g_object_get_data(G_OBJECT(widget), "layout_config");
+       lc = static_cast<LayoutConfig *>(g_object_get_data(G_OBJECT(widget), "layout_config"));
 
        if (!lc) return;
 
        style = CLAMP(style, 0, layout_config_style_count);
-       button = g_list_nth_data(lc->style_widgets, style);
+       button = static_cast<GtkWidget *>(g_list_nth_data(lc->style_widgets, style));
        if (!button) return;
 
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), TRUE);
@@ -186,7 +186,7 @@ gchar *layout_config_get(GtkWidget *widget, gint *style)
 {
        LayoutConfig *lc;
 
-       lc = g_object_get_data(G_OBJECT(widget), "layout_config");
+       lc = static_cast<LayoutConfig *>(g_object_get_data(G_OBJECT(widget), "layout_config"));
 
        /* this should not happen */
        if (!lc) return NULL;
@@ -204,7 +204,7 @@ static void layout_config_widget_click_cb(GtkWidget *widget, gpointer data)
 {
        LayoutConfig *lc;
 
-       lc = g_object_get_data(G_OBJECT(widget), "layout_config");
+       lc = static_cast<LayoutConfig *>(g_object_get_data(G_OBJECT(widget), "layout_config"));
 
        if (lc) lc->style = GPOINTER_TO_INT(data);
 }
index fb3cd5d..e043fff 100644 (file)
@@ -509,9 +509,9 @@ static void li_pop_menu_zoom_fit_cb(GtkWidget *UNUSED(widget), gpointer data)
 static void li_pop_menu_edit_cb(GtkWidget *widget, gpointer data)
 {
        LayoutWindow *lw;
-       const gchar *key = data;
+       const gchar *key = static_cast<const gchar *>(data);
 
-       lw = submenu_item_get_data(widget);
+       lw = static_cast<LayoutWindow *>(submenu_item_get_data(widget));
 
        if (!editor_window_flag_set(key))
                {
@@ -525,7 +525,7 @@ static void li_pop_menu_alter_cb(GtkWidget *widget, gpointer data)
        LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        AlterType type;
 
-       lw = submenu_item_get_data(widget);
+       lw = static_cast<LayoutWindow *>(submenu_item_get_data(widget));
        type = (AlterType)GPOINTER_TO_INT(data);
 
        image_alter_orientation(lw->image, lw->image->image_fd, type);
@@ -546,7 +546,7 @@ static GtkWidget *li_pop_menu_click_parent(GtkWidget *widget, LayoutWindow *lw)
        menu = gtk_widget_get_toplevel(widget);
        if (!menu) return NULL;
 
-       parent = g_object_get_data(G_OBJECT(menu), "click_parent");
+       parent = static_cast<GtkWidget *>(g_object_get_data(G_OBJECT(menu), "click_parent"));
 
        if (!parent && lw->full_screen)
                {
@@ -746,7 +746,7 @@ static void layout_pop_menu_collections_cb(GtkWidget *widget, gpointer data)
        LayoutWindow *lw;
        GList *selection_list = NULL;
 
-       lw = submenu_item_get_data(widget);
+       lw = static_cast<LayoutWindow *>(submenu_item_get_data(widget));
        selection_list = g_list_append(selection_list, layout_image_get_fd(lw));
        pop_menu_collections(selection_list, data);
 
@@ -932,7 +932,7 @@ static void layout_image_dnd_receive(GtkWidget *widget, GdkDragContext *UNUSED(c
 
                if (list)
                        {
-                       FileData *fd = list->data;
+                       FileData *fd = static_cast<FileData *>(list->data);
 
                        if (isfile(fd->path))
                                {
@@ -1222,12 +1222,12 @@ void layout_image_alter_orientation(LayoutWindow *lw, AlterType type)
                {
                if (lw->vf->type == FILEVIEW_ICON)
                        {
-                       fd_n = work->data;
+                       fd_n = static_cast<FileData *>(work->data);
                        work = work->next;
                        }
                else
                        {
-                       tpath = work->data;
+                       tpath = static_cast<GtkTreePath *>(work->data);
                        gtk_tree_model_get_iter(store, &iter, tpath);
                        gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd_n, -1);
                        work = work->next;
@@ -1271,12 +1271,12 @@ void layout_image_rating(LayoutWindow *lw, const gchar *rating)
                {
                if (lw->vf->type == FILEVIEW_ICON)
                        {
-                       fd_n = work->data;
+                       fd_n = static_cast<FileData *>(work->data);
                        work = work->next;
                        }
                else
                        {
-                       tpath = work->data;
+                       tpath = static_cast<GtkTreePath *>(work->data);
                        gtk_tree_model_get_iter(store, &iter, tpath);
                        gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd_n, -1);
                        work = work->next;
index 17c2fbf..e1c4e41 100644 (file)
@@ -561,12 +561,12 @@ static void layout_menu_write_rotate(GtkToggleAction *UNUSED(action), gpointer d
                {
                if (lw->vf->type == FILEVIEW_ICON)
                        {
-                       fd_n = work->data;
+                       fd_n = static_cast<FileData *>(work->data);
                        work = work->next;
                        }
                else
                        {
-                       tpath = work->data;
+                       tpath = static_cast<GtkTreePath *>(work->data);
                        gtk_tree_model_get_iter(store, &iter, tpath);
                        gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &fd_n, -1);
                        work = work->next;
@@ -1878,7 +1878,7 @@ static void layout_menu_recent_cb(GtkWidget *widget, gpointer UNUSED(data))
 
        n = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "recent_index"));
 
-       path = g_list_nth_data(history_list_get_by_key("recent"), n);
+       path = static_cast<gchar *>(g_list_nth_data(history_list_get_by_key("recent"), n));
 
        if (!path) return;
 
@@ -2031,7 +2031,7 @@ static GList *layout_window_menu_list(GList *listin)
                        dupe = FALSE;
                        while (list)
                                {
-                               lw_tmp = list->data;
+                               lw_tmp = static_cast<LayoutWindow *>(list->data);
                                if (g_strcmp0(lw_tmp->options.id, name_base) == 0)
                                        {
                                        dupe = TRUE;
@@ -2065,7 +2065,7 @@ static void layout_menu_new_window_cb(GtkWidget *UNUSED(widget), gpointer data)
        GList *menulist = NULL;
 
        menulist = layout_window_menu_list(menulist);
-       WindowNames *wn = g_list_nth(menulist, n )->data;
+       WindowNames *wn = static_cast<WindowNames *>(g_list_nth(menulist, n )->data);
 
        if (wn->path)
                {
@@ -2110,7 +2110,7 @@ static void layout_menu_new_window_update(LayoutWindow *lw)
        n = 0;
        while (list)
                {
-               wn = list->data;
+               wn = static_cast<WindowNames *>(list->data);
                item = menu_item_add_simple(sub_menu, wn->name, G_CALLBACK(layout_menu_new_window_cb), GINT_TO_POINTER(n));
                if (wn->displayed)
                        {
@@ -2143,7 +2143,7 @@ static void window_rename_ok(GenericDialog *UNUSED(gd), gpointer data)
        list = layout_window_menu_list(list);
        while (list)
                {
-               WindowNames *ln = list->data;
+               WindowNames *ln = static_cast<WindowNames *>(list->data);
                if (g_strcmp0(ln->name, new_id) == 0)
                        {
                        gchar *buf;
@@ -3110,7 +3110,7 @@ static void layout_actions_editor_add(GString *desc, GList *path, GList *old_pat
 
        for (i =  0; i < to_close; i++)
                {
-               gchar *name = old_path->data;
+               gchar *name = static_cast<gchar *>(old_path->data);
                if (g_str_has_suffix(name, "Section"))
                        {
                        g_string_append(desc,   "      </placeholder>");
@@ -3128,7 +3128,7 @@ static void layout_actions_editor_add(GString *desc, GList *path, GList *old_pat
 
        for (i =  0; i < to_open; i++)
                {
-               gchar *name = path->data;
+               gchar *name = static_cast<gchar *>(path->data);
                if (g_str_has_suffix(name, "Section"))
                        {
                        g_string_append_printf(desc,    "      <placeholder name='%s'>", name);
@@ -3495,13 +3495,13 @@ void layout_toolbar_add_default(LayoutWindow *lw, ToolbarType type)
                case TOOLBAR_MAIN:
                        if (layout_window_list)
                                {
-                               lw_first = layout_window_list->data;
+                               lw_first = static_cast<LayoutWindow *>(layout_window_list->data);
                                if (lw_first->toolbar_actions[TOOLBAR_MAIN])
                                        {
                                        work_action = lw_first->toolbar_actions[type];
                                        while (work_action)
                                                {
-                                               gchar *action = work_action->data;
+                                               gchar *action = static_cast<gchar *>(work_action->data);
                                                work_action = work_action->next;
                                                layout_toolbar_add(lw, type, action);
                                                }
@@ -3541,13 +3541,13 @@ void layout_toolbar_add_default(LayoutWindow *lw, ToolbarType type)
                case TOOLBAR_STATUS:
                        if (layout_window_list)
                                {
-                               lw_first = layout_window_list->data;
+                               lw_first = static_cast<LayoutWindow *>(layout_window_list->data);
                                if (lw_first->toolbar_actions[TOOLBAR_MAIN])
                                        {
                                        work_action = lw_first->toolbar_actions[type];
                                        while (work_action)
                                                {
-                                               gchar *action = work_action->data;
+                                               gchar *action = static_cast<gchar *>(work_action->data);
                                                work_action = work_action->next;
                                                layout_toolbar_add(lw, type, action);
                                                }
@@ -3597,7 +3597,7 @@ void layout_toolbar_write_config(LayoutWindow *lw, ToolbarType type, GString *ou
        WRITE_NL(); WRITE_STRING("<clear/>");
        while (work)
                {
-               gchar *action = work->data;
+               gchar *action = static_cast<gchar *>(work->data);
                work = work->next;
                WRITE_NL(); WRITE_STRING("<toolitem ");
                write_char_option(outstr, indent + 1, "action", action);
index bfe4e5a..b301e38 100644 (file)
@@ -82,7 +82,7 @@ gboolean layout_valid(LayoutWindow **lw)
        if (*lw == NULL)
                {
                if (current_lw) *lw = current_lw;
-               else if (layout_window_list) *lw = layout_window_list->data;
+               else if (layout_window_list) *lw = static_cast<LayoutWindow *>(layout_window_list->data);
                return (*lw != NULL);
                }
        return (g_list_find(layout_window_list, *lw) != NULL);
@@ -202,7 +202,7 @@ static void layout_box_folders_changed_cb(GtkWidget *widget, gpointer UNUSED(dat
        work = layout_window_list;
        while (work)
                {
-               lw = work->data;
+               lw = static_cast<LayoutWindow *>(work->data);
                lw->options.folder_window.vdivider_pos = gtk_paned_get_position(GTK_PANED(widget));
                work = work->next;
                }
@@ -306,7 +306,7 @@ static gboolean path_entry_tooltip_cb(GtkWidget *widget, gpointer UNUSED(data))
        gchar *current_path;
 
        box_child_list = gtk_container_get_children(GTK_CONTAINER(widget));
-       path_entry = box_child_list->data;
+       path_entry = static_cast<GtkComboBox *>(box_child_list->data);
        current_path = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(path_entry));
        gtk_widget_set_tooltip_text(GTK_WIDGET(widget), current_path);
 
@@ -408,7 +408,7 @@ static void layout_sort_menu_cb(GtkWidget *widget, gpointer data)
 
        if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return;
 
-       lw = submenu_item_get_data(widget);
+       lw = static_cast<LayoutWindow *>(submenu_item_get_data(widget));
        if (!lw) return;
 
        type = (SortType)GPOINTER_TO_INT(data);
@@ -3041,7 +3041,7 @@ LayoutWindow *layout_new_from_default()
        if (success)
                {
                work = g_list_last(layout_window_list);
-               lw = work->data;
+               lw = static_cast<LayoutWindow *>(work->data);
                g_free(lw->options.id);
                lw->options.id = g_strdup(layout_get_unique_id());
                }
index c8be49a..268e2c2 100644 (file)
@@ -353,7 +353,7 @@ static gboolean debug_changed_cb(GtkSpinButton *widget, LogWindow *UNUSED(logwin
 
 static void search_entry_icon_cb(GtkEntry *UNUSED(entry), GtkEntryIconPosition pos, GdkEvent *UNUSED(event), gpointer userdata)
 {
-       LogWindow *logwin = userdata;
+       LogWindow *logwin = static_cast<LogWindow *>(userdata);
        GtkTextIter start_find;
        GtkTextIter end_find;
        GtkTextBuffer *buffer;
index 107a2e6..c87c26f 100644 (file)
@@ -612,7 +612,7 @@ static void parse_command_line(gint argc, gchar *argv[])
 
                        while (work)
                                {
-                               gchar *opt = work->data;
+                               gchar *opt = static_cast<gchar *>(work->data);
 
                                command_line_errors = g_string_append(command_line_errors, opt);
                                command_line_errors = g_string_append(command_line_errors, "\n");
@@ -1019,7 +1019,7 @@ static void exit_program_final(void)
                list = layout_window_list;
                while (list)
                        {
-                       tmp_lw = list->data;
+                       tmp_lw = static_cast<LayoutWindow *>(list->data);
                        if (!g_str_has_prefix(tmp_lw->options.id, "lw"))
                                {
                                save_layout(list->data);
@@ -1199,7 +1199,7 @@ static void set_theme_bg_color()
        if (!options->image.use_custom_border_color)
                {
                work = layout_window_list;
-               lw = work->data;
+               lw = static_cast<LayoutWindow *>(work->data);
 
                style_context = gtk_widget_get_style_context(lw->window);
                gtk_style_context_get_background_color(style_context, GTK_STATE_FLAG_NORMAL, &bg_color);
@@ -1210,7 +1210,7 @@ static void set_theme_bg_color()
 
                while (work)
                        {
-                       lw = work->data;
+                       lw = static_cast<LayoutWindow *>(work->data);
                        image_background_set_color(lw->image, &theme_color);
                        work = work->next;
                        }
@@ -1441,7 +1441,7 @@ gint main(gint argc, gchar *argv[])
                                CollectWindow *cw;
                                const gchar *path;
 
-                               path = work->data;
+                               path = static_cast<const gchar *>(work->data);
                                work = work->next;
 
                                cw = collection_window_new(path);
@@ -1472,7 +1472,7 @@ gint main(gint argc, gchar *argv[])
                                {
                                gchar *dirname;
 
-                               dirname = g_path_get_dirname(work->data);
+                               dirname = static_cast<const gchar *>(g_path_get_dirname(work->data));
                                if (!path)
                                        {
                                        path = g_strdup(dirname);
@@ -1508,7 +1508,7 @@ gint main(gint argc, gchar *argv[])
                                {
                                FileData *fd;
 
-                               fd = file_data_new_simple(work->data);
+                               fd = file_data_new_simple(static_cast<const gchar *>(work->data));
                                collection_add(cd, fd, FALSE);
                                file_data_unref(fd);
                                work = work->next;
index dca25fb..8f75cb7 100644 (file)
@@ -378,7 +378,7 @@ gchar *md5_digest_to_text(guchar digest[16])
        gchar *result;
        gint i;
 
-       result = g_malloc(33);
+       result = static_cast<gchar *>(g_malloc(33));
        for (i = 0; i < 16; i++)
                {
                result[2*i] = hex_digits[digest[i] >> 4];
index dc79c40..ea723cc 100644 (file)
@@ -432,7 +432,7 @@ static void add_collection_list(GtkWidget *menu, GCallback func,
        work = collection_list;
        while (work)
                {
-               const gchar *collection_name = work->data;
+               const gchar *collection_name = static_cast<const gchar *>(work->data);
 
                menu_item_add(menu, collection_name, func,
                                                                                                        GINT_TO_POINTER(index));
@@ -486,7 +486,7 @@ void pop_menu_collections(GList *selection_list, gpointer data)
        if (index >= 0)
                {
                collect_manager_list(&collection_list, NULL, NULL);
-               collection_name = g_list_nth_data(collection_list, index);
+               collection_name = static_cast<gchar *>(g_list_nth_data(collection_list, index));
                name = collection_path(collection_name);
                cw = collection_window_new(name);
                g_free(name);
index 7ea81c4..3402b4c 100644 (file)
@@ -92,7 +92,7 @@ static void metadata_cache_update(FileData *fd, const gchar *key, const GList *v
        while (work)
                {
                GList *entry = static_cast<GList *>(work->data);
-               gchar *entry_key = entry->data;
+               gchar *entry_key = static_cast<gchar *>(entry->data);
 
                if (strcmp(entry_key, key) == 0)
                        {
@@ -123,7 +123,7 @@ static const GList *metadata_cache_get(FileData *fd, const gchar *key)
        while (work)
                {
                GList *entry = static_cast<GList *>(work->data);
-               gchar *entry_key = entry->data;
+               gchar *entry_key = static_cast<gchar *>(entry->data);
 
                if (strcmp(entry_key, key) == 0)
                        {
@@ -145,7 +145,7 @@ static void metadata_cache_remove(FileData *fd, const gchar *key)
        while (work)
                {
                GList *entry = static_cast<GList *>(work->data);
-               gchar *entry_key = entry->data;
+               gchar *entry_key = static_cast<gchar *>(entry->data);
 
                if (strcmp(entry_key, key) == 0)
                        {
@@ -447,7 +447,7 @@ static gboolean metadata_file_write(gchar *path, const GList *keywords, const gc
        secure_fprintf(ssi, "[keywords]\n");
        while (keywords && secsave_errno == SS_ERR_NONE)
                {
-               const gchar *word = keywords->data;
+               const gchar *word = static_cast<const gchar *>(keywords->data);
                keywords = keywords->next;
 
                secure_fprintf(ssi, "%s\n", word);
@@ -651,7 +651,7 @@ static GList *remove_duplicate_strings_from_list(GList *list)
 
        while (work)
                {
-               gchar *key = work->data;
+               gchar *key = static_cast<gchar *>(work->data);
 
                if (g_hash_table_lookup(hashtable, key) == NULL)
                        {
@@ -677,7 +677,7 @@ GList *metadata_read_list(FileData *fd, const gchar *key, MetadataFormat format)
        /* unwritten data override everything */
        if (fd->modified_xmp && format == METADATA_PLAIN)
                {
-               list = g_hash_table_lookup(fd->modified_xmp, key);
+               list = static_cast<GList *>(g_hash_table_lookup(fd->modified_xmp, key));
                if (list) return string_list_copy(list);
                }
 
@@ -740,7 +740,7 @@ gchar *metadata_read_string(FileData *fd, const gchar *key, MetadataFormat forma
        GList *string_list = metadata_read_list(fd, key, format);
        if (string_list)
                {
-               gchar *str = string_list->data;
+               gchar *str = static_cast<gchar *>(string_list->data);
                string_list->data = NULL;
                string_list_free(string_list);
                return str;
@@ -939,7 +939,7 @@ gchar *find_string_in_list_utf8nocase(GList *list, const gchar *string)
 
        while (list)
                {
-               gchar *haystack = list->data;
+               gchar *haystack = static_cast<gchar *>(list->data);
 
                if (haystack)
                        {
@@ -970,7 +970,7 @@ gchar *find_string_in_list_utf8case(GList *list, const gchar *string)
 {
        while (list)
                {
-               gchar *haystack = list->data;
+               gchar *haystack = static_cast<gchar *>(list->data);
 
                if (haystack && strcmp(haystack, string) == 0)
                        return haystack;
@@ -1109,7 +1109,7 @@ void meta_data_connect_mark_with_keyword(GtkTreeModel *keyword_tree, GtkTreeIter
                if (get_mark_func == meta_data_get_keyword_mark)
                        {
                        GtkTreeIter old_kw_iter;
-                       GList *old_path = mark_func_data;
+                       GList *old_path = static_cast<GList *>(mark_func_data);
 
                        if (keyword_tree_get_iter(keyword_tree, &old_kw_iter, old_path) &&
                            (i == mark || /* release any previous connection of given mark */
@@ -1385,7 +1385,7 @@ static gboolean keyword_tree_is_set_casefold(GtkTreeModel *keyword_tree, GtkTree
                        gchar *iter_casefold = keyword_get_casefold(keyword_tree, &iter);
                        while (work)
                                {
-                               const gchar *casefold = work->data;
+                               const gchar *casefold = static_cast<const gchar *>(work->data);
                                work = work->next;
 
                                if (strcmp(iter_casefold, casefold) == 0)
@@ -1432,7 +1432,7 @@ static gboolean keyword_tree_is_set_casefull(GtkTreeModel *keyword_tree, GtkTree
                        gchar *iter_name = keyword_get_name(keyword_tree, &iter);
                        while (work)
                                {
-                               const gchar *name = work->data;
+                               const gchar *name = static_cast<const gchar *>(work->data);
                                work = work->next;
 
                                if (strcmp(iter_name, name) == 0)
@@ -1465,7 +1465,7 @@ gboolean keyword_tree_is_set(GtkTreeModel *keyword_tree, GtkTreeIter *iter, GLis
                work = kw_list;
                while (work)
                        {
-                       const gchar *kw = work->data;
+                       const gchar *kw = static_cast<const gchar *>(work->data);
                        work = work->next;
 
                        casefold_list = g_list_prepend(casefold_list, g_utf8_casefold(kw, -1));
index d0d8ec3..9c54862 100644 (file)
@@ -356,7 +356,7 @@ gchar *get_symbolic_link(const gchar *path_utf8)
                gchar *buf;
                gint l;
 
-               buf = g_malloc(st.st_size + 1);
+               buf = static_cast<gchar *>(g_malloc(st.st_size + 1));
                l = readlink(sl, buf, st.st_size);
 
                if (l == st.st_size)
index dd79dfd..c7f3e49 100644 (file)
@@ -98,7 +98,7 @@ static void tag_button_cb(GtkWidget *widget, gpointer data)
        TagData *td;
 
        buffer = gtk_text_view_get_buffer(image_overlay_template_view);
-       td = g_object_get_data(G_OBJECT(widget), "tag_data");
+       td = static_cast<TagData *>(g_object_get_data(G_OBJECT(widget), "tag_data"));
        gtk_text_buffer_insert_at_cursor(GTK_TEXT_BUFFER(buffer), td->key, -1);
 
        gtk_widget_grab_focus(GTK_WIDGET(image_overlay_template_view));
@@ -111,7 +111,7 @@ static void osd_dnd_get_cb(GtkWidget *btn, GdkDragContext *UNUSED(context),
        TagData *td;
        GtkTextView *image_overlay_template_view = static_cast<GtkTextView *>(data);
 
-       td = g_object_get_data(G_OBJECT(btn), "tag_data");
+       td = static_cast<TagData *>(g_object_get_data(G_OBJECT(btn), "tag_data"));
        gtk_selection_data_set_text(selection_data, td->key, -1);
 
        gtk_widget_grab_focus(GTK_WIDGET(image_overlay_template_view));
@@ -123,7 +123,7 @@ static void osd_btn_destroy_cb(GtkWidget *btn, GdkDragContext *UNUSED(context),
 {
        TagData *td;
 
-       td = g_object_get_data(G_OBJECT(btn), "tag_data");
+       td = static_cast<TagData *>(g_object_get_data(G_OBJECT(btn), "tag_data"));
        g_free(td->key);
        g_free(td->title);
 }
@@ -218,7 +218,7 @@ static gchar *keywords_to_string(FileData *fd)
 
                while (work)
                        {
-                       gchar *kw = work->data;
+                       gchar *kw = static_cast<gchar *>(work->data);
                        work = work->next;
 
                        if (!kw) continue;
@@ -333,7 +333,7 @@ gchar *image_osd_mkinfo(const gchar *str, FileData *fd, GHashTable *vars)
 #endif
                else
                        {
-                       data = g_strdup(g_hash_table_lookup(vars, name));
+                       data = static_cast<const gchar *>(g_strdup(g_hash_table_lookup(vars, name)));
                        if (!data)
                                data = metadata_read_string(fd, name, METADATA_FORMATTED);
                        }
index 4d23bac..299e778 100644 (file)
@@ -87,7 +87,7 @@ void pan_calendar_update(PanWindow *pw, PanItem *pi_day)
                PanItem *dot;
                GList *node;
 
-               dot = work->data;
+               dot = static_cast<PanItem *>(work->data);
                node = work;
                work = work->next;
 
@@ -138,7 +138,7 @@ void pan_calendar_update(PanWindow *pw, PanItem *pi_day)
                        {
                        PanItem *dot;
 
-                       dot = work->data;
+                       dot = static_cast<PanItem *>(work->data);
                        work = work->next;
 
                        if (dot->fd)
@@ -223,7 +223,7 @@ void pan_calendar_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *he
                {
                FileData *fd;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                if (!pan_date_compare(fd->date, tc, PAN_DATE_LENGTH_DAY))
@@ -244,7 +244,7 @@ void pan_calendar_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *he
 
        if (list)
                {
-               FileData *fd = list->data;
+               FileData *fd = static_cast<FileData *>(list->data);
 
                year = pan_date_value(fd->date, PAN_DATE_LENGTH_YEAR);
                month = pan_date_value(fd->date, PAN_DATE_LENGTH_MONTH);
@@ -346,7 +346,7 @@ void pan_calendar_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *he
                        dx = x + PAN_CAL_DOT_GAP * 2;
                        dy = y + PAN_CAL_DOT_GAP * 2;
 
-                       fd = (work) ? work->data : NULL;
+                       fd = static_cast<FileData *>((work) ? work->data : NULL);
                        while (fd && pan_date_compare(fd->date, dt, PAN_DATE_LENGTH_DAY))
                                {
                                PanItem *pi;
@@ -372,7 +372,7 @@ void pan_calendar_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *he
                                n++;
 
                                work = work->next;
-                               fd = (work) ? work->data : NULL;
+                               fd = static_cast<FileData *>((work) ? work->data : NULL);
                                }
 
                        if (n > 0)
index c726934..e124cd8 100644 (file)
@@ -42,7 +42,7 @@ static void pan_flower_size(PanWindow *pw, gint *width, gint *height)
                {
                PanItem *pi;
 
-               pi = work->data;
+               pi = static_cast<PanItem *>(work->data);
                work = work->next;
 
                if (x1 > pi->x) x1 = pi->x;
@@ -61,7 +61,7 @@ static void pan_flower_size(PanWindow *pw, gint *width, gint *height)
                {
                PanItem *pi;
 
-               pi = work->data;
+               pi = static_cast<PanItem *>(work->data);
                work = work->next;
 
                pi->x -= x1;
@@ -71,7 +71,7 @@ static void pan_flower_size(PanWindow *pw, gint *width, gint *height)
                        {
                        gint *coord;
 
-                       coord = pi->data;
+                       coord = static_cast<gint *>(pi->data);
                        coord[0] -= x1;
                        coord[1] -= y1;
                        coord[2] -= x1;
@@ -108,7 +108,7 @@ static void pan_flower_move(FlowerGroup *group, gint x, gint y)
                {
                PanItem *pi;
 
-               pi = work->data;
+               pi = static_cast<PanItem *>(work->data);
                work = work->next;
 
                pi->x += x;
@@ -204,7 +204,7 @@ static void pan_flower_build(PanWindow *pw, FlowerGroup *group, FlowerGroup *par
                {
                FlowerGroup *child;
 
-               child = work->data;
+               child = static_cast<FlowerGroup *>(work->data);
                work = work->next;
 
                group->circumference += child->diameter;
@@ -215,7 +215,7 @@ static void pan_flower_build(PanWindow *pw, FlowerGroup *group, FlowerGroup *par
                {
                FlowerGroup *child;
 
-               child = work->data;
+               child = static_cast<FlowerGroup *>(work->data);
                work = work->prev;
 
                pan_flower_build(pw, child, group);
@@ -272,7 +272,7 @@ static FlowerGroup *pan_flower_group(PanWindow *pw, FileData *dir_fd, gint x, gi
                FileData *fd;
                PanItem *pi;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                if (pw->size > PAN_IMAGE_SIZE_THUMB_LARGE)
@@ -316,7 +316,7 @@ static FlowerGroup *pan_flower_group(PanWindow *pw, FileData *dir_fd, gint x, gi
                FileData *fd;
                FlowerGroup *child;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                if (!pan_is_ignored(fd->path, pw->ignore_symlinks))
@@ -333,7 +333,7 @@ static FlowerGroup *pan_flower_group(PanWindow *pw, FileData *dir_fd, gint x, gi
                        {
                        PanItem *pi;
 
-                       pi = work->data;
+                       pi = static_cast<PanItem *>(work->data);
                        work = work->next;
 
                        pan_item_free(pi);
@@ -365,7 +365,7 @@ void pan_flower_compute(PanWindow *pw, FileData *dir_fd,
        list = pan_item_find_by_fd(pw, PAN_ITEM_BOX, dir_fd, FALSE, FALSE);
        if (list)
                {
-               PanItem *pi = list->data;
+               PanItem *pi = static_cast<PanItem *>(list->data);
                *scroll_x = pi->x + pi->width / 2;
                *scroll_y = pi->y + pi->height / 2;
                }
@@ -415,7 +415,7 @@ static void pan_folder_tree_path(PanWindow *pw, FileData *dir_fd,
                FileData *fd;
                PanItem *pi;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                if (pw->size > PAN_IMAGE_SIZE_THUMB_LARGE)
@@ -443,7 +443,7 @@ static void pan_folder_tree_path(PanWindow *pw, FileData *dir_fd,
                {
                FileData *fd;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                if (!pan_is_ignored(fd->path, pw->ignore_symlinks))
index b2714aa..088f3fc 100644 (file)
@@ -61,7 +61,7 @@ void pan_grid_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *height
                FileData *fd;
                PanItem *pi;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                if (pw->size > PAN_IMAGE_SIZE_THUMB_LARGE)
index 21350bc..b82b66e 100644 (file)
@@ -138,7 +138,7 @@ void pan_item_box_shadow(PanItem *pi, gint offset, gint fade)
 
        if (!pi || pi->type != PAN_ITEM_BOX) return;
 
-       shadow = pi->data;
+       shadow = static_cast<gint *>(pi->data);
        if (shadow)
                {
                pi->width -= shadow[0];
@@ -166,7 +166,7 @@ gint pan_item_box_draw(PanWindow *UNUSED(pw), PanItem *pi, GdkPixbuf *pixbuf, Pi
        bw = pi->width;
        bh = pi->height;
 
-       shadow = pi->data;
+       shadow = static_cast<gint *>(pi->data);
        if (shadow)
                {
                bw -= shadow[0];
@@ -308,7 +308,7 @@ gint pan_item_tri_draw(PanWindow *UNUSED(pw), PanItem *pi, GdkPixbuf *pixbuf, Pi
                             pi->x, pi->y, pi->width, pi->height,
                             &rx, &ry, &rw, &rh) && pi->data)
                {
-               gint *coord = pi->data;
+               gint *coord = static_cast<gint *>(pi->data);
                pixbuf_draw_triangle(pixbuf,
                                     rx - x, ry - y, rw, rh,
                                     coord[0] - x, coord[1] - y,
@@ -616,7 +616,7 @@ static void pan_item_image_find_size(PanWindow *pw, PanItem *pi, gint w, gint h)
                {
                PanCacheData *pc;
 
-               pc = work->data;
+               pc = static_cast<PanCacheData *>(work->data);
                work = work->next;
 
                if (pc->cd && pc->cd->dimensions &&
@@ -704,7 +704,7 @@ PanItem *pan_item_find_by_key(PanWindow *pw, PanItemType type, const gchar *key)
                {
                PanItem *pi;
 
-               pi = work->data;
+               pi = static_cast<PanItem *>(work->data);
                if ((pi->type == type || type == PAN_ITEM_NONE) &&
                     pi->key && strcmp(pi->key, key) == 0)
                        {
@@ -717,7 +717,7 @@ PanItem *pan_item_find_by_key(PanWindow *pw, PanItemType type, const gchar *key)
                {
                PanItem *pi;
 
-               pi = work->data;
+               pi = static_cast<PanItem *>(work->data);
                if ((pi->type == type || type == PAN_ITEM_NONE) &&
                     pi->key && strcmp(pi->key, key) == 0)
                        {
@@ -741,7 +741,7 @@ static GList *pan_item_find_by_path_l(GList *list, GList *search_list,
                {
                PanItem *pi;
 
-               pi = work->data;
+               pi = static_cast<PanItem *>(work->data);
                if ((pi->type == type || type == PAN_ITEM_NONE) && pi->fd)
                        {
                        gboolean match = FALSE;
@@ -817,7 +817,7 @@ static PanItem *pan_item_find_by_coord_l(GList *list, PanItemType type, gint x,
                {
                PanItem *pi;
 
-               pi = work->data;
+               pi = static_cast<PanItem *>(work->data);
                if ((pi->type == type || type == PAN_ITEM_NONE) &&
                     x >= pi->x && x < pi->x + pi->width &&
                     y >= pi->y && y < pi->y + pi->height &&
@@ -921,7 +921,7 @@ void pan_text_alignment_calc(PanTextAlignment *ta, PanItem *box)
                {
                PanItem *p;
 
-               p = work1->data;
+               p = static_cast<PanItem *>(work1->data);
                work1 = work1->next;
 
                if (p && p->width > cw1) cw1 = p->width;
@@ -932,7 +932,7 @@ void pan_text_alignment_calc(PanTextAlignment *ta, PanItem *box)
                {
                PanItem *p;
 
-               p = work2->data;
+               p = static_cast<PanItem *>(work2->data);
                work2 = work2->next;
 
                if (p && p->width > cw2) cw2 = p->width;
@@ -948,8 +948,8 @@ void pan_text_alignment_calc(PanTextAlignment *ta, PanItem *box)
                PanItem *p2;
                gint height = 0;
 
-               p1 = work1->data;
-               p2 = work2->data;
+               p1 = static_cast<PanItem *>(work1->data);
+               p2 = static_cast<PanItem *>(work2->data);
                work1 = work1->next;
                work2 = work2->next;
 
index 7cf9c15..1420300 100644 (file)
@@ -73,7 +73,7 @@ void pan_timeline_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *he
                FileData *fd;
                PanItem *pi;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                if (!pan_date_compare(fd->date, group_start_date, PAN_DATE_LENGTH_DAY))
@@ -128,7 +128,7 @@ void pan_timeline_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *he
                                {
                                FileData *nfd;
 
-                               nfd = needle->data;
+                               nfd = static_cast<FileData *>(needle->data);
                                if (pan_date_compare(nfd->date, group_start_date, PAN_DATE_LENGTH_DAY))
                                        {
                                        needle = needle->next;
index 0047fca..1f87038 100644 (file)
@@ -165,7 +165,7 @@ gboolean pan_is_link_loop(const gchar *s)
                gchar *buf;
                gint l;
 
-               buf = g_malloc(st.st_size + 1);
+               buf = static_cast<gchar *>(g_malloc(st.st_size + 1));
                l = readlink(sl, buf, st.st_size);
                if (l == st.st_size)
                        {
@@ -247,7 +247,7 @@ GList *pan_list_tree(FileData *dir_fd, SortType sort, gboolean ascend,
                {
                FileData *fd;
 
-               fd = folders->data;
+               fd = static_cast<FileData *>(folders->data);
                folders = g_list_remove(folders, fd);
 
                if (!pan_is_ignored(fd->path, ignore_symlinks) &&
index 21a0230..d510e99 100644 (file)
@@ -306,7 +306,7 @@ static gboolean pan_view_list_contains_kw_pattern(GList *haystack, PanViewFilter
                GList *work = g_list_first(haystack);
                while (work)
                        {
-                       gchar *keyword = work->data;
+                       gchar *keyword = static_cast<gchar *>(work->data);
                        work = work->next;
                        if (g_regex_match(filter->kw_regex, keyword, 0x0, NULL))
                                {
@@ -320,7 +320,7 @@ static gboolean pan_view_list_contains_kw_pattern(GList *haystack, PanViewFilter
                {
                // regex compile failed; fall back to exact string match.
                GList *found_elem = g_list_find_custom(haystack, filter->keyword, (GCompareFunc)g_strcmp0);
-               if (found_elem && found_kw) *found_kw = found_elem->data;
+               if (found_elem && found_kw) *found_kw = static_cast<gchar *>(found_elem->data);
                return !!found_elem;
                }
 }
@@ -361,7 +361,7 @@ gboolean pan_filter_fd_list(GList **fd_list, GList *filter_elements, gint filter
 
                        while (filter_element)
                                {
-                               PanViewFilterElement *filter = filter_element->data;
+                               PanViewFilterElement *filter = static_cast<PanViewFilterElement *>(filter_element->data);
                                filter_element = filter_element->next;
                                gchar *found_kw = NULL;
                                gboolean has_kw = pan_view_list_contains_kw_pattern(img_keywords, filter, &found_kw);
index 2711574..fd6a153 100644 (file)
@@ -100,11 +100,11 @@ static gint pan_search_by_path(PanWindow *pw, const gchar *path)
        if (found && found->next)
                {
                found = found->next;
-               pi = found->data;
+               pi = static_cast<PanItem *>(found->data);
                }
        else
                {
-               pi = list->data;
+               pi = static_cast<PanItem *>(list->data);
                }
 
        pan_info_update(pw, pi);
@@ -148,11 +148,11 @@ static gboolean pan_search_by_partial(PanWindow *pw, const gchar *text)
        if (found && found->next)
                {
                found = found->next;
-               pi = found->data;
+               pi = static_cast<PanItem *>(found->data);
                }
        else
                {
-               pi = list->data;
+               pi = static_cast<PanItem *>(list->data);
                }
 
        pan_info_update(pw, pi);
@@ -187,7 +187,7 @@ static GList *pan_search_by_date_val(PanWindow *pw, PanItemType type,
                {
                PanItem *pi;
 
-               pi = work->data;
+               pi = static_cast<PanItem *>(work->data);
                work = work->prev;
 
                if (pi->fd && (pi->type == type || type == PAN_ITEM_NONE) &&
@@ -320,11 +320,11 @@ static gboolean pan_search_by_date(PanWindow *pw, const gchar *text)
                if (found && found->next)
                        {
                        found = found->next;
-                       pi = found->data;
+                       pi = static_cast<PanItem *>(found->data);
                        }
                else
                        {
-                       pi = list->data;
+                       pi = static_cast<PanItem *>(list->data);
                        }
                }
 
index c0f8cf1..a31dd09 100644 (file)
@@ -235,7 +235,7 @@ static gboolean pan_queue_step(PanWindow *pw)
 
        if (!pw->queue) return FALSE;
 
-       pi = pw->queue->data;
+       pi = static_cast<PanItem *>(pw->queue->data);
        pw->queue = g_list_remove(pw->queue, pi);
        pw->queue_pi = pi;
 
@@ -365,7 +365,7 @@ static gboolean pan_window_request_tile_cb(PixbufRenderer *pr, gint x, gint y,
                PanItem *pi;
                gboolean queue = FALSE;
 
-               pi = work->data;
+               pi = static_cast<PanItem *>(work->data);
                work = work->next;
 
                pi->refcount++;
@@ -413,7 +413,7 @@ static void pan_window_dispose_tile_cb(PixbufRenderer *UNUSED(pr), gint x, gint
                {
                PanItem *pi;
 
-               pi = work->data;
+               pi = static_cast<PanItem *>(work->data);
                work = work->next;
 
                if (pi->refcount > 0)
@@ -468,7 +468,7 @@ static void pan_window_message(PanWindow *pw, const gchar *text)
                        {
                        PanItem *pi;
 
-                       pi = work->data;
+                       pi = static_cast<PanItem *>(work->data);
                        work = work->next;
 
                        if (pi->fd &&
@@ -486,7 +486,7 @@ static void pan_window_message(PanWindow *pw, const gchar *text)
                        {
                        PanItem *pi;
 
-                       pi = work->data;
+                       pi = static_cast<PanItem *>(work->data);
                        work = work->next;
 
                        if (pi->fd &&
@@ -557,8 +557,8 @@ static void pan_window_zoom_limit(PanWindow *pw)
 
 static gint pan_cache_sort_file_cb(gpointer a, gpointer b)
 {
-       PanCacheData *pca = a;
-       PanCacheData *pcb = b;
+       PanCacheData *pca = static_cast<PanCacheData *>(a);
+       PanCacheData *pcb = static_cast<PanCacheData *>(b);
        return filelist_sort_compare_filedata(pca->fd, pcb->fd);
 }
 GList *pan_cache_sort(GList *list, SortType method, gboolean ascend)
@@ -576,7 +576,7 @@ static void pan_cache_free(PanWindow *pw)
                {
                PanCacheData *pc;
 
-               pc = work->data;
+               pc = static_cast<PanCacheData *>(work->data);
                work = work->next;
 
                cache_sim_data_free(pc->cd);
@@ -617,7 +617,7 @@ static void pan_cache_step_done_cb(CacheLoader *cl, gint UNUSED(error), gpointer
        if (pw->cache_list)
                {
                PanCacheData *pc;
-               pc = pw->cache_list->data;
+               pc = static_cast<PanCacheData *>(pw->cache_list->data);
 
                if (!pc->cd)
                        {
@@ -640,7 +640,7 @@ static gboolean pan_cache_step(PanWindow *pw)
 
        if (!pw->cache_todo) return TRUE;
 
-       fd = pw->cache_todo->data;
+       fd = static_cast<FileData *>(pw->cache_todo->data);
        pw->cache_todo = g_list_remove(pw->cache_todo, fd);
 
        pc = g_new0(PanCacheData, 1);
@@ -674,7 +674,7 @@ void pan_cache_sync_date(PanWindow *pw, GList *list)
                FileData *fd;
                GList *needle;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                needle = haystack;
@@ -682,7 +682,7 @@ void pan_cache_sync_date(PanWindow *pw, GList *list)
                        {
                        PanCacheData *pc;
 
-                       pc = needle->data;
+                       pc = static_cast<PanCacheData *>(needle->data);
                        if (pc->fd == fd)
                                {
                                if (pc->cd && pc->cd->have_date && pc->cd->date >= 0)
@@ -718,7 +718,7 @@ static void pan_grid_clear(PanWindow *pw)
                {
                PanGrid *pg;
 
-               pg = work->data;
+               pg = static_cast<PanGrid *>(work->data);
                work = work->next;
 
                g_list_free(pg->list);
@@ -785,7 +785,7 @@ static void pan_grid_build(PanWindow *pw, gint width, gint height, gint grid_siz
                PanItem *pi;
                GList *grid;
 
-               pi = work->data;
+               pi = static_cast<PanItem *>(work->data);
                work = work->next;
 
                grid = pw->list_grid;
@@ -794,7 +794,7 @@ static void pan_grid_build(PanWindow *pw, gint width, gint height, gint grid_siz
                        PanGrid *pg;
                        gint rx, ry, rw, rh;
 
-                       pg = grid->data;
+                       pg = static_cast<PanGrid *>(grid->data);
                        grid = grid->next;
 
                        if (util_clip_region(pi->x, pi->y, pi->width, pi->height,
@@ -811,7 +811,7 @@ static void pan_grid_build(PanWindow *pw, gint width, gint height, gint grid_siz
                {
                PanGrid *pg;
 
-               pg = work->data;
+               pg = static_cast<PanGrid *>(work->data);
                work = work->next;
 
                pg->list = g_list_reverse(pg->list);
@@ -959,7 +959,7 @@ static GList *pan_layout_intersect_l(GList *list, GList *item_list,
                PanItem *pi;
                gint rx, ry, rw, rh;
 
-               pi = work->data;
+               pi = static_cast<PanItem *>(work->data);
                work = work->next;
 
                if (util_clip_region(x, y, width, height,
@@ -982,7 +982,7 @@ GList *pan_layout_intersect(PanWindow *pw, gint x, gint y, gint width, gint heig
        grid = pw->list_grid;
        while (grid && !pg)
                {
-               pg = grid->data;
+               pg = static_cast<PanGrid *>(grid->data);
                grid = grid->next;
 
                if (x < pg->x || x + width > pg->x + pg->w ||
@@ -1018,7 +1018,7 @@ void pan_layout_resize(PanWindow *pw)
                {
                PanItem *pi;
 
-               pi = work->data;
+               pi = static_cast<PanItem *>(work->data);
                work = work->next;
 
                if (width < pi->x + pi->width) width = pi->x + pi->width;
@@ -1029,7 +1029,7 @@ void pan_layout_resize(PanWindow *pw)
                {
                PanItem *pi;
 
-               pi = work->data;
+               pi = static_cast<PanItem *>(work->data);
                work = work->next;
 
                if (width < pi->x + pi->width) width = pi->x + pi->width;
@@ -1391,9 +1391,9 @@ static void pan_info_add_exif(PanTextAlignment *ta, FileData *fd)
        exif_list = bar_pane_exif_list();
        while (exif_list)
                {
-               title = exif_list->data;
+               title = static_cast<gchar *>(exif_list->data);
                exif_list = exif_list->next;
-               key = exif_list->data;
+               key = static_cast<gchar *>(exif_list->data);
                exif_list = exif_list->next;
 
                text = metadata_read_string(fd, key, METADATA_FORMATTED);
@@ -2151,9 +2151,9 @@ static void pan_edit_cb(GtkWidget *widget, gpointer data)
 {
        PanWindow *pw;
        FileData *fd;
-       const gchar *key = data;
+       const gchar *key = static_cast<const gchar *>(data);
 
-       pw = submenu_item_get_data(widget);
+       pw = static_cast<PanWindow *>(submenu_item_get_data(widget));
        if (!pw) return;
 
        fd = pan_menu_click_fd(pw);
@@ -2333,7 +2333,7 @@ static void pan_pop_menu_collections_cb(GtkWidget *widget, gpointer data)
        PanWindow *pw;
        GList *selection_list = NULL;
 
-       pw = submenu_item_get_data(widget);
+       pw = static_cast<PanWindow *>(submenu_item_get_data(widget));
        selection_list = g_list_append(selection_list, pan_menu_click_fd(pw));
        pop_menu_collections(selection_list, data);
 
@@ -2491,7 +2491,7 @@ static void pan_window_get_dnd_data(GtkWidget *UNUSED(widget), GdkDragContext *c
                list = uri_filelist_from_gtk_selection_data(selection_data);
                if (list && isdir(((FileData *)list->data)->path))
                        {
-                       FileData *fd = list->data;
+                       FileData *fd = static_cast<FileData *>(list->data);
 
                        pan_layout_set_fd(pw, fd);
                        }
index 98c226e..c283dff 100644 (file)
@@ -184,7 +184,7 @@ static void pixbuf_renderer_class_init(PixbufRendererClass *renderer_class)
 {
        GObjectClass *gobject_class = G_OBJECT_CLASS(renderer_class);
 
-       parent_class = g_type_class_peek_parent(renderer_class);
+       parent_class = static_cast<GtkEventBoxClass *>(g_type_class_peek_parent(renderer_class));
 
        gobject_class->set_property = pixbuf_renderer_set_property;
        gobject_class->get_property = pixbuf_renderer_get_property;
@@ -971,7 +971,7 @@ static void pr_source_tile_free_all(PixbufRenderer *pr)
                {
                SourceTile *st;
 
-               st = work->data;
+               st = static_cast<SourceTile *>(work->data);
                work = work->next;
 
                pr_source_tile_free(st);
@@ -1027,7 +1027,7 @@ static SourceTile *pr_source_tile_new(PixbufRenderer *pr, gint x, gint y)
                        {
                        SourceTile *needle;
 
-                       needle = work->data;
+                       needle = static_cast<SourceTile *>(work->data);
                        work = work->prev;
 
                        if (!pr_source_tile_visible(pr, needle))
@@ -1160,7 +1160,7 @@ static void pr_source_tile_changed(PixbufRenderer *pr, gint x, gint y, gint widt
                SourceTile *st;
                gint rx, ry, rw, rh;
 
-               st = work->data;
+               st = static_cast<SourceTile *>(work->data);
                work = work->next;
 
                if (pr_clip_region(st->x, st->y, pr->source_tile_width, pr->source_tile_height,
index 530645f..5dfb5cc 100644 (file)
@@ -562,7 +562,7 @@ static void config_window_ok_cb(GtkWidget *widget, gpointer data)
        gint h;
        gint page_number;
 
-       lw = layout_window_list->data;
+       lw = static_cast<LayoutWindow *>(layout_window_list->data);
 
        window = gtk_widget_get_window(widget);
        gdk_window_get_root_origin(window, &x, &y);
@@ -590,7 +590,7 @@ static void config_window_ok_cb(GtkWidget *widget, gpointer data)
 
 static void quality_menu_cb(GtkWidget *combo, gpointer data)
 {
-       gint *option = data;
+       gint *option = static_cast<gint *>(data);
 
        switch (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)))
                {
@@ -609,7 +609,7 @@ static void quality_menu_cb(GtkWidget *combo, gpointer data)
 
 static void dnd_default_action_selection_menu_cb(GtkWidget *combo, gpointer data)
 {
-       gint *option = data;
+       gint *option = static_cast<gint *>(data);
 
        switch (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)))
                {
@@ -627,7 +627,7 @@ static void dnd_default_action_selection_menu_cb(GtkWidget *combo, gpointer data
 }
 static void clipboard_selection_menu_cb(GtkWidget *combo, gpointer data)
 {
-       gint *option = data;
+       gint *option = static_cast<gint *>(data);
 
        switch (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)))
                {
@@ -730,7 +730,7 @@ static void add_clipboard_selection_menu(GtkWidget *table, gint column, gint row
 
 static void zoom_style_selection_menu_cb(GtkWidget *combo, gpointer data)
 {
-       gint *option = data;
+       gint *option = static_cast<gint *>(data);
 
        switch (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)))
                {
@@ -853,7 +853,7 @@ static const UseableMouseItems useable_mouse_items[] = {
 
 static void mouse_buttons_selection_menu_cb(GtkWidget *combo, gpointer data)
 {
-       gchar **option = data;
+       gchar **option = static_cast<gchar **>(data);
        gchar *label;
 
        label = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo));
@@ -978,7 +978,7 @@ static void add_thumb_size_menu(GtkWidget *table, gint column, gint row, gchar *
 
 static void stereo_mode_menu_cb(GtkWidget *combo, gpointer data)
 {
-       gint *option = data;
+       gint *option = static_cast<gint *>(data);
 
        switch (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)))
                {
@@ -1097,15 +1097,15 @@ static void add_stereo_mode_menu(GtkWidget *table, gint column, gint row, const
 
 static void video_menu_cb(GtkWidget *combo, gpointer data)
 {
-       gchar **option = data;
+       gchar **option = static_cast<gchar **>(data);
 
-       EditorDescription *ed = g_list_nth_data(editor_list_get(), gtk_combo_box_get_active(GTK_COMBO_BOX(combo)));
+       EditorDescription *ed = static_cast<EditorDescription *>(g_list_nth_data(editor_list_get(), gtk_combo_box_get_active(GTK_COMBO_BOX(combo))));
        *option = ed->key;
 }
 
 static void video_menu_populate(gpointer data, gpointer user_data)
 {
-       GtkWidget *combo = user_data;
+       GtkWidget *combo = static_cast<GtkWidget *>(user_data);
        EditorDescription *ed = static_cast<EditorDescription *>(data);
 
        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), ed->name);
@@ -1150,7 +1150,7 @@ static void filter_store_populate(void)
                FilterEntry *fe;
                GtkTreeIter iter;
 
-               fe = work->data;
+               fe = static_cast<FilterEntry *>(work->data);
                work = work->next;
 
                gtk_list_store_append(filter_store, &iter);
@@ -1337,7 +1337,7 @@ static gboolean filter_add_scroll(gpointer data)
        column = gtk_tree_view_get_column(GTK_TREE_VIEW(data), 0);
 
        list_cells = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
-       cell = g_list_last(list_cells)->data;
+       cell = static_cast<GtkCellRenderer *>(g_list_last(list_cells)->data);
 
        store = gtk_tree_view_get_model(GTK_TREE_VIEW(data));
        valid = gtk_tree_model_get_iter_first(store, &iter);
@@ -1605,7 +1605,7 @@ static void accel_store_populate(void)
        if (!accel_store || !layout_window_list || !layout_window_list->data) return;
 
        gtk_tree_store_clear(accel_store);
-       lw = layout_window_list->data; /* get the actions from the first window, it should not matter, they should be the same in all windows */
+       lw = static_cast<LayoutWindow *>(layout_window_list->data); /* get the actions from the first window, it should not matter, they should be the same in all windows */
 
        g_assert(lw && lw->ui_manager);
        groups = gtk_ui_manager_get_action_groups(lw->ui_manager);
@@ -1661,7 +1661,7 @@ static void accel_store_cleared_cb(GtkCellRendererAccel *UNUSED(accel), gchar *U
 
 static gboolean accel_remove_key_cb(GtkTreeModel *model, GtkTreePath *UNUSED(path), GtkTreeIter *iter, gpointer data)
 {
-       gchar *accel1 = data;
+       gchar *accel1 = static_cast<gchar *>(data);
        gchar *accel2;
        GtkAccelKey key1;
        GtkAccelKey key2;
@@ -1888,7 +1888,7 @@ static guint star_rating_symbol_test(GtkWidget *UNUSED(widget), gpointer data)
 
        list = gtk_container_get_children(hbox);
 
-       hex_code_entry = g_list_nth_data(list, 2);
+       hex_code_entry = static_cast<GtkEntry *>(g_list_nth_data(list, 2));
        hex_code_full = g_strdup(gtk_entry_get_text(hex_code_entry));
 
        hex_code = g_strsplit(hex_code_full, "+", 2);
@@ -3077,7 +3077,7 @@ static gboolean keywords_find_file(gpointer data)
                {
                FileData *fd;
 
-               fd = kfd->list->data;
+               fd = static_cast<FileData *>(kfd->list->data);
                kfd->list = g_list_remove(kfd->list, fd);
 
                keywords = metadata_read_list(fd, KEYWORD_KEY, METADATA_PLAIN);
@@ -3102,7 +3102,7 @@ static gboolean keywords_find_file(gpointer data)
                {
                FileData *fd;
 
-               fd = kfd->list_dir->data;
+               fd = static_cast<FileData *>(kfd->list_dir->data);
                kfd->list_dir = g_list_remove(kfd->list_dir, fd);
 
                keywords_find_folder(kfd, fd);
@@ -3334,7 +3334,7 @@ static void config_tab_keywords(GtkWidget *notebook)
 #ifdef HAVE_LCMS
 static void intent_menu_cb(GtkWidget *combo, gpointer data)
 {
-       gint *option = data;
+       gint *option = static_cast<gint *>(data);
 
        switch (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)))
                {
@@ -3773,7 +3773,7 @@ static void config_tab_toolbar_main(GtkWidget *notebook)
        GtkWidget *toolbardata;
        LayoutWindow *lw;
 
-       lw = layout_window_list->data;
+       lw = static_cast<LayoutWindow *>(layout_window_list->data);
 
        vbox = scrolled_notebook_page(notebook, _("Toolbar Main"));
 
@@ -3789,7 +3789,7 @@ static void config_tab_toolbar_status(GtkWidget *notebook)
        GtkWidget *toolbardata;
        LayoutWindow *lw;
 
-       lw = layout_window_list->data;
+       lw = static_cast<LayoutWindow *>(layout_window_list->data);
 
        vbox = scrolled_notebook_page(notebook, _("Toolbar Status"));
 
@@ -3830,7 +3830,7 @@ static void config_tab_advanced(GtkWidget *notebook)
 
        while (formats_list)
                {
-               fm = formats_list->data;
+               fm = static_cast<GdkPixbufFormat *>(formats_list->data);
                extensions = gdk_pixbuf_format_get_extensions(fm);
 
                i = 0;
@@ -3848,12 +3848,12 @@ static void config_tab_advanced(GtkWidget *notebook)
                {
                if (types_string->len == 0)
                        {
-                       types_string = g_string_append(types_string, extensions_list->data);
+                       types_string = g_string_append(types_string, static_cast<const gchar *>(extensions_list->data));
                        }
                else
                        {
                        types_string = g_string_append(types_string, ", ");
-                       types_string = g_string_append(types_string, extensions_list->data);
+                       types_string = g_string_append(types_string, static_cast<const gchar *>(extensions_list->data));
                        }
 
                extensions_list = extensions_list->next;
index 1e87cbb..2669cb9 100644 (file)
@@ -102,7 +102,7 @@ static gboolean print_job_render_image(PrintWindow *pw)
 {
        FileData *fd = NULL;
 
-       fd = g_list_nth_data(pw->source_selection, pw->job_page);
+       fd = static_cast<FileData *>(g_list_nth_data(pw->source_selection, pw->job_page));
        if (!fd) return FALSE;
 
        image_loader_free(pw->job_loader);
@@ -138,7 +138,7 @@ static void print_set_font_cb(GtkWidget *widget, gpointer data)
        char *font;
        PangoFontDescription *font_desc;
 
-       dialog = gtk_font_chooser_dialog_new(data, GTK_WINDOW(gtk_widget_get_toplevel(widget)));
+       dialog = gtk_font_chooser_dialog_new(static_cast<const gchar *>(data), GTK_WINDOW(gtk_widget_get_toplevel(widget)));
        gtk_font_chooser_set_font(GTK_FONT_CHOOSER(dialog), option);
 
        if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_CANCEL)
@@ -159,7 +159,7 @@ static gint set_toggle(GSList *list, TextPosition pos)
        GtkToggleButton *new_sel;
        gint new_pos = - 1;
 
-       current_sel = g_slist_nth(list, pos)->data;
+       current_sel = static_cast<GtkToggleButton *>(g_slist_nth(list, pos)->data);
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(current_sel)))
                {
                new_pos = (pos - 1);
@@ -167,7 +167,7 @@ static gint set_toggle(GSList *list, TextPosition pos)
                        {
                        new_pos = HEADER_1;
                        }
-               new_sel = g_slist_nth(list, new_pos)->data;
+               new_sel = static_cast<GtkToggleButton *>(g_slist_nth(list, new_pos)->data);
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(new_sel), TRUE);
                }
        return new_pos;
@@ -568,10 +568,10 @@ static void draw_page(GtkPrintOperation *UNUSED(operation), GtkPrintContext *con
        gchar *tmp;
        gint total;
 
-       fd = g_list_nth_data(pw->source_selection, page_nr);
+       fd = static_cast<FileData *>(g_list_nth_data(pw->source_selection, page_nr));
        total = g_list_length(pw->source_selection);
 
-       pixbuf = g_list_nth_data(pw->print_pixbuf_queue, page_nr);
+       pixbuf = static_cast<GdkPixbuf *>(g_list_nth_data(pw->print_pixbuf_queue, page_nr));
        if (fd->exif_orientation != EXIF_ORIENTATION_TOP_LEFT)
                {
                rotated = pixbuf_apply_orientation(pixbuf, fd->exif_orientation);
@@ -757,7 +757,7 @@ static void begin_print(GtkPrintOperation *operation,
                                                GtkPrintContext *UNUSED(context),
                                                gpointer user_data)
 {
-       PrintWindow *pw = user_data;
+       PrintWindow *pw = static_cast<PrintWindow *>(user_data);
        gint page_count;
 
        page_count = print_layout_page_count(pw);
@@ -769,7 +769,7 @@ static void begin_print(GtkPrintOperation *operation,
 
 GObject *option_tab_cb(GtkPrintOperation *UNUSED(operation), gpointer user_data)
 {
-       PrintWindow *pw = user_data;
+       PrintWindow *pw = static_cast<PrintWindow *>(user_data);
 
        return G_OBJECT(pw->vbox);
 }
@@ -828,7 +828,7 @@ static void end_print_cb(GtkPrintOperation *operation,
        work = pw->print_pixbuf_queue;
        while (work)
                {
-               pixbuf = work->data;
+               pixbuf = static_cast<GdkPixbuf *>(work->data);
                if (pixbuf)
                        {
                        g_object_unref(pixbuf);
index 88c2d09..35905c8 100644 (file)
@@ -1686,7 +1686,7 @@ void options_parse_func_pop(GQParserData *parser_data)
 
 void options_parse_func_set_data(GQParserData *parser_data, gpointer data)
 {
-       GQParserFuncData *func = parser_data->parse_func_stack->data;
+       GQParserFuncData *func = static_cast<GQParserFuncData *>(parser_data->parse_func_stack->data);
        func->data = data;
 }
 
@@ -1698,8 +1698,8 @@ static void start_element(GMarkupParseContext *context,
                          gpointer user_data,
                          GError **error)
 {
-       GQParserData *parser_data = user_data;
-       GQParserFuncData *func = parser_data->parse_func_stack->data;
+       GQParserData *parser_data = static_cast<GQParserData *>(user_data);
+       GQParserFuncData *func = static_cast<GQParserFuncData *>(parser_data->parse_func_stack->data);
        DEBUG_2("start %s", element_name);
 
        if (func->start_func)
@@ -1711,8 +1711,8 @@ static void end_element(GMarkupParseContext *context,
                          gpointer user_data,
                          GError **error)
 {
-       GQParserData *parser_data = user_data;
-       GQParserFuncData *func = parser_data->parse_func_stack->data;
+       GQParserData *parser_data = static_cast<GQParserData *>(user_data);
+       GQParserFuncData *func = static_cast<GQParserFuncData *>(parser_data->parse_func_stack->data);
        DEBUG_2("end %s", element_name);
 
        if (func->end_func)
index 1e296dc..97dbd24 100644 (file)
@@ -199,7 +199,7 @@ static void remote_server_clients_close(RemoteConnection *rc)
 {
        while (rc->clients)
                {
-               RemoteClient *client = rc->clients->data;
+               RemoteClient *client = static_cast<RemoteClient *>(rc->clients->data);
 
                rc->clients = g_list_remove(rc->clients, client);
 
@@ -876,7 +876,7 @@ static void get_filelist(const gchar *text, GIOChannel *channel, gboolean recurs
        work = list;
        while (work)
                {
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                g_string_append_printf(out_string, "%s", fd->path);
                format_class = filter_file_get_class(fd->path);
 
@@ -979,7 +979,7 @@ static void gr_selection_add(const gchar *text, GIOChannel *UNUSED(channel), gpo
 
                        for (GList *sidecar = fd->sidecar_files; sidecar && !fd_to_select; sidecar = sidecar->next)
                                {
-                               FileData *side_fd = sidecar->data;
+                               FileData *side_fd = static_cast<FileData *>(sidecar->data);
                                if (!strcmp(path, side_fd->path)
                                    || g_str_has_suffix(side_fd->path, slash_plus_filename))
                                        {
@@ -1147,7 +1147,7 @@ static void gr_collection_list(const gchar *UNUSED(text), GIOChannel *channel, g
        work = collection_list;
        while (work)
                {
-               const gchar *collection_name = work->data;
+               const gchar *collection_name = static_cast<const gchar *>(work->data);
                out_string = g_string_append(out_string, g_strdup(collection_name));
                out_string = g_string_append(out_string, "\n");
 
@@ -1396,7 +1396,7 @@ static void gr_get_sidecars(const gchar *text, GIOChannel *channel, gpointer UNU
 
        while (work)
                {
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
                g_io_channel_write_chars(channel, fd->path, -1, NULL, NULL);
                g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, NULL, NULL);
@@ -1795,7 +1795,7 @@ void remote_control(const gchar *arg_exec, GList *remote_list, const gchar *path
                        gchar *text;
                        RemoteCommandEntry *entry;
 
-                       text = work->data;
+                       text = static_cast<gchar *>(work->data);
                        work = work->next;
 
                        entry = remote_command_find(text, NULL);
@@ -1853,7 +1853,7 @@ void remote_control(const gchar *arg_exec, GList *remote_list, const gchar *path
                        gchar *text;
                        RemoteCommandEntry *entry;
 
-                       text = work->data;
+                       text = static_cast<gchar *>(work->data);
                        work = work->next;
 
                        entry = remote_command_find(text, NULL);
@@ -1906,7 +1906,7 @@ void remote_control(const gchar *arg_exec, GList *remote_list, const gchar *path
                        const gchar *name;
                        gchar *text;
 
-                       name = work->data;
+                       name = static_cast<const gchar *>(work->data);
                        work = work->next;
 
                        text = g_strdup_printf("file:%s", name);
index 23b8e72..1fd278f 100644 (file)
@@ -318,7 +318,7 @@ static void rt_tile_free_all(RendererTiles *rt)
                {
                ImageTile *it;
 
-               it = work->data;
+               it = static_cast<ImageTile *>(work->data);
                work = work->next;
 
                rt_tile_free(it);
@@ -396,7 +396,7 @@ static void rt_tile_free_space(RendererTiles *rt, guint space, ImageTile *it)
                {
                ImageTile *needle;
 
-               needle = work->data;
+               needle = static_cast<ImageTile *>(work->data);
                work = work->prev;
                if (needle != it &&
                    ((!needle->qd && !needle->qd2) || !rt_tile_is_visible(rt, needle))) rt_tile_remove(rt, needle);
@@ -413,7 +413,7 @@ static void rt_tile_invalidate_all(RendererTiles *rt)
                {
                ImageTile *it;
 
-               it = work->data;
+               it = static_cast<ImageTile *>(work->data);
                work = work->next;
 
                it->render_done = TILE_RENDER_NONE;
@@ -442,7 +442,7 @@ static void rt_tile_invalidate_region(RendererTiles *rt, gint x, gint y, gint w,
                {
                ImageTile *it;
 
-               it = work->data;
+               it = static_cast<ImageTile *>(work->data);
                work = work->next;
 
                if (it->x < x2 && it->x + it->w > x1 &&
@@ -463,7 +463,7 @@ static ImageTile *rt_tile_get(RendererTiles *rt, gint x, gint y, gboolean only_e
                {
                ImageTile *it;
 
-               it = work->data;
+               it = static_cast<ImageTile *>(work->data);
                if (it->x == x && it->y == y)
                        {
                        rt->tiles = g_list_delete_link(rt->tiles, work);
@@ -601,7 +601,7 @@ static void rt_overlay_draw(RendererTiles *rt, gint x, gint y, gint w, gint h,
                gint px, py, pw, ph;
                gint rx, ry, rw, rh;
 
-               od = work->data;
+               od = static_cast<OverlayData *>(work->data);
                work = work->next;
 
                if (!od->window) rt_overlay_init_window(rt, od);
@@ -795,7 +795,7 @@ static void rt_overlay_list_clear(RendererTiles *rt)
                {
                OverlayData *od;
 
-               od = rt->overlay_list->data;
+               od = static_cast<OverlayData *>(rt->overlay_list->data);
                rt_overlay_free(rt, od);
                }
 }
@@ -1129,7 +1129,7 @@ static gboolean rt_source_tile_render(RendererTiles *rt, ImageTile *it,
                        SourceTile *st;
                        gint rx, ry, rw, rh;
 
-                       st = work->data;
+                       st = static_cast<SourceTile *>(work->data);
                        work = work->next;
 
                        if (pr_clip_region(st->x, st->y, pr->source_tile_width, pr->source_tile_height,
@@ -1182,7 +1182,7 @@ static gboolean rt_source_tile_render(RendererTiles *rt, ImageTile *it,
                        gint rx, ry, rw, rh;
                        gint stx, sty, stw, sth;
 
-                       st = work->data;
+                       st = static_cast<SourceTile *>(work->data);
                        work = work->next;
 
                        stx = floor((gdouble)st->x * scale_x);
@@ -1654,7 +1654,7 @@ static gboolean rt_queue_draw_idle_cb(gpointer data)
 
        if (rt->draw_queue)
                {
-               qd = rt->draw_queue->data;
+               qd = static_cast<QueueData *>(rt->draw_queue->data);
                fast = (pr->zoom_2pass && ((pr->zoom_quality != GDK_INTERP_NEAREST && pr->scale != 1.0) || pr->post_process_slow));
                }
        else
@@ -1666,7 +1666,7 @@ static gboolean rt_queue_draw_idle_cb(gpointer data)
                        return rt_queue_schedule_next_draw(rt, FALSE);
                        }
 
-               qd = rt->draw_queue_2pass->data;
+               qd = static_cast<QueueData *>(rt->draw_queue_2pass->data);
                fast = FALSE;
                }
 
@@ -1736,7 +1736,7 @@ static void rt_queue_list_free(GList *list)
                {
                QueueData *qd;
 
-               qd = work->data;
+               qd = static_cast<QueueData *>(work->data);
                work = work->next;
 
                qd->it->qd = NULL;
@@ -2231,7 +2231,7 @@ static gboolean rt_draw_cb(GtkWidget *UNUSED(widget), cairo_t *cr, gpointer data
        work = rt->overlay_list;
        while (work)
                {
-               od = work->data;
+               od = static_cast<OverlayData *>(work->data);
                gint px, py, pw, ph;
                pw = gdk_pixbuf_get_width(od->pixbuf);
                ph = gdk_pixbuf_get_height(od->pixbuf);
index 9708d78..d8e1691 100644 (file)
@@ -937,7 +937,7 @@ static void search_result_thumb_height(SearchData *sd)
 
        list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
        if (!list) return;
-       cell = list->data;
+       cell = static_cast<GtkCellRenderer *>(list->data);
        g_list_free(list);
 
        g_object_set(G_OBJECT(cell), "height", (sd->thumb_enable) ? options->thumbnails.max_height : -1, NULL);
@@ -1025,9 +1025,9 @@ static void sr_menu_select_none_cb(GtkWidget *UNUSED(widget), gpointer data)
 static void sr_menu_edit_cb(GtkWidget *widget, gpointer data)
 {
        SearchData *sd;
-       const gchar *key = data;
+       const gchar *key = static_cast<const gchar *>(data);
 
-       sd = submenu_item_get_data(widget);
+       sd = static_cast<SearchData *>(submenu_item_get_data(widget));
        if (!sd) return;
 
        search_result_edit_selected(sd, key);
@@ -1118,7 +1118,7 @@ static void search_pop_menu_collections_cb(GtkWidget *widget, gpointer data)
        SearchData *sd;
        GList *selection_list;
 
-       sd = submenu_item_get_data(widget);
+       sd = static_cast<SearchData *>(submenu_item_get_data(widget));
        selection_list = search_result_selection_list(sd);
        pop_menu_collections(selection_list, data);
 
@@ -1347,7 +1347,7 @@ static gboolean search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event,
                GList *last;
 
                last = g_list_last(slist);
-               tpath = last->data;
+               tpath = static_cast<GtkTreePath *>(last->data);
 
                /* last is newest selected file */
                gtk_tree_model_get_iter(store, &iter, tpath);
@@ -1566,7 +1566,7 @@ static void search_gps_dnd_received_cb(GtkWidget *UNUSED(pane), GdkDragContext *
                */
                if (list != NULL)
                        {
-                       fd = list->data;
+                       fd = static_cast<FileData *>(list->data);
                        latitude = metadata_read_GPS_coord(fd, "Xmp.exif.GPSLatitude", 1000);
                        longitude = metadata_read_GPS_coord(fd, "Xmp.exif.GPSLongitude", 1000);
                        if (latitude != 1000 && longitude != 1000)
@@ -1603,7 +1603,7 @@ static void search_path_entry_dnd_received_cb(GtkWidget *UNUSED(pane), GdkDragCo
                */
                if (list != NULL)
                        {
-                       fd = list->data;
+                       fd = static_cast<FileData *>(list->data);
                        gtk_entry_set_text(GTK_ENTRY(sd->path_entry),
                                                g_strdup_printf("%s", fd->path));
                        gtk_widget_set_tooltip_text(GTK_WIDGET(sd->path_entry),g_strdup_printf("%s", fd->path));
@@ -1632,7 +1632,7 @@ static void search_image_content_dnd_received_cb(GtkWidget *UNUSED(pane), GdkDra
                */
                if (list != NULL)
                        {
-                       fd = list->data;
+                       fd = static_cast<FileData *>(list->data);
                        gtk_entry_set_text(GTK_ENTRY(sd->entry_similarity),
                                                g_strdup_printf("%s", fd->path));
                        gtk_widget_set_tooltip_text(GTK_WIDGET(sd->entry_similarity),g_strdup_printf("%s", fd->path));
@@ -1960,7 +1960,7 @@ static gboolean search_file_next(SearchData *sd)
                sd->search_total++;
                }
 
-       fd = sd->search_file_list->data;
+       fd = static_cast<FileData *>(sd->search_file_list->data);
 
        if (match && sd->match_name_enable && sd->search_name)
                {
@@ -2472,7 +2472,7 @@ static gboolean search_step_cb(gpointer data)
                return FALSE;
                }
 
-       fd = sd->search_folder_list->data;
+       fd = static_cast<FileData *>(sd->search_folder_list->data);
 
        if (g_list_find(sd->search_done_list, fd) == NULL)
                {
@@ -2511,7 +2511,7 @@ static gboolean search_step_cb(gpointer data)
                                        GList *link;
                                        gchar *meta_path;
 
-                                       fdp = work->data;
+                                       fdp = static_cast<FileData *>(work->data);
                                        link = work;
                                        work = work->next;
 
@@ -3038,7 +3038,7 @@ static void menu_choice_comment_cb(GtkWidget *combo, gpointer data)
 
 static void menu_choice_spin_cb(GtkAdjustment *adjustment, gpointer data)
 {
-       gint *value = data;
+       gint *value = static_cast<gint *>(data);
 
        *value = (gint)gtk_adjustment_get_value(adjustment);
 }
@@ -3079,7 +3079,7 @@ static void menu_choice_check_cb(GtkWidget *button, gpointer data)
        active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button));
        gtk_widget_set_sensitive(widget, active);
 
-       value = g_object_get_data(G_OBJECT(button), "check_var");
+       value = static_cast<gboolean *>(g_object_get_data(G_OBJECT(button), "check_var"));
        if (value) *value = active;
 }
 
index e72ef62..9c9a3d7 100644 (file)
@@ -81,8 +81,8 @@ void image_sim_free(ImageSimilarityData *sd)
 
 static gint image_sim_channel_eq_sort_cb(gconstpointer a, gconstpointer b)
 {
-       gint *pa = (gpointer)a;
-       gint *pb = (gpointer)b;
+       gint *pa = static_cast<gint *>((gpointer)a);
+       gint *pb = static_cast<gint *>((gpointer)b);
        if (pa[1] < pb[1]) return -1;
        if (pa[1] > pb[1]) return 1;
        return 0;
index 3fac11a..c8a9111 100644 (file)
@@ -234,7 +234,7 @@ static gboolean slideshow_step(SlideShowData *ss, gboolean forward)
                {
                CollectInfo *info;
 
-               info = g_list_nth_data(ss->cd->list, row);
+               info = static_cast<CollectInfo *>(g_list_nth_data(ss->cd->list, row));
                ss->slide_fd = file_data_ref(info->fd);
 
                if (ss->lw)
@@ -289,7 +289,7 @@ static gboolean slideshow_step(SlideShowData *ss, gboolean forward)
                else if (ss->cd)
                        {
                        CollectInfo *info;
-                       info = g_list_nth_data(ss->cd->list, r);
+                       info = static_cast<CollectInfo *>(g_list_nth_data(ss->cd->list, r));
                        if (info) image_prebuffer_set(ss->imd, info->fd);
                        }
                else if (ss->from_selection)
index b5c0b18..65f038a 100644 (file)
@@ -900,7 +900,7 @@ void thumb_loader_std_thumb_file_validate_cancel(ThumbLoaderStd *tl)
 
        if (!tl) return;
 
-       tv = tl->data;
+       tv = static_cast<ThumbValidate *>(tl->data);
 
        if (tv->idle_id)
                {
@@ -1176,7 +1176,7 @@ static gboolean thumb_std_maint_move_idle(gpointer UNUSED(data))
 
        if (!thumb_std_maint_move_list) return FALSE;
 
-       tm = thumb_std_maint_move_list->data;
+       tm = static_cast<TMaintMove *>(thumb_std_maint_move_list->data);
 
        thumb_std_maint_move_list = g_list_remove(thumb_std_maint_move_list, tm);
        if (!thumb_std_maint_move_list) thumb_std_maint_move_tail = NULL;
index 9387b34..a3c2962 100644 (file)
@@ -347,9 +347,9 @@ static void toolbarlist_add_button(const gchar *name, const gchar *label,
 
 static void toolbarlist_add_cb(GtkWidget *widget, gpointer data)
 {
-       const gchar *name = g_object_get_data(G_OBJECT(widget), "toolbar_add_name");
-       const gchar *label = g_object_get_data(G_OBJECT(widget), "toolbar_add_label");
-       const gchar *stock_id = g_object_get_data(G_OBJECT(widget), "toolbar_add_stock_id");
+       const gchar *name = static_cast<const gchar *>(g_object_get_data(G_OBJECT(widget), "toolbar_add_name"));
+       const gchar *label = static_cast<const gchar *>(g_object_get_data(G_OBJECT(widget), "toolbar_add_label"));
+       const gchar *stock_id = static_cast<const gchar *>(g_object_get_data(G_OBJECT(widget), "toolbar_add_stock_id"));
        ToolbarData *tbbd = static_cast<ToolbarData *>(data);
 
        toolbarlist_add_button(name, label, stock_id, GTK_BOX(tbbd->vbox));
@@ -447,17 +447,17 @@ void toolbar_apply(ToolbarType bar)
        work_windows = layout_window_list;
        while (work_windows)
                {
-               lw = work_windows->data;
+               lw = static_cast<LayoutWindow *>(work_windows->data);
 
                layout_toolbar_clear(lw, bar);
 
                work_toolbar = gtk_container_get_children(GTK_CONTAINER(toolbarlist[bar]->vbox));
                while (work_toolbar)
                        {
-                       GtkButton *button = work_toolbar->data;
+                       GtkButton *button = static_cast<GtkButton *>(work_toolbar->data);
                        ToolbarButtonData *tbbd;
 
-                       tbbd = g_object_get_data(G_OBJECT(button),"toolbarbuttondata");
+                       tbbd = static_cast<ToolbarButtonData *>(g_object_get_data(G_OBJECT(button),"toolbarbuttondata"));
                        layout_toolbar_add(lw, bar, tbbd->name);
 
                        work_toolbar = work_toolbar->next;
@@ -484,7 +484,7 @@ static void toolbarlist_populate(LayoutWindow *lw, GtkBox *box, ToolbarType bar)
 
        while (work)
                {
-               gchar *name = work->data;
+               gchar *name = static_cast<gchar *>(work->data);
                gchar *label;
                gchar *icon;
                work = work->next;
index 6557c33..dc5bc64 100644 (file)
@@ -58,7 +58,7 @@ static gint file_util_safe_number(gint64 free_space)
                FileData *fd;
                gint v;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                v = (gint)strtol(fd->name, NULL, 10);
@@ -78,7 +78,7 @@ static gint file_util_safe_number(gint64 free_space)
                        sorted = TRUE;
                        }
 
-               fd = list->data;
+               fd = static_cast<FileData *>(list->data);
                list = g_list_remove(list, fd);
 
                DEBUG_1("expunging from trash for space: %s", fd->name);
index 0c64c98..61267a0 100644 (file)
@@ -202,7 +202,7 @@ static void bookmark_select_cb(GtkWidget *button, gpointer data)
        BookMarkData *bm = static_cast<BookMarkData *>(data);
        BookButtonData *b;
 
-       b = g_object_get_data(G_OBJECT(button), "bookbuttondata");
+       b = static_cast<BookButtonData *>(g_object_get_data(G_OBJECT(button), "bookbuttondata"));
        if (!b) return;
 
        if (bm->select_func) bm->select_func(b->path, bm->select_data);
@@ -322,7 +322,7 @@ static void bookmark_move(BookMarkData *bm, GtkWidget *button, gint direction)
 
        if (!bm->editable) return;
 
-       b = g_object_get_data(G_OBJECT(button), "bookbuttondata");
+       b = static_cast<BookButtonData *>(g_object_get_data(G_OBJECT(button), "bookbuttondata"));
        if (!b) return;
 
        list = gtk_container_get_children(GTK_CONTAINER(bm->box));
@@ -382,7 +382,7 @@ static void bookmark_menu_popup(BookMarkData *bm, GtkWidget *button,
        GtkWidget *menu;
        BookButtonData *b;
 
-       b = g_object_get_data(G_OBJECT(button), "bookbuttondata");
+       b = static_cast<BookButtonData *>(g_object_get_data(G_OBJECT(button), "bookbuttondata"));
        if (!b) return;
 
        bm->active_button = b;
@@ -461,7 +461,7 @@ static void bookmark_drag_set_data(GtkWidget *button,
        return;
        if (gdk_drag_context_get_dest_window(context) == gtk_widget_get_window(bm->widget)) return;
 
-       b = g_object_get_data(G_OBJECT(button), "bookbuttondata");
+       b = static_cast<BookButtonData *>(g_object_get_data(G_OBJECT(button), "bookbuttondata"));
        if (!b) return;
 
        list = g_list_append(list, b->path);
@@ -506,7 +506,7 @@ static gboolean bookmark_path_tooltip_cb(GtkWidget *button, gpointer UNUSED(data
 {
        BookButtonData *b;
 
-       b = g_object_get_data(G_OBJECT(button), "bookbuttondata");
+       b = static_cast<BookButtonData *>(g_object_get_data(G_OBJECT(button), "bookbuttondata"));
        gtk_widget_set_tooltip_text(GTK_WIDGET(button), b->path);
 
        return FALSE;
@@ -558,9 +558,9 @@ static void bookmark_populate(BookMarkData *bm)
                        {
                        gchar *name;
 
-                       name = work->data;
+                       name = static_cast<gchar *>(work->data);
                        work = work->next;
-                       path = work->data;
+                       path = static_cast<gchar *>(work->data);
                        work = work->next;
 
                        if (strcmp(name, ".") == 0)
@@ -582,7 +582,7 @@ static void bookmark_populate(BookMarkData *bm)
                {
                BookButtonData *b;
 
-               b = bookmark_from_string(work->data);
+               b = bookmark_from_string(static_cast<const gchar *>(work->data));
                if (b)
                        {
                        if (strcmp(b->name, ".") == 0)
@@ -682,7 +682,7 @@ static void bookmark_populate_all(const gchar *key)
                {
                BookMarkData *bm;
 
-               bm = work->data;
+               bm = static_cast<BookMarkData *>(work->data);
                work = work->next;
 
                if (strcmp(bm->key, key) == 0)
@@ -719,7 +719,7 @@ static void bookmark_dnd_get_data(GtkWidget *UNUSED(widget),
                work = list;
                while (work)
                        {
-                       gchar *path = work->data;
+                       gchar *path = static_cast<gchar *>(work->data);
                        gchar *buf;
 
                        work = work->next;
@@ -806,7 +806,7 @@ void bookmark_list_set_key(GtkWidget *list, const gchar *key)
 
        if (!list || !key) return;
 
-       bm = g_object_get_data(G_OBJECT(list), BOOKMARK_DATA_KEY);
+       bm = static_cast<BookMarkData *>(g_object_get_data(G_OBJECT(list), BOOKMARK_DATA_KEY));
        if (!bm) return;
 
        if (bm->key && strcmp(bm->key, key) == 0) return;
@@ -821,7 +821,7 @@ void bookmark_list_set_no_defaults(GtkWidget *list, gboolean no_defaults)
 {
        BookMarkData *bm;
 
-       bm = g_object_get_data(G_OBJECT(list), BOOKMARK_DATA_KEY);
+       bm = static_cast<BookMarkData *>(g_object_get_data(G_OBJECT(list), BOOKMARK_DATA_KEY));
        if (!bm) return;
 
        bm->no_defaults = no_defaults;
@@ -831,7 +831,7 @@ void bookmark_list_set_editable(GtkWidget *list, gboolean editable)
 {
        BookMarkData *bm;
 
-       bm = g_object_get_data(G_OBJECT(list), BOOKMARK_DATA_KEY);
+       bm = static_cast<BookMarkData *>(g_object_get_data(G_OBJECT(list), BOOKMARK_DATA_KEY));
        if (!bm) return;
 
        bm->editable = editable;
@@ -841,7 +841,7 @@ void bookmark_list_set_only_directories(GtkWidget *list, gboolean only_directori
 {
        BookMarkData *bm;
 
-       bm = g_object_get_data(G_OBJECT(list), BOOKMARK_DATA_KEY);
+       bm = static_cast<BookMarkData *>(g_object_get_data(G_OBJECT(list), BOOKMARK_DATA_KEY));
        if (!bm) return;
 
        bm->only_directories = only_directories;
@@ -852,7 +852,7 @@ void bookmark_list_add(GtkWidget *list, const gchar *name, const gchar *path)
        BookMarkData *bm;
        gchar *buf;
 
-       bm = g_object_get_data(G_OBJECT(list), BOOKMARK_DATA_KEY);
+       bm = static_cast<BookMarkData *>(g_object_get_data(G_OBJECT(list), BOOKMARK_DATA_KEY));
        if (!bm) return;
 
        buf = bookmark_string(name, path, NULL);
@@ -942,7 +942,7 @@ void history_combo_append_history(GtkWidget *widget, const gchar *text)
        HistoryComboData *hc;
        gchar *new_text;
 
-       hc = g_object_get_data(G_OBJECT(widget), "history_combo_data");
+       hc = static_cast<HistoryComboData *>(g_object_get_data(G_OBJECT(widget), "history_combo_data"));
        if (!hc)
                {
                log_printf("widget is not a history combo\n");
index de0c0e0..eeeb856 100644 (file)
@@ -565,7 +565,7 @@ gboolean copy_file(const gchar *s, const gchar *t)
                gchar *link_target;
                ssize_t i;
 
-               link_target = g_malloc(st.st_size + 1);
+               link_target = static_cast<gchar *>(g_malloc(st.st_size + 1));
                i = readlink(sl, link_target, st.st_size);
                if (i<0)
                        {
@@ -581,7 +581,7 @@ gboolean copy_file(const gchar *s, const gchar *t)
                        gchar *lastslash = strrchr(sl, G_DIR_SEPARATOR);
                        gint len = lastslash - sl + 1;
 
-                       absolute = g_malloc(len + st.st_size + 1);
+                       absolute = static_cast<gchar *>(g_malloc(len + st.st_size + 1));
                        strncpy(absolute, sl, len);
                        strcpy(absolute + len, link_target);
                        g_free(link_target);
@@ -741,7 +741,7 @@ GList *string_list_copy(const GList *list)
                {
                gchar *path;
 
-               path = work->data;
+               path = static_cast<gchar *>(work->data);
                work = work->next;
 
                new_list = g_list_prepend(new_list, g_strdup(path));
index 86ba50a..dc8a6a3 100644 (file)
@@ -161,7 +161,7 @@ void help_window_set_key(GtkWidget *window, const gchar *key)
 
        if (!window) return;
 
-       text = g_object_get_data(G_OBJECT(window), "text_widget");
+       text = static_cast<GtkWidget *>(g_object_get_data(G_OBJECT(window), "text_widget"));
        if (!text) return;
 
        gdk_window_raise(gtk_widget_get_window(window));
index 8b8c381..d111e2f 100644 (file)
@@ -124,7 +124,7 @@ static void menu_item_add_main_window_accelerator(GtkWidget *menu, GtkAccelGroup
 
        pango_parse_markup(menu_label, -1, '_', NULL, &menu_label_text, NULL, NULL);
 
-       lw = layout_window_list->data; /* get the actions from the first window, it should not matter, they should be the same in all windows */
+       lw = static_cast<LayoutWindow *>(layout_window_list->data); /* get the actions from the first window, it should not matter, they should be the same in all windows */
 
        g_assert(lw && lw->ui_manager);
        groups = gtk_ui_manager_get_action_groups(lw->ui_manager);
@@ -180,8 +180,8 @@ GtkWidget *menu_item_add(GtkWidget *menu, const gchar *label,
        hard_coded_window_keys *window_keys;
 
        item = gtk_menu_item_new_with_mnemonic(label);
-       window_keys = g_object_get_data(G_OBJECT(menu), "window_keys");
-       accel_group = g_object_get_data(G_OBJECT(menu), "accel_group");
+       window_keys = static_cast<hard_coded_window_keys *>(g_object_get_data(G_OBJECT(menu), "window_keys"));
+       accel_group = static_cast<GtkAccelGroup *>(g_object_get_data(G_OBJECT(menu), "accel_group"));
 
        if (accel_group && window_keys)
                {
@@ -206,8 +206,8 @@ GtkWidget *menu_item_add_stock(GtkWidget *menu, const gchar *label, const gchar
        hard_coded_window_keys *window_keys;
 
        item = gtk_image_menu_item_new_with_mnemonic(label);
-       window_keys = g_object_get_data(G_OBJECT(menu), "window_keys");
-       accel_group = g_object_get_data(G_OBJECT(menu), "accel_group");
+       window_keys = static_cast<hard_coded_window_keys *>(g_object_get_data(G_OBJECT(menu), "window_keys"));
+       accel_group = static_cast<GtkAccelGroup *>(g_object_get_data(G_OBJECT(menu), "accel_group"));
 
        image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_MENU);
        gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
@@ -236,8 +236,8 @@ GtkWidget *menu_item_add_sensitive(GtkWidget *menu, const gchar *label, gboolean
 
        item = menu_item_add(menu, label, func, data);
        gtk_widget_set_sensitive(item, sensitive);
-       window_keys = g_object_get_data(G_OBJECT(menu), "window_keys");
-       accel_group = g_object_get_data(G_OBJECT(menu), "accel_group");
+       window_keys = static_cast<hard_coded_window_keys *>(g_object_get_data(G_OBJECT(menu), "window_keys"));
+       accel_group = static_cast<GtkAccelGroup *>(g_object_get_data(G_OBJECT(menu), "accel_group"));
        if (accel_group && window_keys)
                {
                menu_item_add_accelerator(item, accel_group, window_keys);
@@ -259,8 +259,8 @@ GtkWidget *menu_item_add_stock_sensitive(GtkWidget *menu, const gchar *label, co
 
        item = menu_item_add_stock(menu, label, stock_id, func, data);
        gtk_widget_set_sensitive(item, sensitive);
-       window_keys = g_object_get_data(G_OBJECT(menu), "window_keys");
-       accel_group = g_object_get_data(G_OBJECT(menu), "accel_group");
+       window_keys = static_cast<hard_coded_window_keys *>(g_object_get_data(G_OBJECT(menu), "window_keys"));
+       accel_group = static_cast<GtkAccelGroup *>(g_object_get_data(G_OBJECT(menu), "accel_group"));
        if (accel_group && window_keys)
                {
                menu_item_add_accelerator(item, accel_group, window_keys);
@@ -281,8 +281,8 @@ GtkWidget *menu_item_add_check(GtkWidget *menu, const gchar *label, gboolean act
        hard_coded_window_keys *window_keys;
 
        item = gtk_check_menu_item_new_with_mnemonic(label);
-       window_keys = g_object_get_data(G_OBJECT(menu), "window_keys");
-       accel_group = g_object_get_data(G_OBJECT(menu), "accel_group");
+       window_keys = static_cast<hard_coded_window_keys *>(g_object_get_data(G_OBJECT(menu), "window_keys"));
+       accel_group = static_cast<GtkAccelGroup *>(g_object_get_data(G_OBJECT(menu), "accel_group"));
 
        if (accel_group && window_keys)
                {
@@ -309,8 +309,8 @@ GtkWidget *menu_item_add_radio(GtkWidget *menu, const gchar *label, gpointer ite
        g_object_set_data(G_OBJECT(item), "menu_item_radio_data", item_data);
        g_object_set(G_OBJECT(item), "draw-as-radio", TRUE, NULL);
 
-       window_keys = g_object_get_data(G_OBJECT(menu), "window_keys");
-       accel_group = g_object_get_data(G_OBJECT(menu), "accel_group");
+       window_keys = static_cast<hard_coded_window_keys *>(g_object_get_data(G_OBJECT(menu), "window_keys"));
+       accel_group = static_cast<GtkAccelGroup *>(g_object_get_data(G_OBJECT(menu), "accel_group"));
        if (accel_group && window_keys)
                {
                menu_item_add_accelerator(item, accel_group, window_keys);
index 77c84e1..f568766 100644 (file)
@@ -119,7 +119,7 @@ GtkWidget *pref_group_parent(GtkWidget *child)
                {
                GtkWidget *group;
 
-               group = g_object_get_data(G_OBJECT(parent), "pref_group");
+               group = static_cast<GtkWidget *>(g_object_get_data(G_OBJECT(parent), "pref_group"));
                if (group && GTK_IS_WIDGET(group)) return group;
 
                parent = gtk_widget_get_parent(parent);
@@ -342,7 +342,7 @@ GtkWidget *pref_checkbox_new(GtkWidget *parent_box, const gchar *text, gboolean
 
 static void pref_checkbox_int_cb(GtkWidget *widget, gpointer data)
 {
-       gboolean *result = data;
+       gboolean *result = static_cast<gboolean *>(data);
 
        *result = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
 }
@@ -441,7 +441,7 @@ GtkWidget *pref_radiobutton_new(GtkWidget *parent_box, GtkWidget *sibling,
 
 static void pref_radiobutton_int_cb(GtkWidget *widget, gpointer data)
 {
-       gboolean *result = data;
+       gboolean *result = static_cast<gboolean *>(data);
 
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
                {
@@ -531,7 +531,7 @@ GtkWidget *pref_spin_new(GtkWidget *parent_box, const gchar *text, const gchar *
 
 static void pref_spin_int_cb(GtkWidget *widget, gpointer data)
 {
-       gint *var = data;
+       gint *var = static_cast<gint *>(data);
        *var = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
 }
 
@@ -1094,7 +1094,7 @@ void date_selection_set(GtkWidget *widget, gint day, gint month, gint year)
 {
        DateSelection *ds;
 
-       ds = g_object_get_data(G_OBJECT(widget), DATE_SELECION_KEY);
+       ds = static_cast<DateSelection *>(g_object_get_data(G_OBJECT(widget), DATE_SELECION_KEY));
        if (!ds) return;
 
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(ds->spin_d), (gdouble)day);
@@ -1107,7 +1107,7 @@ void date_selection_get(GtkWidget *widget, gint *day, gint *month, gint *year)
 {
        DateSelection *ds;
 
-       ds = g_object_get_data(G_OBJECT(widget), DATE_SELECION_KEY);
+       ds = static_cast<DateSelection *>(g_object_get_data(G_OBJECT(widget), DATE_SELECION_KEY));
        if (!ds) return;
 
        if (day) *day = gtk_spin_button_get_value(GTK_SPIN_BUTTON(ds->spin_d));
@@ -1165,7 +1165,7 @@ static GList *pref_list_find(const gchar *group, const gchar *token)
        work = history_list_get_by_key(group);
        while (work)
                {
-               const gchar *text = work->data;
+               const gchar *text = static_cast<const gchar *>(work->data);
 
                if (strncmp(text, token, l) == 0) return work;
 
@@ -1221,7 +1221,7 @@ static void pref_list_set(const gchar *group, const gchar *key, const gchar *mar
        work = pref_list_find(group, token);
        if (work)
                {
-               gchar *old_path = work->data;
+               gchar *old_path = static_cast<gchar *>(work->data);
 
                if (text)
                        {
index bea126b..35ce43f 100644 (file)
@@ -252,7 +252,7 @@ static void dest_populate(Dest_Data *dd, const gchar *path)
                        {
                        GtkTreeIter iter;
                        gchar *filepath;
-                       const gchar *name = list->data;
+                       const gchar *name = static_cast<const gchar *>(list->data);
 
                        filepath = g_build_filename(path, name, NULL);
 
@@ -886,8 +886,8 @@ static void dest_filter_list_sync(Dest_Data *dd)
                gchar *name;
                gchar *filter;
 
-               name = twork->data;
-               filter = fwork->data;
+               name = static_cast<gchar *>(twork->data);
+               filter = static_cast<gchar *>(fwork->data);
 
                gtk_list_store_append(store, &iter);
                gtk_list_store_set(store, &iter, FILTER_COLUMN_NAME, name,
@@ -916,7 +916,7 @@ static void dest_filter_add(Dest_Data *dd, const gchar *filter, const gchar *des
        work = dd->filter_list;
        while (work)
                {
-               gchar *f = work->data;
+               gchar *f = static_cast<gchar *>(work->data);
 
                if (strcmp(f, filter) == 0)
                        {
@@ -1245,7 +1245,7 @@ GtkWidget *path_selection_new_with_files(GtkWidget *entry, const gchar *path,
 void path_selection_add_select_func(GtkWidget *entry,
                                    void (*func)(const gchar *, gpointer), gpointer data)
 {
-       Dest_Data *dd = g_object_get_data(G_OBJECT(entry), "destination_data");
+       Dest_Data *dd = static_cast<Dest_Data *>(g_object_get_data(G_OBJECT(entry), "destination_data"));
 
        if (!dd) return;
 
@@ -1255,7 +1255,7 @@ void path_selection_add_select_func(GtkWidget *entry,
 
 void path_selection_add_filter(GtkWidget *entry, const gchar *filter, const gchar *description, gboolean set)
 {
-       Dest_Data *dd = g_object_get_data(G_OBJECT(entry), "destination_data");
+       Dest_Data *dd = static_cast<Dest_Data *>(g_object_get_data(G_OBJECT(entry), "destination_data"));
 
        if (!dd) return;
        if (!filter) return;
@@ -1265,7 +1265,7 @@ void path_selection_add_filter(GtkWidget *entry, const gchar *filter, const gcha
 
 void path_selection_clear_filter(GtkWidget *entry)
 {
-       Dest_Data *dd = g_object_get_data(G_OBJECT(entry), "destination_data");
+       Dest_Data *dd = static_cast<Dest_Data *>(g_object_get_data(G_OBJECT(entry), "destination_data"));
 
        if (!dd) return;
 
index 7e675dd..3911dbd 100644 (file)
@@ -47,7 +47,7 @@ static void spinner_set_frame(SpinnerData *sp, guint frame)
 {
        GdkPixbuf *pb;
 
-       pb = g_list_nth_data(sp->list, frame);
+       pb = static_cast<GdkPixbuf *>(g_list_nth_data(sp->list, frame));
        if (pb) gtk_image_set_from_pixbuf(GTK_IMAGE(sp->image), pb);
 
        sp->frame = frame;
@@ -162,7 +162,7 @@ GtkWidget *spinner_new(const gchar *path, gint interval)
                {
                GdkPixbuf *pb;
 
-               pb = sp->list->data;
+               pb = static_cast<GdkPixbuf *>(sp->list->data);
                sp->image = gtk_image_new_from_pixbuf(pb);
                }
        else
@@ -184,7 +184,7 @@ void spinner_set_interval(GtkWidget *spinner, gint interval)
 {
        SpinnerData *sp;
 
-       sp = g_object_get_data(G_OBJECT(spinner), "spinner");
+       sp = static_cast<SpinnerData *>(g_object_get_data(G_OBJECT(spinner), "spinner"));
 
        spinner_set_timeout(sp, interval);
 }
index 8762906..6951f7a 100644 (file)
@@ -270,11 +270,11 @@ static gboolean tab_completion_popup_key_press(GtkWidget *widget, GdkEventKey *e
 
 static void tab_completion_popup_cb(GtkWidget *widget, gpointer data)
 {
-       gchar *name = data;
+       gchar *name = static_cast<gchar *>(data);
        TabCompData *td;
        gchar *buf;
 
-       td = g_object_get_data(G_OBJECT(widget), "tab_completion_data");
+       td = static_cast<TabCompData *>(g_object_get_data(G_OBJECT(widget), "tab_completion_data"));
        if (!td) return;
 
        buf = g_build_filename(td->dir_path, name, NULL);
@@ -307,7 +307,7 @@ static void tab_completion_popup_list(TabCompData *td, GList *list)
        work = list;
        while (work && count < TAB_COMP_POPUP_MAX)
                {
-               gchar *name = work->data;
+               gchar *name = static_cast<gchar *>(work->data);
                GtkWidget *item;
 
                item = menu_item_add_simple(menu, name, G_CALLBACK(tab_completion_popup_cb), name);
@@ -393,7 +393,7 @@ static gboolean tab_completion_do(TabCompData *td)
                                gchar *buf;
                                const gchar *file;
 
-                               file = td->file_list->data;
+                               file = static_cast<const gchar *>(td->file_list->data);
                                buf = g_build_filename(entry_dir, file, NULL);
                                if (isdir(buf))
                                        {
@@ -452,7 +452,7 @@ static gboolean tab_completion_do(TabCompData *td)
                list = td->file_list;
                while (list)
                        {
-                       gchar *file = list->data;
+                       gchar *file = static_cast<gchar *>(list->data);
                        if (strncmp(entry_file, file, l) == 0)
                                {
                                poss = g_list_prepend(poss, file);
@@ -464,7 +464,7 @@ static gboolean tab_completion_do(TabCompData *td)
                        {
                        if (!poss->next)
                                {
-                               gchar *file = poss->data;
+                               gchar *file = static_cast<gchar *>(poss->data);
                                gchar *buf;
 
                                buf = g_build_filename(entry_dir, file, NULL);
@@ -479,7 +479,7 @@ static gboolean tab_completion_do(TabCompData *td)
                                {
                                gsize c = strlen(entry_file);
                                gboolean done = FALSE;
-                               gchar *test_file = poss->data;
+                               gchar *test_file = static_cast<gchar *>(poss->data);
 
                                while (!done)
                                        {
@@ -487,7 +487,7 @@ static gboolean tab_completion_do(TabCompData *td)
                                        if (!list) done = TRUE;
                                        while (list && !done)
                                                {
-                                               gchar *file = list->data;
+                                               gchar *file = static_cast<gchar *>(list->data);
                                                if (strlen(file) < c || strncmp(test_file, file, c) != 0)
                                                        {
                                                        done = TRUE;
@@ -573,7 +573,7 @@ static void tab_completion_button_pressed(GtkWidget *UNUSED(widget), gpointer da
        TabCompData *td;
        GtkWidget *entry = static_cast<GtkWidget *>(data);
 
-       td = g_object_get_data(G_OBJECT(entry), "tab_completion_data");
+       td = static_cast<TabCompData *>(g_object_get_data(G_OBJECT(entry), "tab_completion_data"));
 
        if (!td) return;
 
@@ -661,7 +661,7 @@ GtkWidget *tab_completion_new_with_history(GtkWidget **entry, const gchar *text,
 
        tab_completion_add_to_entry(combo_entry, enter_func, NULL, NULL, data);
 
-       td = g_object_get_data(G_OBJECT(combo_entry), "tab_completion_data");
+       td = static_cast<TabCompData *>(g_object_get_data(G_OBJECT(combo_entry), "tab_completion_data"));
        if (!td) return NULL; /* this should never happen! */
 
        td->combo = combo;
@@ -694,7 +694,7 @@ GtkWidget *tab_completion_new_with_history(GtkWidget **entry, const gchar *text,
 
 const gchar *tab_completion_set_to_last_history(GtkWidget *entry)
 {
-       TabCompData *td = g_object_get_data(G_OBJECT(entry), "tab_completion_data");
+       TabCompData *td = static_cast<TabCompData *>(g_object_get_data(G_OBJECT(entry), "tab_completion_data"));
        const gchar *buf;
 
        if (!td || !td->has_history) return NULL;
@@ -715,7 +715,7 @@ void tab_completion_append_to_history(GtkWidget *entry, const gchar *path)
        GList *work;
        gint n = 0;
 
-       td = g_object_get_data(G_OBJECT(entry), "tab_completion_data");
+       td = static_cast<TabCompData *>(g_object_get_data(G_OBJECT(entry), "tab_completion_data"));
 
        if (!path) return;
 
@@ -791,7 +791,7 @@ void tab_completion_add_to_entry(GtkWidget *entry, void (*enter_func)(const gcha
 
 void tab_completion_add_tab_func(GtkWidget *entry, void (*tab_func)(const gchar *, gpointer), gpointer data)
 {
-       TabCompData *td = g_object_get_data(G_OBJECT(entry), "tab_completion_data");
+       TabCompData *td = static_cast<TabCompData *>(g_object_get_data(G_OBJECT(entry), "tab_completion_data"));
 
        if (!td) return;
 
@@ -802,7 +802,7 @@ void tab_completion_add_tab_func(GtkWidget *entry, void (*tab_func)(const gchar
 /* Add a callback function called when a new entry is appended to the list */
 void tab_completion_add_append_func(GtkWidget *entry, void (*tab_append_func)(const gchar *, gpointer, gint), gpointer data)
 {
-       TabCompData *td = g_object_get_data(G_OBJECT(entry), "tab_completion_data");
+       TabCompData *td = static_cast<TabCompData *>(g_object_get_data(G_OBJECT(entry), "tab_completion_data"));
 
        if (!td) return;
 
@@ -906,7 +906,7 @@ void tab_completion_add_select_button(GtkWidget *entry, const gchar *title, gboo
        GtkWidget *parent;
        GtkWidget *hbox;
 
-       td = g_object_get_data(G_OBJECT(entry), "tab_completion_data");
+       td = static_cast<TabCompData *>(g_object_get_data(G_OBJECT(entry), "tab_completion_data"));
 
        if (!td) return;
 
index a0792d2..19d5a37 100644 (file)
@@ -195,7 +195,7 @@ gboolean tree_edit_by_path(GtkTreeView *tree, GtkTreePath *tpath, gint column, c
        work = list;
        while (work && !cell)
                {
-               cell = work->data;
+               cell = static_cast<GtkCellRenderer *>(work->data);
                if (!GTK_IS_CELL_RENDERER_TEXT(cell))
                        {
                        cell = NULL;
@@ -293,7 +293,7 @@ gboolean tree_view_get_cell_origin(GtkTreeView *widget, GtkTreePath *tpath, gint
                work = renderers;
                while (work && !cell)
                        {
-                       cell = work->data;
+                       cell = static_cast<GtkCellRenderer *>(work->data);
                        work = work->next;
                        if (!GTK_IS_CELL_RENDERER_TEXT(cell)) cell = NULL;
                        }
@@ -545,7 +545,7 @@ void widget_auto_scroll_stop(GtkWidget *widget)
 {
        AutoScrollData *sd;
 
-       sd = g_object_get_data(G_OBJECT(widget), "autoscroll");
+       sd = static_cast<AutoScrollData *>(g_object_get_data(G_OBJECT(widget), "autoscroll"));
        if (!sd) return;
        g_object_set_data(G_OBJECT(widget), "autoscroll", NULL);
 
index 85d5e87..f067d41 100644 (file)
@@ -54,7 +54,7 @@ gchar **uris_from_pathlist(GList *list)
        work = list;
        while (work)
                {
-               const gchar *path = work->data;
+               const gchar *path = static_cast<const gchar *>(work->data);
                gchar *local_path = path_from_utf8(path);
                uris[i] = g_filename_to_uri(local_path, NULL, NULL);
                g_free(local_path);
index 04355ed..57e9181 100644 (file)
@@ -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 */
@@ -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)
@@ -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);
                        }
index f193440..e12d9bc 100644 (file)
@@ -120,7 +120,7 @@ const gchar *vdlist_row_get_path(ViewDir *vd, gint row)
 {
        FileData *fd;
 
-       fd = g_list_nth_data(VDLIST(vd)->list, row);
+       fd = static_cast<FileData *>(g_list_nth_data(VDLIST(vd)->list, row));
 
        if (fd) return fd->path;
 
@@ -183,7 +183,7 @@ static gboolean vdlist_populate(ViewDir *vd, gboolean clear)
                const gchar *date = "";
                gboolean done = FALSE;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
 
                if (access_file(fd->path, R_OK | X_OK) && fd->name)
                        {
index a66e4e1..6d41cb5 100644 (file)
@@ -285,7 +285,7 @@ static GList *parts_list_add_node_points(ViewDir *vd, GList *list)
                FileData *fd = NULL;
 
                pd = g_new0(PathData, 1);
-               pd->name = work->data;
+               pd->name = static_cast<gchar *>(work->data);
 
                while (valid && !fd)
                        {
@@ -545,7 +545,7 @@ gboolean vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gboolean f
                {
                FileData *fd;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                if (strcmp(fd->name, ".") == 0 || strcmp(fd->name, "..") == 0)
@@ -650,7 +650,7 @@ FileData *vdtree_populate_path(ViewDir *vd, FileData *target_fd, gboolean expand
                                return NULL;
                                }
 
-                       parent_pd = work->prev->data;
+                       parent_pd = static_cast<PathData *>(work->prev->data);
 
                        if (!vd_find_row(vd, parent_pd->node, &parent_iter) ||
                            !vdtree_populate_path_by_iter(vd, &parent_iter, force, target_fd) ||
index 224822c..5f169a7 100644 (file)
@@ -382,7 +382,7 @@ static void vd_drop_menu_filter_cb(GtkWidget *widget, gpointer data)
 
        if (!vd->drop_fd) return;
 
-       key = g_object_get_data(G_OBJECT(widget), "filter_key");
+       key = static_cast<const gchar *>(g_object_get_data(G_OBJECT(widget), "filter_key"));
 
        path = vd->drop_fd->path;
        list = vd->drop_list;
@@ -653,7 +653,7 @@ static void vd_pop_menu_sort_cb(GtkWidget *widget, gpointer data)
        ViewDir *vd;
        SortType type;
 
-       vd = submenu_item_get_data(widget);
+       vd = static_cast<ViewDir *>(submenu_item_get_data(widget));
 
        if (!vd) return;
        if (!vd->layout) return;
index 4c91925..f689dc9 100644 (file)
@@ -314,7 +314,7 @@ static void vficon_mark_toggled_cb(GtkCellRendererToggle *cell, gchar *path_str,
        column = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cell), "column_number"));
        g_object_get(G_OBJECT(cell), "toggled_mark", &toggled_mark, NULL);
 
-       fd = g_list_nth_data(list, column);
+       fd = static_cast<FileData *>(g_list_nth_data(list, column));
        if (fd)
                {
                file_data_set_mark(fd, toggled_mark, !file_data_get_mark(fd, toggled_mark));
@@ -445,7 +445,7 @@ static void tip_update(ViewFile *vf, FileData *fd)
                                return;
                                }
 
-                       label = g_object_get_data(G_OBJECT(VFICON(vf)->tip_window), "tip_label");
+                       label = static_cast<GtkWidget *>(g_object_get_data(G_OBJECT(VFICON(vf)->tip_window), "tip_label"));
                        gtk_label_set_text(GTK_LABEL(label), VFICON(vf)->tip_fd->name);
                        }
                }
@@ -852,7 +852,7 @@ GList *vficon_selection_get_list(ViewFile *vf)
                work2 = fd->sidecar_files;
                while (work2)
                        {
-                       fd = work2->data;
+                       fd = static_cast<FileData *>(work2->data);
                        list = g_list_prepend(list, file_data_ref(fd));
                        work2 = work2->next;
                        }
@@ -904,7 +904,7 @@ void vficon_select_list(ViewFile *vf, GList *list)
        work = list;
        while (work)
                {
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                if (g_list_find(vf->list, fd))
                        {
                        VFICON(vf)->selection = g_list_append(VFICON(vf)->selection, fd);
@@ -990,7 +990,7 @@ static void vficon_select_closest(ViewFile *vf, FileData *sel_fd)
                {
                gint match;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                match = filelist_sort_compare_filedata_full(fd, sel_fd, vf->sort_method, vf->sort_ascend);
@@ -1523,7 +1523,7 @@ static void vficon_populate(ViewFile *vf, gboolean resize, gboolean keep_positio
                gtk_tree_path_free(tpath);
 
                gtk_tree_model_get(store, &iter, FILE_COLUMN_POINTER, &list, -1);
-               if (list) visible_fd = list->data;
+               if (list) visible_fd = static_cast<FileData *>(list->data);
                }
 
 
@@ -1547,7 +1547,7 @@ static void vficon_populate(ViewFile *vf, gboolean resize, gboolean keep_positio
                        gtk_tree_view_column_set_fixed_width(column, thumb_width + (THUMB_BORDER_PADDING * 6));
 
                        list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
-                       cell = (list) ? list->data : NULL;
+                       cell = static_cast<GtkCellRenderer *>((list) ? list->data : NULL);
                        g_list_free(list);
 
                        if (cell && GQV_IS_CELL_RENDERER_ICON(cell))
@@ -1590,7 +1590,7 @@ static void vficon_populate(ViewFile *vf, gboolean resize, gboolean keep_positio
 
                        if (work)
                                {
-                               fd = work->data;
+                               fd = static_cast<FileData *>(work->data);
                                work = work->next;
                                c++;
                                }
@@ -1756,7 +1756,7 @@ FileData *vficon_thumb_next_fd(ViewFile *vf)
                        /** @todo (xsdg): for loop here. */
                        for (; list; list = list->next)
                                {
-                               FileData *fd = list->data;
+                               FileData *fd = static_cast<FileData *>(list->data);
                                if (fd && !fd->thumb_pixbuf) return fd;
                                }
 
@@ -1817,7 +1817,7 @@ FileData *vficon_star_next_fd(ViewFile *vf)
 
                        for (; list; list = list->next)
                                {
-                               FileData *fd = list->data;
+                               FileData *fd = static_cast<FileData *>(list->data);
                                if (fd && fd->rating == STAR_RATING_NOT_READ)
                                        {
                                        vf->stars_filedata = fd;
@@ -1920,7 +1920,7 @@ static gboolean vficon_refresh_real(ViewFile *vf, gboolean keep_position)
        if (VFICON(vf)->selection)
                {
                old_selected = g_list_copy(VFICON(vf)->selection);
-               first_selected = VFICON(vf)->selection->data;
+               first_selected = static_cast<FileData *>(VFICON(vf)->selection->data);
                file_data_ref(first_selected);
                g_list_free(VFICON(vf)->selection);
                VFICON(vf)->selection = NULL;
@@ -1937,8 +1937,8 @@ static gboolean vficon_refresh_real(ViewFile *vf, gboolean keep_position)
 
                if (work && new_work)
                        {
-                       fd = work->data;
-                       new_fd = new_work->data;
+                       fd = static_cast<FileData *>(work->data);
+                       new_fd = static_cast<FileData *>(new_work->data);
 
                        if (fd == new_fd)
                                {
@@ -1958,13 +1958,13 @@ static gboolean vficon_refresh_real(ViewFile *vf, gboolean keep_position)
                else if (work)
                        {
                        /* old item was deleted */
-                       fd = work->data;
+                       fd = static_cast<FileData *>(work->data);
                        match = -1;
                        }
                else
                        {
                        /* new item was added */
-                       new_fd = new_work->data;
+                       new_fd = static_cast<FileData *>(new_work->data);
                        match = 1;
                        }
 
@@ -2077,7 +2077,7 @@ static void vficon_cell_data_cb(GtkTreeViewColumn *UNUSED(tree_column), GtkCellR
 
        gtk_tree_model_get(tree_model, iter, FILE_COLUMN_POINTER, &list, -1);
 
-       fd = g_list_nth_data(list, cd->number);
+       fd = static_cast<FileData *>(g_list_nth_data(list, cd->number));
 
        if (fd)
                {
index e4f2c0a..daa1e49 100644 (file)
@@ -167,7 +167,7 @@ static void vflist_store_clear(ViewFile *vf, gboolean unlock_files)
                filelist_read(vf->dir_fd, &files, NULL);
                while (files)
                        {
-                       FileData *fd = files->data;
+                       FileData *fd = static_cast<FileData *>(files->data);
                        files = files->next;
                        file_data_unlock(fd);
                        file_data_unref(fd);  // undo the ref that got added in filelist_read
@@ -1226,7 +1226,7 @@ FileData *vflist_thumb_next_fd(ViewFile *vf)
 
                                while (work2 && !fd)
                                        {
-                                       fd_p = work2->data;
+                                       fd_p = static_cast<FileData *>(work2->data);
                                        if (!fd_p->thumb_pixbuf) fd = fd_p;
                                        work2 = work2->next;
                                        }
@@ -1377,7 +1377,7 @@ gint vflist_index_by_fd(ViewFile *vf, FileData *fd)
                           it is sufficient for next/prev navigation but it should be rewritten
                           without using indexes at all
                        */
-                       FileData *sidecar_fd = work2->data;
+                       FileData *sidecar_fd = static_cast<FileData *>(work2->data);
                        if (sidecar_fd == fd) return p;
                        work2 = work2->next;
                        }
@@ -1498,7 +1498,7 @@ GList *vflist_selection_get_list(ViewFile *vf)
                        GList *work2 = fd->sidecar_files;
                        while (work2)
                                {
-                               FileData *sfd = work2->data;
+                               FileData *sfd = static_cast<FileData *>(work2->data);
                                list = g_list_prepend(list, file_data_ref(sfd));
                                work2 = work2->next;
                                }
@@ -1657,7 +1657,7 @@ void vflist_select_list(ViewFile *vf, GList *list)
                {
                FileData *fd;
 
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
 
                if (vflist_find_row(vf, fd, &iter) < 0) return;
                if (!vflist_row_is_selected(vf, fd))
@@ -1682,7 +1682,7 @@ static void vflist_select_closest(ViewFile *vf, FileData *sel_fd)
        while (work)
                {
                gint match;
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                match = filelist_sort_compare_filedata_full(fd, sel_fd, vf->sort_method, vf->sort_ascend);
@@ -1814,7 +1814,7 @@ static void vflist_listview_set_columns(GtkWidget *listview, gboolean thumb, gbo
 
        list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
        if (!list) return;
-       cell = list->data;
+       cell = static_cast<GtkCellRenderer *>(list->data);
        g_list_free(list);
 
        g_object_set(G_OBJECT(cell), "height", options->thumbnails.max_height, NULL);
index 3b6a561..08a4bae 100644 (file)
@@ -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;
 
@@ -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);
@@ -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);
@@ -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)
                        {
index 59fc5db..b0706d7 100644 (file)
@@ -331,7 +331,7 @@ struct _HelpSearchData {
 static void help_search_window_show_icon_press(GtkEntry *UNUSED(entry), GtkEntryIconPosition UNUSED(pos),
                                                                        GdkEvent *UNUSED(event), gpointer userdata)
 {
-       HelpSearchData *hsd = userdata;
+       HelpSearchData *hsd = static_cast<HelpSearchData *>(userdata);
 
        g_free(hsd->text_entry);
        hsd->text_entry = g_strdup("");