Change c-style typecasts to c++ style
authorColin Clark <colin.clark@cclark.uk>
Thu, 30 Mar 2023 16:00:17 +0000 (17:00 +0100)
committerColin Clark <colin.clark@cclark.uk>
Thu, 30 Mar 2023 16:00:17 +0000 (17:00 +0100)
Change the c-style typecasts inserted in commit 3de5f843397ae5f to c++
style static_casts

68 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-loader.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/desktop-file.cc
src/dnd.cc
src/dupe.cc
src/editors.cc
src/exif.cc
src/filecache.cc
src/filedata.cc
src/filefilter.cc
src/fullscreen.cc
src/histogram.cc
src/history-list.cc
src/image-load.cc
src/image-overlay.cc
src/image.cc
src/img-view.cc
src/jpeg-parser.cc
src/layout-config.cc
src/layout-image.cc
src/layout-util.cc
src/layout.cc
src/logwindow.cc
src/main.cc
src/menu.cc
src/metadata.cc
src/osd.cc
src/pixbuf-renderer.cc
src/preferences.cc
src/print.cc
src/rcfile.cc
src/remote.cc
src/renderer-tiles.cc
src/search-and-run.cc
src/search.cc
src/shortcuts.cc
src/slideshow.cc
src/thumb-standard.cc
src/thumb.cc
src/toolbar.cc
src/ui-bookmark.cc
src/ui-fileops.cc
src/ui-help.cc
src/ui-misc.cc
src/ui-pathsel.cc
src/ui-spinner.cc
src/ui-tabcomp.cc
src/ui-tree-edit.cc
src/ui-utildlg.cc
src/utilops.cc
src/view-dir-list.cc
src/view-dir-tree.cc
src/view-dir.cc
src/window.cc

index 72681f0..6ef17c5 100644 (file)
@@ -187,7 +187,7 @@ static void advanced_exif_dnd_get(GtkWidget *listview, GdkDragContext *UNUSED(co
                                  GtkSelectionData *selection_data, guint UNUSED(info),
                                  guint UNUSED(time), gpointer UNUSED(data))
 {
-       //ExifWin *ew = (//ExifWin *)data;
+       //ExifWin *ew = static_cast<//ExifWin *>(data);
        GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview));
        GtkTreeIter iter;
 
@@ -207,7 +207,7 @@ static void advanced_exif_dnd_get(GtkWidget *listview, GdkDragContext *UNUSED(co
 
 static void advanced_exif_dnd_begin(GtkWidget *listview, GdkDragContext *context, gpointer UNUSED(data))
 {
-       //ExifWin *ew = (//ExifWin *)data;
+       //ExifWin *ew = static_cast<//ExifWin *>(data);
        GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview));
        GtkTreeIter iter;
 
@@ -281,7 +281,7 @@ void advanced_exif_close(ExifWin *ew)
 
 static gboolean advanced_exif_delete_cb(GtkWidget *UNUSED(widget), GdkEvent *UNUSED(event), gpointer data)
 {
-       ExifWin *ew = (ExifWin *)data;
+       ExifWin *ew = static_cast<ExifWin *>(data);
 
        if (!ew) return FALSE;
 
@@ -337,7 +337,7 @@ static gint advanced_exif_sort_cb(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIt
 static gboolean advanced_exif_mouseclick(GtkWidget *UNUSED(widget),
                                                GdkEventButton *UNUSED(bevent), gpointer data)
 {
-       ExifWin *ew = (ExifWin *)data;
+       ExifWin *ew = static_cast<ExifWin *>(data);
        GtkTreePath *path;
        GtkTreeViewColumn *column;
        GtkTreeIter iter;
@@ -371,7 +371,7 @@ static gboolean advanced_exif_mouseclick(GtkWidget *UNUSED(widget),
 
 static gboolean advanced_exif_keypress(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
 {
-       ExifWin *ew = (ExifWin *)data;
+       ExifWin *ew = static_cast<ExifWin *>(data);
        gboolean stop_signal = FALSE;
 
        if (event->state & GDK_CONTROL_MASK)
index d84a15a..0dffcfb 100644 (file)
@@ -115,7 +115,7 @@ static void bar_pane_comment_set_selection(PaneCommentData *pcd, gboolean append
        work = list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
                if (fd == pcd->fd) continue;
 
@@ -135,14 +135,14 @@ static void bar_pane_comment_set_selection(PaneCommentData *pcd, gboolean append
 
 static void bar_pane_comment_sel_add_cb(GtkWidget *UNUSED(button), gpointer data)
 {
-       PaneCommentData *pcd = (PaneCommentData *)data;
+       PaneCommentData *pcd = static_cast<PaneCommentData *>(data);
 
        bar_pane_comment_set_selection(pcd, TRUE);
 }
 
 static void bar_pane_comment_sel_replace_cb(GtkWidget *UNUSED(button), gpointer data)
 {
-       PaneCommentData *pcd = (PaneCommentData *)data;
+       PaneCommentData *pcd = static_cast<PaneCommentData *>(data);
 
        bar_pane_comment_set_selection(pcd, FALSE);
 }
@@ -211,7 +211,7 @@ static void bar_pane_comment_write_config(GtkWidget *pane, GString *outstr, gint
 
 static void bar_pane_comment_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-       PaneCommentData *pcd = (PaneCommentData *)data;
+       PaneCommentData *pcd = static_cast<PaneCommentData *>(data);
        if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == pcd->fd)
                {
                DEBUG_1("Notify pane_comment: %s %04x", fd->path, type);
@@ -222,7 +222,7 @@ static void bar_pane_comment_notify_cb(FileData *fd, NotifyType type, gpointer d
 
 static void bar_pane_comment_changed(GtkTextBuffer *UNUSED(buffer), gpointer data)
 {
-       PaneCommentData *pcd = (PaneCommentData *)data;
+       PaneCommentData *pcd = static_cast<PaneCommentData *>(data);
 
        bar_pane_comment_write(pcd);
 }
@@ -230,7 +230,7 @@ static void bar_pane_comment_changed(GtkTextBuffer *UNUSED(buffer), gpointer dat
 
 static void bar_pane_comment_populate_popup(GtkTextView *UNUSED(textview), GtkMenu *menu, gpointer data)
 {
-       PaneCommentData *pcd = (PaneCommentData *)data;
+       PaneCommentData *pcd = static_cast<PaneCommentData *>(data);
 
        menu_item_add_divider(GTK_WIDGET(menu));
        menu_item_add_stock(GTK_WIDGET(menu), _("Add text to selected files"), GTK_STOCK_ADD, G_CALLBACK(bar_pane_comment_sel_add_cb), pcd);
@@ -239,7 +239,7 @@ static void bar_pane_comment_populate_popup(GtkTextView *UNUSED(textview), GtkMe
 
 static void bar_pane_comment_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
-       PaneCommentData *pcd = (PaneCommentData *)data;
+       PaneCommentData *pcd = static_cast<PaneCommentData *>(data);
 
        file_data_unregister_notify_func(bar_pane_comment_notify_cb, pcd);
 
index 82d6f18..0474654 100644 (file)
@@ -97,7 +97,7 @@ static gboolean bar_pane_exif_copy_cb(GtkWidget *widget, GdkEventButton *bevent,
 
 static void bar_pane_exif_entry_changed(GtkEntry *UNUSED(text_entry), gpointer data)
 {
-       ExifEntry *ee = (ExifEntry *)data;
+       ExifEntry *ee = static_cast<ExifEntry *>(data);
        gchar *text;
        if (!ee->ped->fd) return;
 
@@ -108,7 +108,7 @@ static void bar_pane_exif_entry_changed(GtkEntry *UNUSED(text_entry), gpointer d
 
 static void bar_pane_exif_entry_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ExifEntry *ee = (ExifEntry *)data;
+       ExifEntry *ee = static_cast<ExifEntry *>(data);
 
        g_free(ee->key);
        g_free(ee->title);
@@ -277,7 +277,7 @@ static void bar_pane_exif_update(PaneExifData *ped)
        work = list;
        while (work)
                {
-               GtkWidget *entry = (GtkWidget *)work->data;
+               GtkWidget *entry = static_cast<GtkWidget *>(work->data);
                work = work->next;
 
                bar_pane_exif_update_entry(ped, entry, FALSE);
@@ -313,7 +313,7 @@ gint bar_pane_exif_event(GtkWidget *bar, GdkEvent *event)
        work = list;
        while (!ret && work)
                {
-               GtkWidget *entry = (GtkWidget *)work->data;
+               GtkWidget *entry = static_cast<GtkWidget *>(work->data);
                ExifEntry *ee = g_object_get_data(G_OBJECT(entry), "entry_data");
                work = work->next;
 
@@ -325,7 +325,7 @@ gint bar_pane_exif_event(GtkWidget *bar, GdkEvent *event)
 
 static void bar_pane_exif_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-       PaneExifData *ped = (PaneExifData *)data;
+       PaneExifData *ped = static_cast<PaneExifData *>(data);
        if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == ped->fd)
                {
                DEBUG_1("Notify pane_exif: %s %04x", fd->path, type);
@@ -407,7 +407,7 @@ static void bar_pane_exif_dnd_receive(GtkWidget *pane, GdkDragContext *UNUSED(co
        while (work)
                {
                gint nx, ny;
-               GtkWidget *entry = (GtkWidget *)work->data;
+               GtkWidget *entry = static_cast<GtkWidget *>(work->data);
                GtkAllocation allocation;
                work = work->next;
 
@@ -465,13 +465,13 @@ static void bar_pane_exif_dnd_init(GtkWidget *pane)
 
 static void bar_pane_exif_edit_close_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       GenericDialog *gd = (GenericDialog *)data;
+       GenericDialog *gd = static_cast<GenericDialog *>(data);
        generic_dialog_close(gd);
 }
 
 static void bar_pane_exif_edit_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ConfDialogData *cdd = (ConfDialogData *)data;
+       ConfDialogData *cdd = static_cast<ConfDialogData *>(data);
        g_signal_handlers_disconnect_by_func(cdd->widget, (gpointer)(bar_pane_exif_edit_close_cb), cdd->gd);
        g_free(cdd);
 }
@@ -482,7 +482,7 @@ static void bar_pane_exif_edit_cancel_cb(GenericDialog *UNUSED(gd), gpointer UNU
 
 static void bar_pane_exif_edit_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       ConfDialogData *cdd = (ConfDialogData *)data;
+       ConfDialogData *cdd = static_cast<ConfDialogData *>(data);
 
        /* either one or the other */
        PaneExifData *ped = g_object_get_data(G_OBJECT(cdd->widget), "pane_data");
@@ -596,19 +596,19 @@ static void bar_pane_exif_conf_dialog(GtkWidget *widget)
 
 static void bar_pane_exif_conf_dialog_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       GtkWidget *widget = (GtkWidget *)data;
+       GtkWidget *widget = static_cast<GtkWidget *>(data);
        bar_pane_exif_conf_dialog(widget);
 }
 
 static void bar_pane_exif_delete_entry_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       GtkWidget *entry = (GtkWidget *)data;
+       GtkWidget *entry = static_cast<GtkWidget *>(data);
        gtk_widget_destroy(entry);
 }
 
 static void bar_pane_exif_copy_entry_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       GtkWidget *widget = (GtkWidget *)data;
+       GtkWidget *widget = static_cast<GtkWidget *>(data);
        GtkClipboard *clipboard;
        const gchar *value;
        ExifEntry *ee;
@@ -621,7 +621,7 @@ static void bar_pane_exif_copy_entry_cb(GtkWidget *UNUSED(menu_widget), gpointer
 
 static void bar_pane_exif_toggle_show_all_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       PaneExifData *ped = (PaneExifData *)data;
+       PaneExifData *ped = static_cast<PaneExifData *>(data);
        ped->show_all = !ped->show_all;
        bar_pane_exif_update(ped);
 }
@@ -660,7 +660,7 @@ static void bar_pane_exif_menu_popup(GtkWidget *widget, PaneExifData *ped)
 
 static gboolean bar_pane_exif_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
 {
-       PaneExifData *ped = (PaneExifData *)data;
+       PaneExifData *ped = static_cast<PaneExifData *>(data);
        if (bevent->button == MOUSE_BUTTON_RIGHT)
                {
                bar_pane_exif_menu_popup(widget, ped);
@@ -723,7 +723,7 @@ static void bar_pane_exif_write_config(GtkWidget *pane, GString *outstr, gint in
        work = list;
        while (work)
                {
-               GtkWidget *entry = (GtkWidget *)work->data;
+               GtkWidget *entry = static_cast<GtkWidget *>(work->data);
                work = work->next;
 
                bar_pane_exif_entry_write_config(entry, outstr, indent);
@@ -780,7 +780,7 @@ GList * bar_pane_exif_list()
 
 static void bar_pane_exif_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
-       PaneExifData *ped = (PaneExifData *)data;
+       PaneExifData *ped = static_cast<PaneExifData *>(data);
 
        file_data_unregister_notify_func(bar_pane_exif_notify_cb, ped);
        g_object_unref(ped->size_group);
@@ -791,7 +791,7 @@ static void bar_pane_exif_destroy(GtkWidget *UNUSED(widget), gpointer data)
 
 //~ static void bar_pane_exif_size_request(GtkWidget *UNUSED(pane), GtkRequisition *requisition, gpointer data)
 //~ {
-       //~ PaneExifData *ped = (//~ *)data;
+       //~ PaneExifData *ped = static_cast<//~ *>(data);
        //~ if (requisition->height < ped->min_height)
                //~ {
                //~ requisition->height = ped->min_height;
@@ -800,7 +800,7 @@ static void bar_pane_exif_destroy(GtkWidget *UNUSED(widget), gpointer data)
 
 static void bar_pane_exif_size_allocate(GtkWidget *UNUSED(pane), GtkAllocation *alloc, gpointer data)
 {
-       PaneExifData *ped = (PaneExifData *)data;
+       PaneExifData *ped = static_cast<PaneExifData *>(data);
        ped->min_height = alloc->height;
        gtk_widget_set_size_request(ped->widget, -1, ped->min_height);
 }
index 44d0a6a..6316644 100644 (file)
@@ -101,14 +101,14 @@ static gint n_gps_entry_drop_types = 2;
 
 static void bar_pane_gps_close_cancel_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       PaneGPSData *pgd = (PaneGPSData *)data;
+       PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
 
        g_list_free(pgd->geocode_list);
 }
 
 static void bar_pane_gps_close_save_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       PaneGPSData *pgd = (PaneGPSData *)data;
+       PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
        FileData *fd;
        GList *work;
 
@@ -247,7 +247,7 @@ static void bar_pane_gps_close_save_cb(GenericDialog *UNUSED(gd), gpointer data)
 
 static void bar_pane_gps_dnd_init(gpointer data)
 {
-       PaneGPSData *pgd = (PaneGPSData *)data;
+       PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
 
        gtk_drag_dest_set(pgd->widget,
                          GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP,
@@ -296,7 +296,7 @@ static void bar_pane_gps_thumb_error_cb(ThumbLoader *tl, gpointer UNUSED(data))
 
 static gboolean bar_pane_gps_marker_keypress_cb(GtkWidget *widget, ClutterButtonEvent *bevent, gpointer UNUSED(data))
 {
-       //PaneGPSData *pgd = (//PaneGPSData *)data;
+       //PaneGPSData *pgd = static_cast<//PaneGPSData *>(data);
        FileData *fd;
        ClutterActor *label_marker, *parent_marker;
        ClutterColor marker_colour = { MARKER_COLOUR };
@@ -428,7 +428,7 @@ static gboolean bar_pane_gps_marker_keypress_cb(GtkWidget *widget, ClutterButton
 
 static gboolean bar_pane_gps_create_markers_cb(gpointer data)
 {
-       PaneGPSData *pgd = (PaneGPSData *)data;
+       PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
        gdouble latitude;
        gdouble longitude;
        gdouble compass;
@@ -587,7 +587,7 @@ void bar_pane_gps_set_map_source(PaneGPSData *pgd, const gchar *map_id)
 
 void bar_pane_gps_enable_markers_checked_toggle_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       PaneGPSData *pgd = (PaneGPSData *)data;
+       PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
 
        if (pgd->enable_markers_checked)
                {
@@ -601,7 +601,7 @@ void bar_pane_gps_enable_markers_checked_toggle_cb(GtkWidget *UNUSED(menu_widget
 
 static void bar_pane_gps_centre_map_checked_toggle_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       PaneGPSData *pgd = (PaneGPSData *)data;
+       PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
 
        if (pgd->centre_map_checked)
                {
@@ -615,7 +615,7 @@ static void bar_pane_gps_centre_map_checked_toggle_cb(GtkWidget *UNUSED(menu_wid
 
 static void bar_pane_gps_change_map_cb(GtkWidget *widget, gpointer data)
 {
-       PaneGPSData *pgd = (PaneGPSData *)data;
+       PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
        gchar *mapsource;
 
        if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)))
@@ -725,7 +725,7 @@ static void bar_pane_gps_slider_changed_cb(GtkScaleButton *slider,
                                           gdouble zoom,
                                           gpointer data)
 {
-       PaneGPSData *pgd = (PaneGPSData *)data;
+       PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
        GString *message;
 
        message = g_string_new("");
@@ -740,7 +740,7 @@ static void bar_pane_gps_view_state_changed_cb(ChamplainView *view,
                                               GParamSpec *UNUSED(gobject),
                                               gpointer data)
 {
-       PaneGPSData *pgd = (PaneGPSData *)data;
+       PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
        ChamplainState status;
        gint zoom;
        GString *message;
@@ -767,7 +767,7 @@ static void bar_pane_gps_view_state_changed_cb(ChamplainView *view,
 
 static void bar_pane_gps_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-       PaneGPSData *pgd = (PaneGPSData *)data;
+       PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
 
        if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) &&
            g_list_find(pgd->selection_list, fd))
@@ -864,7 +864,7 @@ void bar_pane_gps_map_centreing(PaneGPSData *pgd)
 
 static gboolean bar_pane_gps_map_keypress_cb(GtkWidget *UNUSED(widget), GdkEventButton *bevent, gpointer data)
 {
-       PaneGPSData *pgd = (PaneGPSData *)data;
+       PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
        GtkWidget *menu;
        GtkClipboard *clipboard;
        gchar *geo_coords;
@@ -902,7 +902,7 @@ static gboolean bar_pane_gps_map_keypress_cb(GtkWidget *UNUSED(widget), GdkEvent
 
 static void bar_pane_gps_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
-       PaneGPSData *pgd = (PaneGPSData *)data;
+       PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
 
        file_data_unregister_notify_func(bar_pane_gps_notify_cb, pgd);
 
index e43a7bf..de3f0d2 100644 (file)
@@ -83,7 +83,7 @@ static void bar_pane_histogram_update(PaneHistogramData *phd)
 static gboolean bar_pane_histogram_update_cb(gpointer data)
 {
        const HistMap *histmap;
-       PaneHistogramData *phd = (PaneHistogramData *)data;
+       PaneHistogramData *phd = static_cast<PaneHistogramData *>(data);
 
        phd->idle_id = 0;
        phd->need_update = FALSE;
@@ -138,7 +138,7 @@ static void bar_pane_histogram_write_config(GtkWidget *pane, GString *outstr, gi
 
 static void bar_pane_histogram_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-       PaneHistogramData *phd = (PaneHistogramData *)data;
+       PaneHistogramData *phd = static_cast<PaneHistogramData *>(data);
        if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_HISTMAP | NOTIFY_PIXBUF)) && fd == phd->fd)
                {
                DEBUG_1("Notify pane_histogram: %s %04x", fd->path, type);
@@ -148,7 +148,7 @@ static void bar_pane_histogram_notify_cb(FileData *fd, NotifyType type, gpointer
 
 static gboolean bar_pane_histogram_draw_cb(GtkWidget *UNUSED(widget), cairo_t *cr, gpointer data)
 {
-       PaneHistogramData *phd = (PaneHistogramData *)data;
+       PaneHistogramData *phd = static_cast<PaneHistogramData *>(data);
        if (!phd) return TRUE;
 
        if (phd->need_update)
@@ -166,7 +166,7 @@ static gboolean bar_pane_histogram_draw_cb(GtkWidget *UNUSED(widget), cairo_t *c
 
 static void bar_pane_histogram_size_cb(GtkWidget *UNUSED(widget), GtkAllocation *allocation, gpointer data)
 {
-       PaneHistogramData *phd = (PaneHistogramData *)data;
+       PaneHistogramData *phd = static_cast<PaneHistogramData *>(data);
 
        phd->histogram_width = allocation->width;
        phd->histogram_height = allocation->height;
@@ -175,7 +175,7 @@ static void bar_pane_histogram_size_cb(GtkWidget *UNUSED(widget), GtkAllocation
 
 static void bar_pane_histogram_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
-       PaneHistogramData *phd = (PaneHistogramData *)data;
+       PaneHistogramData *phd = static_cast<PaneHistogramData *>(data);
 
        if (phd->idle_id) g_source_remove(phd->idle_id);
        file_data_unregister_notify_func(bar_pane_histogram_notify_cb, phd);
@@ -190,7 +190,7 @@ static void bar_pane_histogram_destroy(GtkWidget *UNUSED(widget), gpointer data)
 
 static void bar_pane_histogram_popup_channels_cb(GtkWidget *widget, gpointer data)
 {
-       PaneHistogramData *phd = (PaneHistogramData *)data;
+       PaneHistogramData *phd = static_cast<PaneHistogramData *>(data);
        gint channel;
 
        if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return;
@@ -206,7 +206,7 @@ static void bar_pane_histogram_popup_channels_cb(GtkWidget *widget, gpointer dat
 
 static void bar_pane_histogram_popup_mode_cb(GtkWidget *widget, gpointer data)
 {
-       PaneHistogramData *phd = (PaneHistogramData *)data;
+       PaneHistogramData *phd = static_cast<PaneHistogramData *>(data);
        gint logmode;
 
        if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget))) return;
@@ -245,7 +245,7 @@ static GtkWidget *bar_pane_histogram_menu(PaneHistogramData *phd)
 
 static gboolean bar_pane_histogram_press_cb(GtkGesture *UNUSED(gesture), gint UNUSED(n_press), gdouble UNUSED(x), gdouble UNUSED(y), gpointer data)
 {
-       PaneHistogramData *phd = (PaneHistogramData *)data;
+       PaneHistogramData *phd = static_cast<PaneHistogramData *>(data);
        GtkWidget *menu;
 
        menu = bar_pane_histogram_menu(phd);
index 4ff9f3e..ee54bae 100644 (file)
@@ -173,7 +173,7 @@ static void bar_pane_keywords_write(PaneKeywordsData *pkd)
 
 gboolean bar_keyword_tree_expand_if_set_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        gboolean set;
 
        gtk_tree_model_get(model, iter, FILTER_KEYWORD_COLUMN_TOGGLE, &set, -1);
@@ -187,7 +187,7 @@ gboolean bar_keyword_tree_expand_if_set_cb(GtkTreeModel *model, GtkTreePath *pat
 
 gboolean bar_keyword_tree_collapse_if_unset_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        gboolean set;
 
        gtk_tree_model_get(model, iter, FILTER_KEYWORD_COLUMN_TOGGLE, &set, -1);
@@ -267,7 +267,7 @@ void bar_pane_keywords_set_fd(GtkWidget *pane, FileData *fd)
 
 void bar_keyword_tree_get_expanded_cb(GtkTreeView *keyword_treeview, GtkTreePath *path,  gpointer data)
 {
-       GList **expanded = (GList **)data;
+       GList **expanded = static_cast<GList **>(data);
        GtkTreeModel *model;
        GtkTreeIter iter;
        gchar *path_string;
@@ -350,7 +350,7 @@ gint bar_pane_keywords_event(GtkWidget *bar, GdkEvent *event)
 
 static void bar_pane_keywords_keyword_toggle(GtkCellRendererToggle *UNUSED(toggle), const gchar *path, gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        GtkTreeModel *model;
        GtkTreeIter iter;
        GtkTreePath *tpath;
@@ -391,7 +391,7 @@ static void bar_pane_keywords_keyword_toggle(GtkCellRendererToggle *UNUSED(toggl
 
 void bar_pane_keywords_filter_modify(GtkTreeModel *model, GtkTreeIter *iter, GValue *value, gint column, gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        GtkTreeModel *keyword_tree = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(model));
        GtkTreeIter child_iter;
 
@@ -427,7 +427,7 @@ void bar_pane_keywords_filter_modify(GtkTreeModel *model, GtkTreeIter *iter, GVa
 
 gboolean bar_pane_keywords_filter_visible(GtkTreeModel *keyword_tree, GtkTreeIter *iter, gpointer data)
 {
-       GtkTreeModel *filter = (GtkTreeModel *)data;
+       GtkTreeModel *filter = static_cast<GtkTreeModel *>(data);
 
        return !keyword_is_hidden_in(keyword_tree, iter, filter);
 }
@@ -446,7 +446,7 @@ static void bar_pane_keywords_set_selection(PaneKeywordsData *pkd, gboolean appe
        work = list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                if (append)
@@ -465,21 +465,21 @@ static void bar_pane_keywords_set_selection(PaneKeywordsData *pkd, gboolean appe
 
 static void bar_pane_keywords_sel_add_cb(GtkWidget *UNUSED(button), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
 
        bar_pane_keywords_set_selection(pkd, TRUE);
 }
 
 static void bar_pane_keywords_sel_replace_cb(GtkWidget *UNUSED(button), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
 
        bar_pane_keywords_set_selection(pkd, FALSE);
 }
 
 static void bar_pane_keywords_populate_popup_cb(GtkTextView *UNUSED(textview), GtkMenu *menu, gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
 
        menu_item_add_divider(GTK_WIDGET(menu));
        menu_item_add_stock(GTK_WIDGET(menu), _("Add selected keywords to selected files"), GTK_STOCK_ADD, G_CALLBACK(bar_pane_keywords_sel_add_cb), pkd);
@@ -489,7 +489,7 @@ static void bar_pane_keywords_populate_popup_cb(GtkTextView *UNUSED(textview), G
 
 static void bar_pane_keywords_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == pkd->fd)
                {
                DEBUG_1("Notify pane_keywords: %s %04x", fd->path, type);
@@ -499,7 +499,7 @@ static void bar_pane_keywords_notify_cb(FileData *fd, NotifyType type, gpointer
 
 static gboolean bar_pane_keywords_changed_idle_cb(gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
 
        bar_pane_keywords_write(pkd);
        bar_keyword_tree_sync(pkd);
@@ -509,7 +509,7 @@ static gboolean bar_pane_keywords_changed_idle_cb(gpointer data)
 
 static void bar_pane_keywords_changed(GtkTextBuffer *UNUSED(buffer), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
 
        if (pkd->idle_id) return;
        /* higher prio than redraw */
@@ -653,7 +653,7 @@ static void bar_pane_keywords_dnd_receive(GtkWidget *tree_view, GdkDragContext *
                                          GtkSelectionData *selection_data, guint info,
                                          guint UNUSED(time), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        GtkTreePath *tpath = NULL;
         GtkTreeViewDropPosition pos;
        GtkTreeModel *model;
@@ -819,7 +819,7 @@ static gint bar_pane_keywords_dnd_motion(GtkWidget *tree_view, GdkDragContext *c
 
 static void bar_pane_keywords_edit_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ConfDialogData *cdd = (ConfDialogData *)data;
+       ConfDialogData *cdd = static_cast<ConfDialogData *>(data);
        gtk_tree_path_free(cdd->click_tpath);
        g_free(cdd);
 }
@@ -832,7 +832,7 @@ static void bar_pane_keywords_edit_cancel_cb(GenericDialog *UNUSED(gd), gpointer
 
 static void bar_pane_keywords_edit_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       ConfDialogData *cdd = (ConfDialogData *)data;
+       ConfDialogData *cdd = static_cast<ConfDialogData *>(data);
        PaneKeywordsData *pkd = cdd->pkd;
        GtkTreeModel *model;
 
@@ -904,13 +904,13 @@ static void bar_pane_keywords_edit_ok_cb(GenericDialog *UNUSED(gd), gpointer dat
 
 static void bar_pane_keywords_conf_set_helper(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ConfDialogData *cdd = (ConfDialogData *)data;
+       ConfDialogData *cdd = static_cast<ConfDialogData *>(data);
        cdd->is_keyword = FALSE;
 }
 
 static void bar_pane_keywords_conf_set_kw(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ConfDialogData *cdd = (ConfDialogData *)data;
+       ConfDialogData *cdd = static_cast<ConfDialogData *>(data);
        cdd->is_keyword = TRUE;
 }
 
@@ -1005,19 +1005,19 @@ static void bar_pane_keywords_edit_dialog(PaneKeywordsData *pkd, gboolean edit_e
 
 static void bar_pane_keywords_edit_dialog_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        bar_pane_keywords_edit_dialog(pkd, TRUE);
 }
 
 static void bar_pane_keywords_add_dialog_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        bar_pane_keywords_edit_dialog(pkd, FALSE);
 }
 
 static void bar_pane_keywords_connect_mark_cb(GtkWidget *menu_widget, gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
 
        GtkTreeModel *model;
        GtkTreeIter iter;
@@ -1050,7 +1050,7 @@ static void dummy_cancel_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
 
 static void bar_pane_keywords_disconnect_marks_cb(GtkWidget *menu_widget, gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
 
        GenericDialog *gd;
        GString *message = g_string_new("");
@@ -1070,7 +1070,7 @@ static void bar_pane_keywords_disconnect_marks_cb(GtkWidget *menu_widget, gpoint
 
 static void bar_pane_keywords_delete_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        GtkTreeModel *model;
        GtkTreeIter iter;
 
@@ -1090,7 +1090,7 @@ static void bar_pane_keywords_delete_cb(GtkWidget *UNUSED(menu_widget), gpointer
 
 static void bar_pane_keywords_hide_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        GtkTreeModel *model;
        GtkTreeIter iter;
 
@@ -1110,7 +1110,7 @@ static void bar_pane_keywords_hide_cb(GtkWidget *UNUSED(menu_widget), gpointer d
 
 static void bar_pane_keywords_show_all_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        GtkTreeModel *model;
 
        GtkTreeModel *keyword_tree;
@@ -1133,7 +1133,7 @@ static void bar_pane_keywords_show_all_cb(GtkWidget *UNUSED(menu_widget), gpoint
 
 static void bar_pane_keywords_revert_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        GList *work;
        GtkTreePath *tree_path;
        gchar *path;
@@ -1155,7 +1155,7 @@ static void bar_pane_keywords_revert_cb(GtkWidget *UNUSED(menu_widget), gpointer
 
 static void bar_pane_keywords_expand_checked_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        GtkTreeModel *model;
 
        model = gtk_tree_view_get_model(GTK_TREE_VIEW(pkd->keyword_treeview));
@@ -1164,7 +1164,7 @@ static void bar_pane_keywords_expand_checked_cb(GtkWidget *UNUSED(menu_widget),
 
 static void bar_pane_keywords_collapse_all_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
 
        string_list_free(pkd->expanded_rows);
        pkd->expanded_rows = NULL;
@@ -1178,7 +1178,7 @@ static void bar_pane_keywords_collapse_all_cb(GtkWidget *UNUSED(menu_widget), gp
 
 static void bar_pane_keywords_revert_hidden_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        GtkTreeModel *model;
        GtkTreeModel *keyword_tree;
 
@@ -1192,7 +1192,7 @@ static void bar_pane_keywords_revert_hidden_cb(GtkWidget *UNUSED(menu_widget), g
 
 static void bar_pane_keywords_collapse_unchecked_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        GtkTreeModel *model;
 
        model = gtk_tree_view_get_model(GTK_TREE_VIEW(pkd->keyword_treeview));
@@ -1201,7 +1201,7 @@ static void bar_pane_keywords_collapse_unchecked_cb(GtkWidget *UNUSED(menu_widge
 
 static void bar_pane_keywords_hide_unchecked_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        GtkTreeModel *model;
 
        GtkTreeModel *keyword_tree;
@@ -1218,21 +1218,21 @@ static void bar_pane_keywords_hide_unchecked_cb(GtkWidget *UNUSED(menu_widget),
 
 static void bar_pane_keywords_expand_checked_toggle_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        pkd->expand_checked = !pkd->expand_checked;
        bar_keyword_tree_sync(pkd);
 }
 
 static void bar_pane_keywords_collapse_unchecked_toggle_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        pkd->collapse_unchecked = !pkd->collapse_unchecked;
        bar_keyword_tree_sync(pkd);
 }
 
 static void bar_pane_keywords_hide_unchecked_toggle_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        pkd->hide_unchecked = !pkd->hide_unchecked;
        bar_keyword_tree_sync(pkd);
 }
@@ -1242,7 +1242,7 @@ static void bar_pane_keywords_hide_unchecked_toggle_cb(GtkWidget *UNUSED(menu_wi
  */
 static void bar_pane_keywords_add_to_selected_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        GtkTreeIter iter; /* This is the iter which initial holds the current keyword */
        GtkTreeIter child_iter;
        GtkTreeModel *model;
@@ -1285,7 +1285,7 @@ static void bar_pane_keywords_add_to_selected_cb(GtkWidget *UNUSED(menu_widget),
        work = list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
                metadata_append_list(fd, KEYWORD_KEY, keywords);
                }
@@ -1410,7 +1410,7 @@ static void bar_pane_keywords_menu_popup(GtkWidget *UNUSED(widget), PaneKeywords
 
 static gboolean bar_pane_keywords_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        if (bevent->button == MOUSE_BUTTON_RIGHT)
                {
                bar_pane_keywords_menu_popup(widget, pkd, bevent->x, bevent->y);
@@ -1438,7 +1438,7 @@ static gboolean bar_pane_keywords_menu_cb(GtkWidget *widget, GdkEventButton *bev
 
 static void bar_pane_keywords_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        gchar *path;
 
        path = g_build_filename(get_rc_dir(), "keywords", NULL);
@@ -1739,7 +1739,7 @@ void bar_pane_keywords_entry_add_from_config(GtkWidget *pane, const gchar **attr
 
 static gboolean autocomplete_activate_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       PaneKeywordsData *pkd = (PaneKeywordsData *)data;
+       PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
        gchar *entry_text;
        GtkTextBuffer *buffer;
        GtkTextIter iter;
index d6f5c8a..d76771d 100644 (file)
@@ -88,7 +88,7 @@ static void bar_pane_rating_write_config(GtkWidget *pane, GString *outstr, gint
 
 static void bar_pane_rating_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-       PaneRatingData *prd = (PaneRatingData *)data;
+       PaneRatingData *prd = static_cast<PaneRatingData *>(data);
 
        if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_HISTMAP | NOTIFY_PIXBUF)) && fd == prd->fd)
                {
@@ -99,7 +99,7 @@ static void bar_pane_rating_notify_cb(FileData *fd, NotifyType type, gpointer da
 
 static void bar_pane_rating_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
-       PaneRatingData *prd = (PaneRatingData *)data;
+       PaneRatingData *prd = static_cast<PaneRatingData *>(data);
 
        file_data_unregister_notify_func(bar_pane_rating_notify_cb, prd);
        file_data_unref(prd->fd);
@@ -109,7 +109,7 @@ static void bar_pane_rating_destroy(GtkWidget *UNUSED(widget), gpointer data)
 
 static void bar_pane_rating_selected_cb(GtkToggleButton *togglebutton, gpointer data)
 {
-       PaneRatingData *prd = (PaneRatingData *)data;
+       PaneRatingData *prd = static_cast<PaneRatingData *>(data);
        GSList *list;
        gint i;
        gchar *rating;
index 35e170d..37827a8 100644 (file)
@@ -152,7 +152,7 @@ static void bar_sort_mode_sync(SortData *sd, SortModeType mode)
 
 static void bar_sort_mode_cb(GtkWidget *combo, gpointer data)
 {
-       SortData *sd = (SortData *)data;
+       SortData *sd = static_cast<SortData *>(data);
 
        if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) == BAR_SORT_MODE_FOLDER)
                {
@@ -280,7 +280,7 @@ static void bar_sort_undo_collection(SortData *sd)
 
 static void bar_sort_undo_cb(GtkWidget *button, gpointer data)
 {
-       SortData *sd = (SortData *)data;
+       SortData *sd = static_cast<SortData *>(data);
 
        if (sd->mode == BAR_SORT_MODE_FOLDER)
                {
@@ -367,7 +367,7 @@ static void bar_sort_bookmark_select_collection(SortData *sd, FileData *source,
 
 static void bar_sort_bookmark_select(const gchar *path, gpointer data)
 {
-       SortData *sd = (SortData *)data;
+       SortData *sd = static_cast<SortData *>(data);
        FileData *source;
 
        source = layout_image_get_fd(sd->lw);
@@ -399,21 +399,21 @@ static void bar_sort_set_action(SortData *sd, SortActionType action, const gchar
 
 static void bar_sort_set_copy_cb(GtkWidget *button, gpointer data)
 {
-       SortData *sd = (SortData *)data;
+       SortData *sd = static_cast<SortData *>(data);
        if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) return;
        bar_sort_set_action(sd, BAR_SORT_COPY, NULL);
 }
 
 static void bar_sort_set_move_cb(GtkWidget *button, gpointer data)
 {
-       SortData *sd = (SortData *)data;
+       SortData *sd = static_cast<SortData *>(data);
        if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) return;
        bar_sort_set_action(sd, BAR_SORT_MOVE, NULL);
 }
 
 static void bar_sort_set_filter_cb(GtkWidget *button, gpointer data)
 {
-       SortData *sd = (SortData *)data;
+       SortData *sd = static_cast<SortData *>(data);
        const gchar *key;
 
        if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) return;
@@ -463,14 +463,14 @@ static void bar_sort_set_selection(SortData *sd, SortSelectionType selection)
 
 static void bar_sort_set_selection_image_cb(GtkWidget *button, gpointer data)
 {
-       SortData *sd = (SortData *)data;
+       SortData *sd = static_cast<SortData *>(data);
        if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) return;
        bar_sort_set_selection(sd, BAR_SORT_SELECTION_IMAGE);
 }
 
 static void bar_sort_set_selection_selected_cb(GtkWidget *button, gpointer data)
 {
-       SortData *sd = (SortData *)data;
+       SortData *sd = static_cast<SortData *>(data);
        if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) return;
        bar_sort_set_selection(sd, BAR_SORT_SELECTION_SELECTED);
 }
@@ -484,7 +484,7 @@ static void bar_sort_add_close(SortData *sd)
 
 static void bar_sort_add_ok_cb(FileDialog *fd, gpointer data)
 {
-       SortData *sd = (SortData *)data;
+       SortData *sd = static_cast<SortData *>(data);
        const gchar *name = gtk_entry_get_text(GTK_ENTRY(sd->dialog_name_entry));
        gboolean empty_name = (name[0] == '\0');
 
@@ -547,14 +547,14 @@ static void bar_sort_add_ok_cb(FileDialog *fd, gpointer data)
 
 static void bar_sort_add_cancel_cb(FileDialog *UNUSED(fd), gpointer data)
 {
-       SortData *sd = (SortData *)data;
+       SortData *sd = static_cast<SortData *>(data);
 
        bar_sort_add_close(sd);
 }
 
 static void bar_sort_add_cb(GtkWidget *button, gpointer data)
 {
-       SortData *sd = (SortData *)data;
+       SortData *sd = static_cast<SortData *>(data);
        GtkWidget *hbox;
        const gchar *title;
 
@@ -614,7 +614,7 @@ void bar_sort_close(GtkWidget *bar)
 
 static void bar_sort_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SortData *sd = (SortData *)data;
+       SortData *sd = static_cast<SortData *>(data);
 
        bar_sort_add_close(sd);
 
@@ -702,7 +702,7 @@ static GtkWidget *bar_sort_new(LayoutWindow *lw, SortActionType action,
        while (work)
                {
                GtkWidget *button;
-               EditorDescription *editor = (EditorDescription *)work->data;
+               EditorDescription *editor = static_cast<EditorDescription *>(work->data);
                gchar *key;
                gboolean select = FALSE;
 
index 9e51021..a5f90c7 100644 (file)
@@ -220,7 +220,7 @@ struct _BarData
 
 static void bar_expander_move(GtkWidget *UNUSED(widget), gpointer data, gboolean up, gboolean single_step)
 {
-       GtkWidget *expander = (GtkWidget *)data;
+       GtkWidget *expander = static_cast<GtkWidget *>(data);
        GtkWidget *box;
        gint pos;
 
@@ -280,7 +280,7 @@ static void height_spin_key_press_cb(GtkEventControllerKey *UNUSED(controller),
 
 static void bar_expander_height_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       GtkWidget *expander = (GtkWidget *)data;
+       GtkWidget *expander = static_cast<GtkWidget *>(data);
        GtkWidget *spin;
        GtkWidget *window;
        GtkWidget *data_box;
@@ -326,13 +326,13 @@ static void bar_expander_height_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void bar_expander_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       GtkWidget *expander = (GtkWidget *)data;
+       GtkWidget *expander = static_cast<GtkWidget *>(data);
        gtk_widget_destroy(expander);
 }
 
 static void bar_expander_add_cb(GtkWidget *widget, gpointer UNUSED(data))
 {
-       //GtkWidget *bar = (//GtkWidget *)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 *config;
@@ -577,7 +577,7 @@ void bar_clear(GtkWidget *bar)
        work = list;
        while (work)
                {
-               GtkWidget *widget = (GtkWidget *)work->data;
+               GtkWidget *widget = static_cast<GtkWidget *>(work->data);
                gtk_widget_destroy(widget);
                work = work->next;
                }
@@ -606,7 +606,7 @@ void bar_write_config(GtkWidget *bar, GString *outstr, gint indent)
        work = list;
        while (work)
                {
-               GtkWidget *expander = (GtkWidget *)work->data;
+               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");
                if (!pd) continue;
@@ -684,7 +684,7 @@ void bar_populate_default(GtkWidget *UNUSED(bar))
 
 static void bar_size_allocate(GtkWidget *UNUSED(widget), GtkAllocation *UNUSED(allocation), gpointer data)
 {
-       BarData *bd = (BarData *)data;
+       BarData *bd = static_cast<BarData *>(data);
 
        bd->width = gtk_paned_get_position(GTK_PANED(bd->lw->utility_paned));
 }
@@ -711,7 +711,7 @@ void bar_close(GtkWidget *bar)
 
 static void bar_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
-       BarData *bd = (BarData *)data;
+       BarData *bd = static_cast<BarData *>(data);
 
        file_data_unref(bd->fd);
        g_free(bd);
index 5e3ee8f..19b93d0 100644 (file)
@@ -31,14 +31,14 @@ static gboolean cache_loader_phase2_idle_cb(gpointer data);
 
 static void cache_loader_phase1_done_cb(ImageLoader *UNUSED(il), gpointer data)
 {
-       CacheLoader *cl = (CacheLoader *)data;
+       CacheLoader *cl = static_cast<CacheLoader *>(data);
 
        cl->idle_id = g_idle_add(cache_loader_phase2_idle_cb, cl);
 }
 
 static void cache_loader_phase1_error_cb(ImageLoader *UNUSED(il), gpointer data)
 {
-       CacheLoader *cl = (CacheLoader *)data;
+       CacheLoader *cl = static_cast<CacheLoader *>(data);
 
        cl->error = TRUE;
        cl->idle_id = g_idle_add(cache_loader_phase2_idle_cb, cl);
@@ -204,14 +204,14 @@ static gboolean cache_loader_phase2_process(CacheLoader *cl)
 
 static gboolean cache_loader_phase1_idle_cb(gpointer data)
 {
-       CacheLoader *cl = (CacheLoader *)data;
+       CacheLoader *cl = static_cast<CacheLoader *>(data);
 
        return cache_loader_phase1_process(cl);
 }
 
 static gboolean cache_loader_phase2_idle_cb(gpointer data)
 {
-       CacheLoader *cl = (CacheLoader *)data;
+       CacheLoader *cl = static_cast<CacheLoader *>(data);
 
        return cache_loader_phase2_process(cl);
 }
index 0465d0f..06e4df3 100644 (file)
@@ -190,7 +190,7 @@ static void cache_maintain_home_stop(CMData *cm)
 
 static gboolean cache_maintain_home_cb(gpointer data)
 {
-       CMData *cm = (CMData *)data;
+       CMData *cm = static_cast<CMData *>(data);
        GList *dlist = NULL;
        GList *list = NULL;
        FileData *fd;
@@ -244,7 +244,7 @@ static gboolean cache_maintain_home_cb(gpointer data)
                        work = list;
                        while (work)
                                {
-                               FileData *fd_list = (FileData *)work->data;
+                               FileData *fd_list = static_cast<FileData *>(work->data);
                                gchar *path_buf = g_strdup(fd_list->path);
                                gchar *dot;
 
@@ -319,7 +319,7 @@ static gboolean cache_maintain_home_cb(gpointer data)
 
 static void cache_maintain_home_close_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       CMData *cm = (CMData *)data;
+       CMData *cm = static_cast<CMData *>(data);
 
        if (!gtk_widget_get_sensitive(cm->button_close)) return;
 
@@ -328,7 +328,7 @@ static void cache_maintain_home_close_cb(GenericDialog *UNUSED(gd), gpointer dat
 
 static void cache_maintain_home_stop_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       CMData *cm = (CMData *)data;
+       CMData *cm = static_cast<CMData *>(data);
 
        cache_maintain_home_stop(cm);
 }
@@ -666,7 +666,7 @@ static void cache_manager_render_reset(CacheOpsData *cd)
 
 static void cache_manager_render_close_cb(GenericDialog *UNUSED(fd), gpointer data)
 {
-       CacheOpsData *cd = (CacheOpsData *)data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        if (!gtk_widget_get_sensitive(cd->button_close)) return;
 
@@ -692,7 +692,7 @@ static void cache_manager_render_finish(CacheOpsData *cd)
 
 static void cache_manager_render_stop_cb(GenericDialog *UNUSED(fd), gpointer data)
 {
-       CacheOpsData *cd = (CacheOpsData *)data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        gtk_entry_set_text(GTK_ENTRY(cd->progress), _("stopped"));
        cache_manager_render_finish(cd);
@@ -723,7 +723,7 @@ static gboolean cache_manager_render_file(CacheOpsData *cd);
 
 static void cache_manager_render_thumb_done_cb(ThumbLoader *UNUSED(tl), gpointer data)
 {
-       CacheOpsData *cd = (CacheOpsData *)data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        thumb_loader_free((ThumbLoader *)cd->tl);
        cd->tl = NULL;
@@ -797,7 +797,7 @@ static gboolean cache_manager_render_file(CacheOpsData *cd)
 
 static void cache_manager_render_start_cb(GenericDialog *UNUSED(fd), gpointer data)
 {
-       CacheOpsData *cd = (CacheOpsData *)data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
        gchar *path;
        GList *list_total = NULL;
 
@@ -961,7 +961,7 @@ void cache_manager_render_remote(const gchar *path, gboolean recurse, gboolean l
 
 static void cache_manager_standard_clean_close_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       CacheOpsData *cd = (CacheOpsData *)data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        if (!gtk_widget_get_sensitive(cd->button_close)) return;
 
@@ -997,14 +997,14 @@ static void cache_manager_standard_clean_done(CacheOpsData *cd)
 
 static void cache_manager_standard_clean_stop_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       CacheOpsData *cd = (CacheOpsData *)data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        cache_manager_standard_clean_done(cd);
 }
 
 static gint cache_manager_standard_clean_clear_cb(gpointer data)
 {
-       CacheOpsData *cd = (CacheOpsData *)data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        if (cd->list)
                {
@@ -1038,7 +1038,7 @@ static gint cache_manager_standard_clean_clear_cb(gpointer data)
 
 static void cache_manager_standard_clean_valid_cb(const gchar *path, gboolean valid, gpointer data)
 {
-       CacheOpsData *cd = (CacheOpsData *)data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        if (path)
                {
@@ -1079,7 +1079,7 @@ static void cache_manager_standard_clean_valid_cb(const gchar *path, gboolean va
 
 static void cache_manager_standard_clean_start(GenericDialog *UNUSED(gd), gpointer data)
 {
-       CacheOpsData *cd = (CacheOpsData *)data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
        GList *list;
        gchar *path;
        FileData *dir_fd;
@@ -1303,7 +1303,7 @@ static void cache_manager_sim_reset(CacheOpsData *cd)
 
 static void cache_manager_sim_close_cb(GenericDialog *UNUSED(fd), gpointer data)
 {
-       CacheOpsData *cd = (CacheOpsData *)data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        if (!gtk_widget_get_sensitive(cd->button_close)) return;
 
@@ -1328,7 +1328,7 @@ static void cache_manager_sim_finish(CacheOpsData *cd)
 
 static void cache_manager_sim_stop_cb(GenericDialog *UNUSED(fd), gpointer data)
 {
-       CacheOpsData *cd = (CacheOpsData *)data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        gtk_entry_set_text(GTK_ENTRY(cd->progress), _("stopped"));
        cache_manager_sim_finish(cd);
@@ -1357,7 +1357,7 @@ static void cache_manager_sim_folder(CacheOpsData *cd, FileData *dir_fd)
 
 static void cache_manager_sim_file_done_cb(CacheLoader *UNUSED(cl), gint UNUSED(error), gpointer data)
 {
-       CacheOpsData *cd = (CacheOpsData *)data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        cache_loader_free((CacheLoader *)cd->cl);
        cd->cl = NULL;
@@ -1466,7 +1466,7 @@ static gboolean cache_manager_sim_file(CacheOpsData *cd)
 
 static void cache_manager_sim_start_cb(GenericDialog *UNUSED(fd), gpointer data)
 {
-       CacheOpsData *cd = (CacheOpsData *)data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
        gchar *path;
        GList *list_total = NULL;
 
@@ -1585,7 +1585,7 @@ static void cache_manager_sim_load_cb(GtkWidget *widget, gpointer UNUSED(data))
 
 static void cache_manager_cache_maintenance_close_cb(GenericDialog *UNUSED(fd), gpointer data)
 {
-       CacheOpsData *cd = (CacheOpsData *)data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
 
        if (!gtk_widget_get_sensitive(cd->button_close)) return;
 
@@ -1596,7 +1596,7 @@ static void cache_manager_cache_maintenance_close_cb(GenericDialog *UNUSED(fd),
 
 static void cache_manager_cache_maintenance_start_cb(GenericDialog *UNUSED(fd), gpointer data)
 {
-       CacheOpsData *cd = (CacheOpsData *)data;
+       CacheOpsData *cd = static_cast<CacheOpsData *>(data);
        gchar *path;
        gchar *cmd_line;
 
index e6ce0a0..e4cd3eb 100644 (file)
@@ -40,7 +40,7 @@ static gboolean collection_save_confirmed(FileDialog *fd, gboolean overwrite, Co
 
 static void collection_confirm_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       FileDialog *fd = (FileDialog *)data;
+       FileDialog *fd = static_cast<FileDialog *>(data);
        CollectionData *cd = GENERIC_DIALOG(fd)->data;
 
        if (!collection_save_confirmed(fd, TRUE, cd))
@@ -103,7 +103,7 @@ static gboolean collection_save_confirmed(FileDialog *fd, gboolean overwrite, Co
 
 static void collection_save_cb(FileDialog *fd, gpointer data)
 {
-       CollectionData *cd = (CollectionData *)data;
+       CollectionData *cd = static_cast<CollectionData *>(data);
        const gchar *path;
 
        path = fd->dest_path;
@@ -122,7 +122,7 @@ static void collection_save_cb(FileDialog *fd, gpointer data)
 
 static void real_collection_button_pressed(FileDialog *fd, gpointer data, gint append)
 {
-       CollectionData *cd = (CollectionData *)data;
+       CollectionData *cd = static_cast<CollectionData *>(data);
        gboolean err = FALSE;
        gchar *text = NULL;
 
@@ -177,7 +177,7 @@ static void collection_append_cb(FileDialog *fd, gpointer data)
 
 static void collection_save_or_load_dialog_close_cb(FileDialog *fd, gpointer data)
 {
-       CollectionData *cd = (CollectionData *)data;
+       CollectionData *cd = static_cast<CollectionData *>(data);
 
        if (cd) collection_unref(cd);
        file_dialog_close(fd);
index b184d0b..296e278 100644 (file)
@@ -295,7 +295,7 @@ static void collection_load_thumb_do(CollectionData *cd)
 
 static void collection_load_thumb_error_cb(ThumbLoader *UNUSED(tl), gpointer data)
 {
-       CollectionData *cd = (CollectionData *)data;
+       CollectionData *cd = static_cast<CollectionData *>(data);
 
        collection_load_thumb_do(cd);
        collection_load_thumb_step(cd);
@@ -303,7 +303,7 @@ static void collection_load_thumb_error_cb(ThumbLoader *UNUSED(tl), gpointer dat
 
 static void collection_load_thumb_done_cb(ThumbLoader *UNUSED(tl), gpointer data)
 {
-       CollectionData *cd = (CollectionData *)data;
+       CollectionData *cd = static_cast<CollectionData *>(data);
 
        collection_load_thumb_do(cd);
        collection_load_thumb_step(cd);
@@ -418,7 +418,7 @@ static gboolean collection_save_private(CollectionData *cd, const gchar *path)
        work = cd->list;
        while (work && secsave_errno == SS_ERR_NONE)
                {
-               CollectInfo *ci = (CollectInfo *)work->data;
+               CollectInfo *ci = static_cast<CollectInfo *>(work->data);
                secure_fprintf(ssi, "\"%s\"\n", ci->fd->path);
                work = work->next;
                }
index a3304df..be51bb1 100644 (file)
@@ -189,7 +189,7 @@ static guint collection_table_list_count(CollectTable *ct, gint64 *bytes)
                work = ct->cd->list;
                while (work)
                        {
-                       CollectInfo *ci = (CollectInfo *)work->data;
+                       CollectInfo *ci = static_cast<CollectInfo *>(work->data);
                        work = work->next;
                        b += ci->fd->size;
                        }
@@ -210,7 +210,7 @@ static guint collection_table_selection_count(CollectTable *ct, gint64 *bytes)
                work = ct->selection;
                while (work)
                        {
-                       CollectInfo *ci = (CollectInfo *)work->data;
+                       CollectInfo *ci = static_cast<CollectInfo *>(work->data);
                        work = work->next;
                        b += ci->fd->size;
                        }
@@ -365,7 +365,7 @@ static void collection_table_verify_selections(CollectTable *ct)
        work = ct->selection;
        while (work)
                {
-               CollectInfo *info = (CollectInfo *)work->data;
+               CollectInfo *info = static_cast<CollectInfo *>(work->data);
                work = work->next;
                if (!g_list_find(ct->cd->list, info))
                        {
@@ -418,7 +418,7 @@ static void collection_table_select_invert_all(CollectTable *ct)
        work = ct->cd->list;
        while (work)
                {
-               CollectInfo *info = (CollectInfo *)work->data;
+               CollectInfo *info = static_cast<CollectInfo *>(work->data);
 
                if (INFO_SELECTED(info))
                        {
@@ -601,7 +601,7 @@ static void tip_hide(CollectTable *ct)
 
 static gboolean tip_schedule_cb(gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        if (!ct->tip_delay_id) return FALSE;
 
@@ -675,14 +675,14 @@ static void tip_update(CollectTable *ct, CollectInfo *info)
 
 static void collection_table_popup_save_as_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        collection_dialog_save_as(NULL, ct->cd);
 }
 
 static void collection_table_popup_save_cb(GtkWidget *widget, gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        if (!ct->cd->path)
                {
@@ -722,28 +722,28 @@ static void collection_table_popup_edit_cb(GtkWidget *widget, gpointer data)
 
 static void collection_table_popup_copy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        file_util_copy(NULL, collection_table_popup_file_list(ct), NULL, ct->listview);
 }
 
 static void collection_table_popup_move_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        file_util_move(NULL, collection_table_popup_file_list(ct), NULL, ct->listview);
 }
 
 static void collection_table_popup_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        file_util_rename(NULL, collection_table_popup_file_list(ct), ct->listview);
 }
 
 static void collection_table_popup_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        options->file_ops.safe_delete_enable = FALSE;
        file_util_delete(NULL, collection_table_popup_file_list(ct), ct->listview);
@@ -751,7 +751,7 @@ static void collection_table_popup_delete_cb(GtkWidget *UNUSED(widget), gpointer
 
 static void collection_table_popup_move_to_trash_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        options->file_ops.safe_delete_enable = TRUE;
        file_util_delete(NULL, collection_table_popup_file_list(ct), ct->listview);
@@ -759,14 +759,14 @@ static void collection_table_popup_move_to_trash_cb(GtkWidget *UNUSED(widget), g
 
 static void collection_table_popup_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        file_util_copy_path_list_to_clipboard(collection_table_popup_file_list(ct), TRUE);
 }
 
 static void collection_table_popup_copy_path_unquoted_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        file_util_copy_path_list_to_clipboard(collection_table_popup_file_list(ct), FALSE);
 }
@@ -798,7 +798,7 @@ static void collection_table_popup_randomize_cb(GtkWidget *widget, gpointer UNUS
 
 static void collection_table_popup_view_new_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        if (ct->click_info && g_list_find(ct->cd->list, ct->click_info))
                {
@@ -808,7 +808,7 @@ static void collection_table_popup_view_new_cb(GtkWidget *UNUSED(widget), gpoint
 
 static void collection_table_popup_view_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        if (ct->click_info && g_list_find(ct->cd->list, ct->click_info))
                {
@@ -818,7 +818,7 @@ static void collection_table_popup_view_cb(GtkWidget *UNUSED(widget), gpointer d
 
 static void collection_table_popup_selectall_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        collection_table_select_all(ct);
        ct->prev_selection= ct->click_info;
@@ -826,7 +826,7 @@ static void collection_table_popup_selectall_cb(GtkWidget *UNUSED(widget), gpoin
 
 static void collection_table_popup_unselectall_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        collection_table_unselect_all(ct);
        ct->prev_selection= ct->click_info;
@@ -834,7 +834,7 @@ static void collection_table_popup_unselectall_cb(GtkWidget *UNUSED(widget), gpo
 
 static void collection_table_popup_select_invert_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        collection_table_select_invert_all(ct);
        ct->prev_selection= ct->click_info;
@@ -847,7 +847,7 @@ static void collection_table_popup_rectangular_selection_cb(GtkWidget *UNUSED(wi
 
 static void collection_table_popup_remove_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
        GList *list;
 
        if (!ct->click_info) return;
@@ -867,7 +867,7 @@ static void collection_table_popup_remove_cb(GtkWidget *UNUSED(widget), gpointer
 
 static void collection_table_popup_add_file_selection_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
        GList *list;
        LayoutWindow *lw = NULL;
 
@@ -884,14 +884,14 @@ static void collection_table_popup_add_file_selection_cb(GtkWidget *UNUSED(widge
 
 static void collection_table_popup_add_collection_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        collection_dialog_append(NULL, ct->cd);
 }
 
 static void collection_table_popup_goto_original_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
        GList *list;
        LayoutWindow *lw = NULL;
        FileData *fd;
@@ -911,7 +911,7 @@ static void collection_table_popup_goto_original_cb(GtkWidget *UNUSED(widget), g
 
 static void collection_table_popup_find_dupes_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
        DupeWindow *dw;
 
        dw = dupe_window_new();
@@ -920,7 +920,7 @@ static void collection_table_popup_find_dupes_cb(GtkWidget *UNUSED(widget), gpoi
 
 static void collection_table_popup_print_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
        FileData *fd;
 
        fd = (ct->click_info) ? ct->click_info->fd : NULL;
@@ -930,21 +930,21 @@ static void collection_table_popup_print_cb(GtkWidget *UNUSED(widget), gpointer
 
 static void collection_table_popup_show_names_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        collection_table_toggle_filenames(ct);
 }
 
 static void collection_table_popup_show_stars_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        collection_table_toggle_stars(ct);
 }
 
 static void collection_table_popup_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        collection_table_selection_remove(ct, ct->click_info, SELECTION_PRELIGHT, NULL);
        ct->click_info = NULL;
@@ -1241,7 +1241,7 @@ static gint page_height(CollectTable *ct)
 
 static gboolean collection_table_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
        gint focus_row = 0;
        gint focus_col = 0;
        CollectInfo *info;
@@ -1604,7 +1604,7 @@ static void collection_table_motion_update(CollectTable *ct, gint x, gint y, gbo
 
 static gboolean collection_table_auto_scroll_idle_cb(gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
        GdkWindow *window;
        gint x, y;
        gint w, h;
@@ -1631,7 +1631,7 @@ static gboolean collection_table_auto_scroll_idle_cb(gpointer data)
 
 static gboolean collection_table_auto_scroll_notify_cb(GtkWidget *UNUSED(widget), gint UNUSED(x), gint UNUSED(y), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        if (!ct->drop_idle_id)
                {
@@ -1669,7 +1669,7 @@ static void collection_table_scroll(CollectTable *ct, gboolean scroll)
 
 static gboolean collection_table_motion_cb(GtkWidget *UNUSED(widget), GdkEventMotion *event, gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        collection_table_motion_update(ct, (gint)event->x, (gint)event->y, FALSE);
 
@@ -1678,7 +1678,7 @@ static gboolean collection_table_motion_cb(GtkWidget *UNUSED(widget), GdkEventMo
 
 static gboolean collection_table_press_cb(GtkWidget *UNUSED(widget), GdkEventButton *bevent, gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
        GtkTreeIter iter;
        CollectInfo *info;
 
@@ -1717,7 +1717,7 @@ static gboolean collection_table_press_cb(GtkWidget *UNUSED(widget), GdkEventBut
 
 static gboolean collection_table_release_cb(GtkWidget *UNUSED(widget), GdkEventButton *bevent, gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
        GtkTreeIter iter;
        CollectInfo *info = NULL;
 
@@ -1777,7 +1777,7 @@ static gboolean collection_table_release_cb(GtkWidget *UNUSED(widget), GdkEventB
 
 static gboolean collection_table_leave_cb(GtkWidget *UNUSED(widget), GdkEventCrossing *UNUSED(event), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        tip_unschedule(ct);
        return FALSE;
@@ -1974,7 +1974,7 @@ static void collection_table_sync(CollectTable *ct)
 
 static gboolean collection_table_sync_idle_cb(gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        if (!ct->sync_idle_id) return FALSE;
        g_source_remove(ct->sync_idle_id);
@@ -2190,7 +2190,7 @@ static void confirm_dir_list_do(CollectTable *ct, GList *list, gboolean recursiv
        GList *work = list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
                if (isdir(fd->path)) collection_table_add_dir_recursive(ct, fd, recursive);
                }
@@ -2200,21 +2200,21 @@ static void confirm_dir_list_do(CollectTable *ct, GList *list, gboolean recursiv
 
 static void confirm_dir_list_add(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        confirm_dir_list_do(ct, ct->drop_list, FALSE);
 }
 
 static void confirm_dir_list_recurse(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        confirm_dir_list_do(ct, ct->drop_list, TRUE);
 }
 
 static void confirm_dir_list_skip(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        collection_table_insert_filelist(ct, ct->drop_list, ct->marker_info);
 }
@@ -2265,7 +2265,7 @@ static void collection_table_dnd_get(GtkWidget *UNUSED(widget), GdkDragContext *
                                     GtkSelectionData *selection_data, guint info,
                                     guint UNUSED(time), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
        gboolean selected;
        GList *list = NULL;
        gchar *uri_text = NULL;
@@ -2317,7 +2317,7 @@ static void collection_table_dnd_receive(GtkWidget *UNUSED(widget), GdkDragConte
                                          GtkSelectionData *selection_data, guint info,
                                          guint UNUSED(time), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
        GList *list = NULL;
        GList *info_list = NULL;
        CollectionData *source;
@@ -2371,7 +2371,7 @@ static void collection_table_dnd_receive(GtkWidget *UNUSED(widget), GdkDragConte
                        work = list;
                        while (work)
                                {
-                               FileData *fd = (FileData *)work->data;
+                               FileData *fd = static_cast<FileData *>(work->data);
                                if (isdir(fd->path))
                                        {
                                        GtkWidget *menu;
@@ -2399,7 +2399,7 @@ static void collection_table_dnd_receive(GtkWidget *UNUSED(widget), GdkDragConte
 
 static void collection_table_dnd_begin(GtkWidget *widget, GdkDragContext *context, gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        if (ct->click_info && ct->click_info->pixbuf)
                {
@@ -2415,7 +2415,7 @@ static void collection_table_dnd_begin(GtkWidget *widget, GdkDragContext *contex
 
 static void collection_table_dnd_end(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        /* apparently a leave event is not generated on a drop */
        tip_unschedule(ct);
@@ -2426,7 +2426,7 @@ static void collection_table_dnd_end(GtkWidget *UNUSED(widget), GdkDragContext *
 static gint collection_table_dnd_motion(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context),
                                        gint x, gint y, guint UNUSED(time), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        collection_table_motion_update(ct, x, y, TRUE);
        collection_table_scroll(ct, TRUE);
@@ -2436,7 +2436,7 @@ static gint collection_table_dnd_motion(GtkWidget *UNUSED(widget), GdkDragContex
 
 static void collection_table_dnd_leave(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context), guint UNUSED(time), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        collection_table_scroll(ct, FALSE);
 }
@@ -2481,7 +2481,7 @@ struct _ColumnData
 static void collection_table_cell_data_cb(GtkTreeViewColumn *UNUSED(tree_column), GtkCellRenderer *cell,
                                          GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
 {
-       ColumnData *cd = (ColumnData *)data;
+       ColumnData *cd = static_cast<ColumnData *>(data);
        CollectTable *ct;
        GtkStyle *style;
        GList *list;
@@ -2616,7 +2616,7 @@ static void collection_table_append_column(CollectTable *ct, gint n)
 
 static void collection_table_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        /* If there is no unsaved data, save the window geometry
         */
@@ -2645,7 +2645,7 @@ static void collection_table_destroy(GtkWidget *UNUSED(widget), gpointer data)
 
 static void collection_table_sized(GtkWidget *UNUSED(widget), GtkAllocation *allocation, gpointer data)
 {
-       CollectTable *ct = (CollectTable *)data;
+       CollectTable *ct = static_cast<CollectTable *>(data);
 
        collection_table_populate_at_new_size(ct, allocation->width, allocation->height, FALSE);
 }
index 5c25405..e0a14bd 100644 (file)
@@ -272,7 +272,7 @@ CollectInfo *collection_list_find_fd(GList *list, FileData *fd)
 
        while (work)
                {
-               CollectInfo *ci = (CollectInfo *)work->data;
+               CollectInfo *ci = static_cast<CollectInfo *>(work->data);
                if (ci->fd == fd) return ci;
                work = work->next;
                }
@@ -287,7 +287,7 @@ GList *collection_list_to_filelist(GList *list)
 
        while (work)
                {
-               CollectInfo *info = (CollectInfo *)work->data;
+               CollectInfo *info = static_cast<CollectInfo *>(work->data);
                filelist = g_list_prepend(filelist, file_data_ref(info->fd));
                work = work->next;
                }
@@ -303,7 +303,7 @@ CollectWindow *collection_window_find(CollectionData *cd)
        work = collection_window_list;
        while (work)
                {
-               CollectWindow *cw = (CollectWindow *)work->data;
+               CollectWindow *cw = static_cast<CollectWindow *>(work->data);
                if (cw->cd == cd) return cw;
                work = work->next;
                }
@@ -320,7 +320,7 @@ CollectWindow *collection_window_find_by_path(const gchar *path)
        work = collection_window_list;
        while (work)
                {
-               CollectWindow *cw = (CollectWindow *)work->data;
+               CollectWindow *cw = static_cast<CollectWindow *>(work->data);
                if (cw->cd->path && strcmp(cw->cd->path, path) == 0) return cw;
                work = work->next;
                }
@@ -901,7 +901,7 @@ void collection_update_geometry(CollectionData *cd)
 
 static void collection_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-       CollectionData *cd = (CollectionData *)data;
+       CollectionData *cd = static_cast<CollectionData *>(data);
 
        if (!(type & NOTIFY_CHANGE) || !fd->change) return;
 
@@ -934,7 +934,7 @@ static void collection_notify_cb(FileData *fd, NotifyType type, gpointer data)
 
 static gboolean collection_window_keypress(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
 {
-       CollectWindow *cw = (CollectWindow *)data;
+       CollectWindow *cw = static_cast<CollectWindow *>(data);
        gboolean stop_signal = FALSE;
        GList *list;
 
@@ -1131,7 +1131,7 @@ static void collection_window_update_title(CollectWindow *cw)
 
 static void collection_window_update_info(CollectionData *UNUSED(cd), CollectInfo *ci, gpointer data)
 {
-       CollectWindow *cw = (CollectWindow *)data;
+       CollectWindow *cw = static_cast<CollectWindow *>(data);
 
        collection_table_file_update(cw->table, ci);
 }
@@ -1185,7 +1185,7 @@ static void collection_window_close_final(CollectWindow *cw)
 
 static void collection_close_save_cb(GenericDialog *gd, gpointer data)
 {
-       CollectWindow *cw = (CollectWindow *)data;
+       CollectWindow *cw = static_cast<CollectWindow *>(data);
 
        cw->close_dialog = NULL;
        generic_dialog_close(gd);
@@ -1209,7 +1209,7 @@ static void collection_close_save_cb(GenericDialog *gd, gpointer data)
 
 static void collection_close_close_cb(GenericDialog *gd, gpointer data)
 {
-       CollectWindow *cw = (CollectWindow *)data;
+       CollectWindow *cw = static_cast<CollectWindow *>(data);
 
        cw->close_dialog = NULL;
        generic_dialog_close(gd);
@@ -1219,7 +1219,7 @@ static void collection_close_close_cb(GenericDialog *gd, gpointer data)
 
 static void collection_close_cancel_cb(GenericDialog *gd, gpointer data)
 {
-       CollectWindow *cw = (CollectWindow *)data;
+       CollectWindow *cw = static_cast<CollectWindow *>(data);
 
        cw->close_dialog = NULL;
        generic_dialog_close(gd);
@@ -1286,7 +1286,7 @@ gboolean collection_window_modified_exists(void)
        work = collection_window_list;
        while (work)
                {
-               CollectWindow *cw = (CollectWindow *)work->data;
+               CollectWindow *cw = static_cast<CollectWindow *>(work->data);
                if (cw->cd->changed)
                        {
                        ret = TRUE;
@@ -1306,7 +1306,7 @@ gboolean collection_window_modified_exists(void)
 
 static gboolean collection_window_delete(GtkWidget *UNUSED(widget), GdkEvent *UNUSED(event), gpointer data)
 {
-       CollectWindow *cw = (CollectWindow *)data;
+       CollectWindow *cw = static_cast<CollectWindow *>(data);
        collection_window_close(cw);
 
        return TRUE;
index 2f5e469..b8cadd8 100644 (file)
@@ -337,7 +337,7 @@ void color_man_correct_region(ColorMan *cm, GdkPixbuf *pixbuf, gint x, gint y, g
 
 static gboolean color_man_idle_cb(gpointer data)
 {
-       ColorMan *cm = (ColorMan *)data;
+       ColorMan *cm = static_cast<ColorMan *>(data);
        gint width, height;
        gint rh;
 
index 940cd9c..4e80e8c 100644 (file)
@@ -111,7 +111,7 @@ static gboolean editor_window_save(EditorWindow *ew)
 
 static void editor_window_close_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       EditorWindow *ew = (EditorWindow *)data;
+       EditorWindow *ew = static_cast<EditorWindow *>(data);
 
        g_free(ew->desktop_name);
        gtk_widget_destroy(ew->window);
@@ -126,7 +126,7 @@ static gint editor_window_delete_cb(GtkWidget *w, GdkEventAny *UNUSED(event), gp
 
 static void editor_window_save_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       EditorWindow *ew = (EditorWindow *)data;
+       EditorWindow *ew = static_cast<EditorWindow *>(data);
 
        if (ew->modified)
                {
@@ -140,7 +140,7 @@ static void editor_window_save_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void editor_window_text_modified_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       EditorWindow *ew = (EditorWindow *)data;
+       EditorWindow *ew = static_cast<EditorWindow *>(data);
 
        if (gtk_text_buffer_get_modified(ew->buffer))
                {
@@ -151,7 +151,7 @@ static void editor_window_text_modified_cb(GtkWidget *UNUSED(widget), gpointer d
 
 static void editor_window_entry_changed_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       EditorWindow *ew = (EditorWindow *)data;
+       EditorWindow *ew = static_cast<EditorWindow *>(data);
        const gchar *content = gtk_entry_get_text(GTK_ENTRY(ew->entry));
        gboolean modified = ew->modified;
 
@@ -282,7 +282,7 @@ static void editor_list_window_delete_dlg_cancel(GenericDialog *gd, gpointer dat
 
 static void editor_list_window_delete_dlg_cancel(GenericDialog *UNUSED(gd), gpointer data)
 {
-       EditorWindowDel_Data *ewdl = (EditorWindowDel_Data *)data;
+       EditorWindowDel_Data *ewdl = static_cast<EditorWindowDel_Data *>(data);
 
        ewdl->ewl->gd = NULL;
        g_free(ewdl->path);
@@ -291,7 +291,7 @@ static void editor_list_window_delete_dlg_cancel(GenericDialog *UNUSED(gd), gpoi
 
 static void editor_list_window_delete_dlg_ok_cb(GenericDialog *gd, gpointer data)
 {
-       EditorWindowDel_Data *ewdl = (EditorWindowDel_Data *)data;
+       EditorWindowDel_Data *ewdl = static_cast<EditorWindowDel_Data *>(data);
 
        if (!unlink_file(ewdl->path))
                {
@@ -312,7 +312,7 @@ static void editor_list_window_delete_dlg_ok_cb(GenericDialog *gd, gpointer data
 
 static void editor_list_window_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       EditorListWindow *ewl = (EditorListWindow *)data;
+       EditorListWindow *ewl = static_cast<EditorListWindow *>(data);
        GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(ewl->view));
        GtkTreeIter iter;
 
@@ -357,7 +357,7 @@ static void editor_list_window_delete_cb(GtkWidget *UNUSED(widget), gpointer dat
 
 static void editor_list_window_edit_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       EditorListWindow *ewl = (EditorListWindow *)data;
+       EditorListWindow *ewl = static_cast<EditorListWindow *>(data);
        GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(ewl->view));
        GtkTreeIter iter;
 
@@ -388,7 +388,7 @@ static void editor_list_window_help_cb(GtkWidget *UNUSED(widget), gpointer UNUSE
 
 static void editor_list_window_selection_changed_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       EditorListWindow *ewl = (EditorListWindow *)data;
+       EditorListWindow *ewl = static_cast<EditorListWindow *>(data);
        GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(ewl->view));
        GtkTreeIter iter;
 
@@ -469,7 +469,7 @@ static gint editor_list_window_sort_cb(GtkTreeModel *model, GtkTreeIter *a, GtkT
 
 static void plugin_disable_cb(GtkCellRendererToggle *UNUSED(renderer), gchar *path_str, gpointer data)
 {
-       EditorListWindow *ewl = (EditorListWindow *)data;
+       EditorListWindow *ewl = static_cast<EditorListWindow *>(data);
        GtkTreePath *tpath;
        GtkTreeIter iter;
        GtkTreeModel *model;
index 6017947..22536b0 100644 (file)
@@ -171,7 +171,7 @@ void dnd_set_drag_icon(GtkWidget *widget, GdkDragContext *context, GdkPixbuf *pi
 
 static void dnd_set_drag_label_end_cb(GtkWidget *widget, GdkDragContext *UNUSED(context), gpointer data)
 {
-       GtkWidget *window = (GtkWidget *)data;
+       GtkWidget *window = static_cast<GtkWidget *>(data);
        g_signal_handlers_disconnect_by_func(widget, (gpointer)dnd_set_drag_label_end_cb, data);
        gtk_widget_destroy(window);
 }
index d73f2a8..9a62c4e 100644 (file)
@@ -473,7 +473,7 @@ static void dupe_list_free(GList *list)
        GList *work = list;
        while (work)
                {
-               DupeItem *di = (DupeItem *)work->data;
+               DupeItem *di = static_cast<DupeItem *>(work->data);
                work = work->next;
                dupe_item_free(di);
                }
@@ -485,7 +485,7 @@ static DupeItem *dupe_item_find_fd_by_list(FileData *fd, GList *work)
 {
        while (work)
                {
-               DupeItem *di = (DupeItem *)work->data;
+               DupeItem *di = static_cast<DupeItem *>(work->data);
 
                if (di->fd == fd) return di;
 
@@ -513,7 +513,7 @@ static DupeItem *dupe_item_find_path_by_list(const gchar *path, GList *work)
 {
        while (work)
                {
-               DupeItem *di = (DupeItem *)work->data;
+               DupeItem *di = static_cast<DupeItem *>(work->data);
 
                if (strcmp(di->fd->path, path) == 0) return di;
 
@@ -751,7 +751,7 @@ static void dupe_listview_populate(DupeWindow *dw)
        work = g_list_last(dw->dupes);
        while (work)
                {
-               DupeItem *parent = (DupeItem *)work->data;
+               DupeItem *parent = static_cast<DupeItem *>(work->data);
                GList *temp;
 
                dupe_listview_add(dw, parent, NULL);
@@ -842,7 +842,7 @@ static GList *dupe_listview_get_selection(DupeWindow *UNUSED(dw), GtkWidget *lis
        work = slist;
        while (work)
                {
-               GtkTreePath *tpath = (GtkTreePath *)work->data;
+               GtkTreePath *tpath = static_cast<GtkTreePath *>(work->data);
                DupeItem *di = NULL;
                GtkTreeIter iter;
 
@@ -873,7 +873,7 @@ static gboolean dupe_listview_item_is_selected(DupeWindow *UNUSED(dw), DupeItem
        work = slist;
        while (!found && work)
                {
-               GtkTreePath *tpath = (GtkTreePath *)work->data;
+               GtkTreePath *tpath = static_cast<GtkTreePath *>(work->data);
                DupeItem *di_n;
                GtkTreeIter iter;
 
@@ -946,7 +946,7 @@ static DupeMatch *dupe_match_find_match(DupeItem *child, DupeItem *parent)
        work = parent->group;
        while (work)
                {
-               DupeMatch *dm = (DupeMatch *)work->data;
+               DupeMatch *dm = static_cast<DupeMatch *>(work->data);
                if (dm->di == child) return dm;
                work = work->next;
                }
@@ -1030,7 +1030,7 @@ static void dupe_match_link_clear(DupeItem *parent, gboolean unlink_children)
        work = parent->group;
        while (work)
                {
-               DupeMatch *dm = (DupeMatch *)work->data;
+               DupeMatch *dm = static_cast<DupeMatch *>(work->data);
                work = work->next;
 
                if (unlink_children) dupe_match_unlink_child(parent, dm->di);
@@ -1090,7 +1090,7 @@ static DupeItem *dupe_match_highest_rank(DupeItem *child)
        work = child->group;
        while (work)
                {
-               DupeMatch *dm = (DupeMatch *)work->data;
+               DupeMatch *dm = static_cast<DupeMatch *>(work->data);
                if (!dr || dm->rank > dr->rank)
                        {
                        dr = dm;
@@ -1116,7 +1116,7 @@ static void dupe_match_rank_update(DupeItem *parent)
        work = parent->group;
        while (work)
                {
-               DupeMatch *dm = (DupeMatch *)work->data;
+               DupeMatch *dm = static_cast<DupeMatch *>(work->data);
                work = work->next;
                rank += dm->rank;
                c++;
@@ -1141,7 +1141,7 @@ static DupeItem *dupe_match_find_parent(DupeWindow *dw, DupeItem *child)
        work = child->group;
        while (work)
                {
-               DupeMatch *dm = (DupeMatch *)work->data;
+               DupeMatch *dm = static_cast<DupeMatch *>(work->data);
                if (g_list_find(dw->dupes, dm->di)) return dm->di;
                work = work->next;
                }
@@ -1160,7 +1160,7 @@ static void dupe_match_reset_list(GList *work)
 {
        while (work)
                {
-               DupeItem *di = (DupeItem *)work->data;
+               DupeItem *di = static_cast<DupeItem *>(work->data);
                work = work->next;
 
                dupe_match_link_clear(di, FALSE);
@@ -1177,7 +1177,7 @@ static void dupe_match_reparent(DupeWindow *dw, DupeItem *old_parent, DupeItem *
        work = old_parent->group;
        while (work)
                {
-               DupeMatch *dm = (DupeMatch *)work->data;
+               DupeMatch *dm = static_cast<DupeMatch *>(work->data);
                dupe_match_unlink_child(old_parent, dm->di);
                dupe_match_link_child(new_parent, dm->di, dm->rank);
                work = work->next;
@@ -1199,7 +1199,7 @@ static void dupe_match_print_group(DupeItem *di)
        work = di->group;
        while (work)
                {
-               DupeMatch *dm = (DupeMatch *)work->data;
+               DupeMatch *dm = static_cast<DupeMatch *>(work->data);
                work = work->next;
 
                log_printf("  %f %s\n", dm->rank, dm->di->fd->name);
@@ -1215,7 +1215,7 @@ static void dupe_match_print_list(GList *list)
        work = list;
        while (work)
                {
-               DupeItem *di = (DupeItem *)work->data;
+               DupeItem *di = static_cast<DupeItem *>(work->data);
                dupe_match_print_group(di);
                work = work->next;
                }
@@ -1251,7 +1251,7 @@ static GList *dupe_match_unlink_by_rank(DupeItem *child, DupeItem *parent, GList
                work = parent->group;
                while (work)
                        {
-                       DupeMatch *dm = (DupeMatch *)work->data;
+                       DupeMatch *dm = static_cast<DupeMatch *>(work->data);
                        DupeItem *orphan;
 
                        work = work->next;
@@ -1301,7 +1301,7 @@ static GList *dupe_match_group_filter(GList *list, DupeItem *di, DupeWindow *dw)
        work = g_list_last(di->group);
        while (work)
                {
-               DupeMatch *dm = (DupeMatch *)work->data;
+               DupeMatch *dm = static_cast<DupeMatch *>(work->data);
                work = work->prev;
                list = dupe_match_unlink_by_rank(di, dm->di, list, dw);
                }
@@ -1326,7 +1326,7 @@ static GList *dupe_match_group_trim(GList *list, DupeWindow *dw)
        work = list;
        while (work)
                {
-               DupeItem *di = (DupeItem *)work->data;
+               DupeItem *di = static_cast<DupeItem *>(work->data);
                if (!di->second) list = dupe_match_group_filter(list, di, dw);
                work = work->next;
                if (di->second) list = g_list_remove(list, di);
@@ -1358,7 +1358,7 @@ static void dupe_match_sort_groups(GList *list)
        work = list;
        while (work)
                {
-               DupeItem *di = (DupeItem *)work->data;
+               DupeItem *di = static_cast<DupeItem *>(work->data);
                di->group = g_list_sort(di->group, dupe_match_sort_groups_cb);
                work = work->next;
                }
@@ -1413,7 +1413,7 @@ static GList *dupe_match_rank_sort(GList *source_list)
        work = source_list;
        while (work)
                {
-               DupeItem *di = (DupeItem *)work->data;
+               DupeItem *di = static_cast<DupeItem *>(work->data);
 
                if (di->group)
                        {
@@ -1630,7 +1630,7 @@ static gboolean dupe_match(DupeItem *a, DupeItem *b, DupeMatchType mask, gdouble
  */
 static DUPE_CHECK_RESULT dupe_match_check(DupeItem *di1, DupeItem *di2, gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
        DupeMatchType mask = dw->match_mask;
 
        if (mask & DUPE_MATCH_ALL)
@@ -1794,7 +1794,7 @@ static gint dupe_match_sort_cb(gconstpointer a, gconstpointer b, gpointer data)
 {
        const DupeItem *di1 = *((DupeItem **) a);
        const DupeItem *di2 = *((DupeItem **) b);
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
        DupeMatchType mask = dw->match_mask;
 
        if (mask & DUPE_MATCH_ALL)
@@ -1887,7 +1887,7 @@ static void dupe_array_check(DupeWindow *dw )
        work = dw->list;
        while (work)
                {
-               DupeItem *di = (DupeItem *)work->data;
+               DupeItem *di = static_cast<DupeItem *>(work->data);
                g_array_append_val(array_set1, di);
                work = work->next;
                }
@@ -2108,7 +2108,7 @@ static void dupe_thumb_do(DupeWindow *dw)
 
 static void dupe_thumb_error_cb(ThumbLoader *UNUSED(tl), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        dupe_thumb_do(dw);
        dupe_thumb_step(dw);
@@ -2116,7 +2116,7 @@ static void dupe_thumb_error_cb(ThumbLoader *UNUSED(tl), gpointer data)
 
 static void dupe_thumb_done_cb(ThumbLoader *UNUSED(tl), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        dupe_thumb_do(dw);
        dupe_thumb_step(dw);
@@ -2246,14 +2246,14 @@ static void dupe_check_stop(DupeWindow *dw)
 
 static void dupe_check_stop_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        dupe_check_stop(dw);
 }
 
 static void dupe_loader_done_cb(ImageLoader *il, gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
        GdkPixbuf *pixbuf;
 
        pixbuf = image_loader_get_pixbuf(il);
@@ -2424,7 +2424,7 @@ static gint sort_func(gconstpointer a, gconstpointer b)
  */
 static gboolean dupe_check_cb(gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
        DupeSearchMatch *search_match_list_item;
 
        if (!dw->idle_id)
@@ -2636,7 +2636,7 @@ static void dupe_check_start(DupeWindow *dw)
 
 static gboolean dupe_check_start_cb(gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        dupe_check_start(dw);
 
@@ -2752,7 +2752,7 @@ static gboolean dupe_item_remove_by_path(DupeWindow *dw, const gchar *path)
 static gboolean dupe_files_add_queue_cb(gpointer data)
 {
        DupeItem *di = NULL;
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
        FileData *fd;
        GList *queue = dw->add_files_queue;
 
@@ -2992,7 +2992,7 @@ void dupe_window_add_files(DupeWindow *dw, GList *list, gboolean recurse)
        work = list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
                if (isdir(fd->path) && !recurse)
                        {
@@ -3085,7 +3085,7 @@ static void dupe_item_update_fd_in_list(DupeWindow *dw, FileData *fd, GList *wor
 {
        while (work)
                {
-               DupeItem *di = (DupeItem *)work->data;
+               DupeItem *di = static_cast<DupeItem *>(work->data);
 
                if (di->fd == fd)
                        dupe_item_update(dw, di);
@@ -3252,7 +3252,7 @@ static void dupe_window_remove_selection(DupeWindow *dw, GtkWidget *listview)
        work = slist;
        while (work)
                {
-               GtkTreePath *tpath = (GtkTreePath *)work->data;
+               GtkTreePath *tpath = static_cast<GtkTreePath *>(work->data);
                DupeItem *di = NULL;
 
                gtk_tree_model_get_iter(store, &iter, tpath);
@@ -3315,21 +3315,21 @@ static void dupe_window_append_file_list(DupeWindow *dw, gint on_second)
 
 static void dupe_menu_view_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        if (dw->click_item) dupe_menu_view(dw, dw->click_item, dw->listview, FALSE);
 }
 
 static void dupe_menu_viewnew_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        if (dw->click_item) dupe_menu_view(dw, dw->click_item, dw->listview, TRUE);
 }
 
 static void dupe_menu_select_all_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
        GtkTreeSelection *selection;
 
        options->duplicates_select_type = DUPE_SELECT_NONE;
@@ -3339,7 +3339,7 @@ static void dupe_menu_select_all_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void dupe_menu_select_none_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
        GtkTreeSelection *selection;
 
        options->duplicates_select_type = DUPE_SELECT_NONE;
@@ -3349,7 +3349,7 @@ static void dupe_menu_select_none_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void dupe_menu_select_dupes_set1_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        options->duplicates_select_type = DUPE_SELECT_GROUP1;
        dupe_listview_select_dupes(dw, DUPE_SELECT_GROUP1);
@@ -3357,7 +3357,7 @@ static void dupe_menu_select_dupes_set1_cb(GtkWidget *UNUSED(widget), gpointer d
 
 static void dupe_menu_select_dupes_set2_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        options->duplicates_select_type = DUPE_SELECT_GROUP2;
        dupe_listview_select_dupes(dw, DUPE_SELECT_GROUP2);
@@ -3376,7 +3376,7 @@ static void dupe_menu_edit_cb(GtkWidget *widget, gpointer data)
 
 static void dupe_menu_print_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
        FileData *fd;
 
        fd = (dw->click_item) ? dw->click_item->fd : NULL;
@@ -3388,28 +3388,28 @@ static void dupe_menu_print_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void dupe_menu_copy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        file_util_copy(NULL, dupe_listview_get_selection(dw, dw->listview), NULL, dw->window);
 }
 
 static void dupe_menu_move_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        file_util_move(NULL, dupe_listview_get_selection(dw, dw->listview), NULL, dw->window);
 }
 
 static void dupe_menu_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        file_util_rename(NULL, dupe_listview_get_selection(dw, dw->listview), dw->window);
 }
 
 static void dupe_menu_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        options->file_ops.safe_delete_enable = FALSE;
        file_util_delete_notify_done(NULL, dupe_listview_get_selection(dw, dw->listview), dw->window, delete_finished_cb, dw);
@@ -3417,7 +3417,7 @@ static void dupe_menu_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void dupe_menu_move_to_trash_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        options->file_ops.safe_delete_enable = TRUE;
        file_util_delete_notify_done(NULL, dupe_listview_get_selection(dw, dw->listview), dw->window, delete_finished_cb, dw);
@@ -3425,42 +3425,42 @@ static void dupe_menu_move_to_trash_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void dupe_menu_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        file_util_copy_path_list_to_clipboard(dupe_listview_get_selection(dw, dw->listview), TRUE);
 }
 
 static void dupe_menu_copy_path_unquoted_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        file_util_copy_path_list_to_clipboard(dupe_listview_get_selection(dw, dw->listview), FALSE);
 }
 
 static void dupe_menu_remove_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        dupe_window_remove_selection(dw, dw->listview);
 }
 
 static void dupe_menu_clear_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        dupe_window_clear(dw);
 }
 
 static void dupe_menu_close_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        dupe_window_close(dw);
 }
 
 static void dupe_menu_popup_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       GList *editmenu_fd_list = (GList *)data;
+       GList *editmenu_fd_list = static_cast<GList *>(data);
 
        filelist_free(editmenu_fd_list);
 }
@@ -3585,7 +3585,7 @@ static GtkWidget *dupe_menu_popup_main(DupeWindow *dw, DupeItem *di)
 
 static gboolean dupe_listview_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
        GtkTreeModel *store;
        GtkTreePath *tpath;
        GtkTreeIter iter;
@@ -3668,7 +3668,7 @@ static gboolean dupe_listview_press_cb(GtkWidget *widget, GdkEventButton *bevent
 
 static gboolean dupe_listview_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
        GtkTreeModel *store;
        GtkTreePath *tpath;
        GtkTreeIter iter;
@@ -3797,14 +3797,14 @@ static void dupe_second_clear(DupeWindow *dw)
 
 static void dupe_second_menu_view_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        if (dw->click_item) dupe_menu_view(dw, dw->click_item, dw->second_listview, FALSE);
 }
 
 static void dupe_second_menu_viewnew_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        if (dw->click_item) dupe_menu_view(dw, dw->click_item, dw->second_listview, TRUE);
 }
@@ -3812,7 +3812,7 @@ static void dupe_second_menu_viewnew_cb(GtkWidget *UNUSED(widget), gpointer data
 static void dupe_second_menu_select_all_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
        GtkTreeSelection *selection;
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dw->second_listview));
        gtk_tree_selection_select_all(selection);
@@ -3821,7 +3821,7 @@ static void dupe_second_menu_select_all_cb(GtkWidget *UNUSED(widget), gpointer d
 static void dupe_second_menu_select_none_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
        GtkTreeSelection *selection;
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dw->second_listview));
        gtk_tree_selection_unselect_all(selection);
@@ -3829,14 +3829,14 @@ static void dupe_second_menu_select_none_cb(GtkWidget *UNUSED(widget), gpointer
 
 static void dupe_second_menu_remove_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        dupe_window_remove_selection(dw, dw->second_listview);
 }
 
 static void dupe_second_menu_clear_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        dupe_second_clear(dw);
        dupe_window_recompare(dw);
@@ -3879,7 +3879,7 @@ static GtkWidget *dupe_menu_popup_second(DupeWindow *dw, DupeItem *di)
 
 static void dupe_second_set_toggle_cb(GtkWidget *widget, gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        dw->second_set = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
 
@@ -3901,7 +3901,7 @@ static void dupe_second_set_toggle_cb(GtkWidget *widget, gpointer data)
 
 static void dupe_sort_totals_toggle_cb(GtkWidget *widget, gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        options->sort_totals = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
        dupe_window_recompare(dw);
@@ -3923,7 +3923,7 @@ static void dupe_listview_show_rank(GtkWidget *listview, gboolean rank);
 
 static void dupe_menu_type_cb(GtkWidget *combo, gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
        GtkTreeModel *store;
        GtkTreeIter iter;
 
@@ -4033,7 +4033,7 @@ static GdkColor *dupe_listview_color_shifted(GtkWidget *widget)
 static void dupe_listview_color_cb(GtkTreeViewColumn *UNUSED(tree_column), GtkCellRenderer *cell,
                                   GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
        gboolean set;
 
        gtk_tree_model_get(tree_model, iter, DUPE_COLUMN_COLOR, &set, -1);
@@ -4126,7 +4126,7 @@ static void dupe_listview_show_rank(GtkWidget *listview, gboolean rank)
 
 static void dupe_window_show_thumb_cb(GtkWidget *widget, gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        dw->show_thumbs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
        options->duplicates_thumbnails = dw->show_thumbs;
@@ -4160,7 +4160,7 @@ static void dupe_window_show_thumb_cb(GtkWidget *widget, gpointer data)
 
 static void dupe_window_rotation_invariant_cb(GtkWidget *widget, gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        options->rot_invariant_sim = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
        dupe_window_recompare(dw);
@@ -4168,7 +4168,7 @@ static void dupe_window_rotation_invariant_cb(GtkWidget *widget, gpointer data)
 
 static void dupe_window_custom_threshold_cb(GtkWidget *widget, gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
        DupeMatchType match_type;
        GtkTreeModel *store;
        gboolean valid;
@@ -4195,7 +4195,7 @@ static void dupe_window_custom_threshold_cb(GtkWidget *widget, gpointer data)
 
 static gboolean dupe_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
        gboolean stop_signal = FALSE;
        gboolean on_second;
        GtkWidget *listview;
@@ -4439,7 +4439,7 @@ void dupe_window_close(DupeWindow *dw)
 
 static gint dupe_window_close_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        dupe_window_close(dw);
 
@@ -4448,7 +4448,7 @@ static gint dupe_window_close_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static gint dupe_window_delete(GtkWidget *UNUSED(widget), GdkEvent *UNUSED(event), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
        dupe_window_close(dw);
 
        return TRUE;
@@ -4466,7 +4466,7 @@ static gint default_sort_cb(GtkTreeModel *UNUSED(model), GtkTreeIter *UNUSED(a),
 
 static gint column_sort_cb(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer data)
 {
-       GtkTreeSortable *sortable = (GtkTreeSortable *)data;
+       GtkTreeSortable *sortable = static_cast<GtkTreeSortable *>(data);
        gint ret = 0;
        gchar *rank_str_a, *rank_str_b;
        gint rank_int_a;
@@ -4555,7 +4555,7 @@ static gint column_sort_cb(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b,
 
 static void column_clicked_cb(GtkWidget *UNUSED(widget),  gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        options->duplicates_match = DUPE_SELECT_NONE;
        dupe_listview_select_dupes(dw, DUPE_SELECT_NONE);
@@ -4871,7 +4871,7 @@ static void confirm_dir_list_cancel(GtkWidget *UNUSED(widget), gpointer UNUSED(d
 
 static void confirm_dir_list_add(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CDupeConfirmD *d = (CDupeConfirmD *)data;
+       CDupeConfirmD *d = static_cast<CDupeConfirmD *>(data);
        GList *work;
 
        dupe_window_add_files(d->dw, d->list, FALSE);
@@ -4879,7 +4879,7 @@ static void confirm_dir_list_add(GtkWidget *UNUSED(widget), gpointer data)
        work = d->list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
                if (isdir(fd->path))
                        {
@@ -4898,19 +4898,19 @@ static void confirm_dir_list_add(GtkWidget *UNUSED(widget), gpointer data)
 
 static void confirm_dir_list_recurse(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CDupeConfirmD *d = (CDupeConfirmD *)data;
+       CDupeConfirmD *d = static_cast<CDupeConfirmD *>(data);
        dupe_window_add_files(d->dw, d->list, TRUE);
 }
 
 static void confirm_dir_list_skip(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CDupeConfirmD *d = (CDupeConfirmD *)data;
+       CDupeConfirmD *d = static_cast<CDupeConfirmD *>(data);
        dupe_window_add_files(d->dw, d->list, FALSE);
 }
 
 static void confirm_dir_list_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CDupeConfirmD *d = (CDupeConfirmD *)data;
+       CDupeConfirmD *d = static_cast<CDupeConfirmD *>(data);
        filelist_free(d->list);
        g_free(d);
 }
@@ -4961,7 +4961,7 @@ static void dupe_dnd_data_set(GtkWidget *widget, GdkDragContext *UNUSED(context)
                              GtkSelectionData *selection_data, guint info,
                              guint UNUSED(time), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
        GList *list;
 
        switch (info)
@@ -4983,7 +4983,7 @@ static void dupe_dnd_data_get(GtkWidget *widget, GdkDragContext *context,
                              GtkSelectionData *selection_data, guint info,
                              guint UNUSED(time), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
        GtkWidget *source;
        GList *list = NULL;
        GList *work;
@@ -5010,7 +5010,7 @@ static void dupe_dnd_data_get(GtkWidget *widget, GdkDragContext *context,
                        work = list;
                        while (work)
                                {
-                               FileData *fd = (FileData *)work->data;
+                               FileData *fd = static_cast<FileData *>(work->data);
                                if (isdir(fd->path))
                                        {
                                        GtkWidget *menu;
@@ -5051,7 +5051,7 @@ static void dupe_dest_set(GtkWidget *widget, gboolean enable)
 
 static void dupe_dnd_begin(GtkWidget *widget, GdkDragContext *context, gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
        dupe_dest_set(dw->listview, FALSE);
        dupe_dest_set(dw->second_listview, FALSE);
 
@@ -5091,7 +5091,7 @@ static void dupe_dnd_begin(GtkWidget *widget, GdkDragContext *context, gpointer
 
 static void dupe_dnd_end(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
        dupe_dest_set(dw->listview, TRUE);
        dupe_dest_set(dw->second_listview, TRUE);
 }
@@ -5135,7 +5135,7 @@ static void dupe_dnd_init(DupeWindow *dw)
 
 static void dupe_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        if (!(type & NOTIFY_CHANGE) || !fd->change) return;
 
@@ -5171,7 +5171,7 @@ static void dupe_notify_cb(FileData *fd, NotifyType type, gpointer data)
  */
 static void delete_finished_cb(gboolean success, const gchar *UNUSED(dest_path), gpointer data)
 {
-       DupeWindow *dw = (DupeWindow *)data;
+       DupeWindow *dw = static_cast<DupeWindow *>(data);
 
        if (!success)
                {
@@ -5208,14 +5208,14 @@ static void export_duplicates_close(ExportDupesData *edd)
 
 static void export_duplicates_data_cancel_cb(FileDialog *UNUSED(fdlg), gpointer data)
 {
-       ExportDupesData *edd = (ExportDupesData *)data;
+       ExportDupesData *edd = static_cast<ExportDupesData *>(data);
 
        export_duplicates_close(edd);
 }
 
 static void export_duplicates_data_save_cb(FileDialog *fdlg, gpointer data)
 {
-       ExportDupesData *edd = (ExportDupesData *)data;
+       ExportDupesData *edd = static_cast<ExportDupesData *>(data);
        GError *error = NULL;
        GtkTreeModel *store;
        GtkTreeIter iter;
index 44a2295..293ae7b 100644 (file)
@@ -475,7 +475,7 @@ GList *editor_get_desktop_files(void)
 
 static void editor_list_add_cb(gpointer UNUSED(key), gpointer value, gpointer data)
 {
-       GList **listp = (GList **)data;
+       GList **listp = static_cast<GList **>(data);
        EditorDescription *editor = value;
 
        /* do not show the special commands in any list, they are called explicitly */
@@ -551,7 +551,7 @@ static void editor_data_free(EditorData *ed)
 
 static void editor_verbose_window_close(GenericDialog *gd, gpointer data)
 {
-       EditorData *ed = (EditorData *)data;
+       EditorData *ed = static_cast<EditorData *>(data);
 
        generic_dialog_close(gd);
        editor_verbose_data_free(ed);
@@ -560,7 +560,7 @@ static void editor_verbose_window_close(GenericDialog *gd, gpointer data)
 
 static void editor_verbose_window_stop(GenericDialog *UNUSED(gd), gpointer data)
 {
-       EditorData *ed = (EditorData *)data;
+       EditorData *ed = static_cast<EditorData *>(data);
        ed->stopping = TRUE;
        ed->count = 0;
        editor_verbose_window_progress(ed, _("stopping..."));
@@ -657,7 +657,7 @@ static void editor_verbose_window_progress(EditorData *ed, const gchar *text)
 
 static gboolean editor_verbose_io_cb(GIOChannel *source, GIOCondition condition, gpointer data)
 {
-       EditorData *ed = (EditorData *)data;
+       EditorData *ed = static_cast<EditorData *>(data);
        gchar buf[512];
        gsize count;
 
@@ -898,7 +898,7 @@ EditorFlags editor_command_parse(const EditorDescription *editor, GList *list, g
 
                                                        while (!pathl && work)
                                                                {
-                                                               FileData *fd = (FileData *)work->data;
+                                                               FileData *fd = static_cast<FileData *>(work->data);
                                                                pathl = editor_command_path_parse(fd,
                                                                                                  consider_sidecars,
                                                                                                  (*p == 'f') ? PATH_FILE : PATH_FILE_URL,
@@ -937,7 +937,7 @@ EditorFlags editor_command_parse(const EditorDescription *editor, GList *list, g
 
                                                while (work)
                                                        {
-                                                       FileData *fd = (FileData *)work->data;
+                                                       FileData *fd = static_cast<FileData *>(work->data);
                                                        pathl = editor_command_path_parse(fd, consider_sidecars, (*p == 'F') ? PATH_FILE : PATH_FILE_URL, editor);
                                                        if (pathl)
                                                                {
@@ -1029,7 +1029,7 @@ err:
 
 static void editor_child_exit_cb(GPid pid, gint status, gpointer data)
 {
-       EditorData *ed = (EditorData *)data;
+       EditorData *ed = static_cast<EditorData *>(data);
        g_spawn_close_pid(pid);
        ed->pid = -1;
 
index 00c462f..8d2b834 100644 (file)
@@ -1203,7 +1203,7 @@ void exif_free(ExifData *exif)
        work = exif->items;
        while (work)
                {
-               ExifItem *item = (ExifItem *)work->data;
+               ExifItem *item = static_cast<ExifItem *>(work->data);
                work = work->next;
                exif_item_free(item);
                }
index 0a19b7c..f05b853 100644 (file)
@@ -65,7 +65,7 @@ gboolean file_cache_get(FileCacheData *fc, FileData *fd)
        work = fc->list;
        while (work)
                {
-               FileCacheEntry *fce = (FileCacheEntry *)work->data;
+               FileCacheEntry *fce = static_cast<FileCacheEntry *>(work->data);
                if (fce->fd == fd)
                        {
                        /* entry exists */
@@ -182,7 +182,7 @@ void file_cache_dump(FileCacheData *fc)
 
        while (work)
                {
-               FileCacheEntry *fe = (FileCacheEntry *)work->data;
+               FileCacheEntry *fe = static_cast<FileCacheEntry *>(work->data);
                work = work->next;
                DEBUG_1("cache entry: fc=%p [%lu] %s %ld", (void *)fc, ++n, fe->fd->path, fe->size);
                }
@@ -190,7 +190,7 @@ void file_cache_dump(FileCacheData *fc)
 
 static void file_cache_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-       FileCacheData *fc = (FileCacheData *)data;
+       FileCacheData *fc = static_cast<FileCacheData *>(data);
 
        if (type & (NOTIFY_REREAD | NOTIFY_CHANGE)) /* invalidate the entry on each file change */
                {
index c0a405a..b5dca50 100644 (file)
@@ -196,7 +196,7 @@ static gboolean file_data_check_changed_files_recursive(FileData *fd, struct sta
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = (FileData *)work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
                struct stat st;
                work = work->next;
 
@@ -777,7 +777,7 @@ static void file_data_consider_free(FileData *fd)
        work = parent->sidecar_files;
        while (work)
                {
-               FileData *sfd = (FileData *)work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
                if (file_data_check_has_ref(sfd)) return;
                work = work->next;
                }
@@ -789,7 +789,7 @@ static void file_data_consider_free(FileData *fd)
        work = parent->sidecar_files;
        while (work)
                {
-               FileData *sfd = (FileData *)work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
                file_data_free(sfd);
                work = work->next;
                }
@@ -880,7 +880,7 @@ void file_data_lock_list(GList *list)
        work = list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
                file_data_lock(fd);
                }
@@ -898,7 +898,7 @@ void file_data_unlock_list(GList *list)
        work = list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
                file_data_unlock(fd);
                }
@@ -958,7 +958,7 @@ static void file_data_check_sidecars(const GList *basename_list)
        work = basename_list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
                g_assert(fd->magick == FD_MAGICK);
                DEBUG_2("basename: %p %s", (void *)fd, fd->name);
@@ -1006,7 +1006,7 @@ static void file_data_check_sidecars(const GList *basename_list)
        work = basename_list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
                g_assert(fd->parent == NULL || fd->sidecar_files == NULL);
 
@@ -1039,7 +1039,7 @@ static void file_data_check_sidecars(const GList *basename_list)
        new_sidecars = NULL;
        while (work)
                {
-               FileData *sfd = (FileData *)work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
                g_assert(sfd->magick == FD_MAGICK);
                g_assert(sfd->parent == NULL && sfd->sidecar_files == NULL);
                sfd->parent = parent_fd;
@@ -1096,7 +1096,7 @@ void file_data_disable_grouping(FileData *fd, gboolean disable)
                        GList *work = sidecar_files;
                        while (work)
                                {
-                               FileData *sfd = (FileData *)work->data;
+                               FileData *sfd = static_cast<FileData *>(work->data);
                                work = work->next;
                                file_data_disconnect_sidecar_file(fd, sfd);
                                file_data_send_notification(sfd, NOTIFY_GROUPING);
@@ -1124,7 +1124,7 @@ void file_data_disable_grouping_list(GList *fd_list, gboolean disable)
        work = fd_list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
 
                file_data_disable_grouping(fd, disable);
                work = work->next;
@@ -1333,7 +1333,7 @@ static GList *filelist_filter_out_sidecars(GList *flist)
 
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
 
                work = work->next;
                if (fd->parent) /* remove fd's that are children */
@@ -1768,7 +1768,7 @@ gchar *file_data_get_sidecar_path(FileData *fd, gboolean existing_only)
        gchar *extended_extension = g_strconcat(fd->parent ? fd->parent->extension : fd->extension, ".xmp", NULL);
        while (work)
                {
-               FileData *sfd = (FileData *)work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
                work = work->next;
                if (g_ascii_strcasecmp(sfd->extension, ".xmp") == 0 || g_ascii_strcasecmp(sfd->extension, extended_extension) == 0)
                        {
@@ -1878,7 +1878,7 @@ GList *file_data_filter_marks_list(GList *list, guint filter)
        work = list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                GList *link = work;
                work = work->next;
 
@@ -1905,7 +1905,7 @@ GList *file_data_filter_file_filter_list(GList *list, GRegex *filter)
        work = list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                GList *link = work;
                work = work->next;
 
@@ -1945,7 +1945,7 @@ GList *file_data_filter_class_list(GList *list, guint filter)
        work = list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                GList *link = work;
                work = work->next;
 
@@ -2024,7 +2024,7 @@ gchar *file_data_sc_list_to_string(FileData *fd)
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = (FileData *)work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
 
                result = g_string_append(result, "+ ");
                result = g_string_append(result, sfd->extension);
@@ -2139,7 +2139,7 @@ static gboolean file_data_sc_add_ci(FileData *fd, FileDataChangeType type)
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = (FileData *)work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
 
                if (sfd->change) return FALSE;
                work = work->next;
@@ -2150,7 +2150,7 @@ static gboolean file_data_sc_add_ci(FileData *fd, FileDataChangeType type)
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = (FileData *)work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
 
                file_data_add_ci(sfd, type, NULL, NULL);
                work = work->next;
@@ -2170,7 +2170,7 @@ static gboolean file_data_sc_check_ci(FileData *fd, FileDataChangeType type)
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = (FileData *)work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
 
                if (!sfd->change || sfd->change->type != type) return FALSE;
                work = work->next;
@@ -2229,7 +2229,7 @@ void file_data_sc_free_ci(FileData *fd)
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = (FileData *)work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
 
                file_data_free_ci(sfd);
                work = work->next;
@@ -2244,7 +2244,7 @@ gboolean file_data_sc_add_ci_delete_list(GList *fd_list)
        work = fd_list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
 
                if (!file_data_sc_add_ci_delete(fd)) ret = FALSE;
                work = work->next;
@@ -2260,7 +2260,7 @@ static void file_data_sc_revert_ci_list(GList *fd_list)
        work = fd_list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
 
                file_data_sc_free_ci(fd);
                work = work->prev;
@@ -2274,7 +2274,7 @@ static gboolean file_data_sc_add_ci_list_call_func(GList *fd_list, const gchar *
        work = fd_list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
 
                if (!func(fd, dest))
                        {
@@ -2315,7 +2315,7 @@ gboolean file_data_add_ci_write_metadata_list(GList *fd_list)
        work = fd_list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
 
                if (!file_data_add_ci_write_metadata(fd)) ret = FALSE;
                work = work->next;
@@ -2331,7 +2331,7 @@ void file_data_free_ci_list(GList *fd_list)
        work = fd_list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
 
                file_data_free_ci(fd);
                work = work->next;
@@ -2345,7 +2345,7 @@ void file_data_sc_free_ci_list(GList *fd_list)
        work = fd_list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
 
                file_data_sc_free_ci(fd);
                work = work->next;
@@ -2444,7 +2444,7 @@ static void file_data_sc_update_ci(FileData *fd, const gchar *dest_path)
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = (FileData *)work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
 
                file_data_update_ci_dest_preserve_ext(sfd, dest_path);
                work = work->next;
@@ -2490,7 +2490,7 @@ static gboolean file_data_sc_update_ci_list_call_func(GList *fd_list,
        work = fd_list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
 
                if (!func(fd, dest)) ret = FALSE;
                work = work->next;
@@ -2777,7 +2777,7 @@ gint file_data_sc_verify_ci(FileData *fd, GList *list)
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = (FileData *)work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
 
                ret |= file_data_verify_ci(sfd, list);
                work = work->next;
@@ -3010,7 +3010,7 @@ gboolean file_data_sc_perform_ci(FileData *fd)
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = (FileData *)work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
 
                if (!file_data_perform_ci(sfd)) ret = FALSE;
                work = work->next;
@@ -3066,7 +3066,7 @@ gboolean file_data_sc_apply_ci(FileData *fd)
        work = fd->sidecar_files;
        while (work)
                {
-               FileData *sfd = (FileData *)work->data;
+               FileData *sfd = static_cast<FileData *>(work->data);
 
                file_data_apply_ci(sfd);
                work = work->next;
@@ -3102,7 +3102,7 @@ GList *file_data_process_groups_in_selection(GList *list, gboolean ungroup, GLis
                {
                while (work)
                        {
-                       FileData *fd = (FileData *)work->data;
+                       FileData *fd = static_cast<FileData *>(work->data);
                        work = work->next;
 
                        if (!file_data_list_contains_whole_group(list, fd))
@@ -3121,7 +3121,7 @@ GList *file_data_process_groups_in_selection(GList *list, gboolean ungroup, GLis
        work = list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                if (!fd->parent ||
index b1a56f6..a9eb7ae 100644 (file)
@@ -92,7 +92,7 @@ static FilterEntry *filter_get_by_key(const gchar *key)
        work = filter_list;
        while (work)
                {
-               FilterEntry *fe = (FilterEntry *)work->data;
+               FilterEntry *fe = static_cast<FilterEntry *>(work->data);
                work = work->next;
 
                if (strcmp(fe->key, key) == 0) return fe;
@@ -139,7 +139,7 @@ static void filter_add_if_missing(const gchar *key, const gchar *description, co
        work = filter_list;
        while (work)
                {
-               FilterEntry *fe = (FilterEntry *)work->data;
+               FilterEntry *fe = static_cast<FilterEntry *>(work->data);
                work = work->next;
                if (fe->key && strcmp(fe->key, key) == 0)
                        {
@@ -165,7 +165,7 @@ void filter_reset(void)
        work = filter_list;
        while (work)
                {
-               FilterEntry *fe = (FilterEntry *)work->data;
+               FilterEntry *fe = static_cast<FilterEntry *>(work->data);
                work = work->next;
                filter_entry_free(fe);
                }
@@ -513,7 +513,7 @@ void filter_write_list(GString *outstr, gint indent)
        work = filter_list;
        while (work)
                {
-               FilterEntry *fe = (FilterEntry *)work->data;
+               FilterEntry *fe = static_cast<FilterEntry *>(work->data);
                work = work->next;
 
                WRITE_NL(); WRITE_STRING("<file_type ");
index 51460f6..df3f0cb 100644 (file)
@@ -71,7 +71,7 @@ static void clear_mouse_cursor(GtkWidget *widget, gint state)
 
 static gboolean fullscreen_hide_mouse_cb(gpointer data)
 {
-       FullScreenData *fs = (FullScreenData *)data;
+       FullScreenData *fs = static_cast<FullScreenData *>(data);
 
        if (!fs->hide_mouse_id) return FALSE;
 
@@ -100,7 +100,7 @@ static void fullscreen_hide_mouse_reset(FullScreenData *fs)
 
 static gboolean fullscreen_mouse_moved(GtkWidget *UNUSED(widget), GdkEventMotion *UNUSED(event), gpointer data)
 {
-       FullScreenData *fs = (FullScreenData *)data;
+       FullScreenData *fs = static_cast<FullScreenData *>(data);
 
        if (!(fs->cursor_state & FULLSCREEN_CURSOR_NORMAL))
                {
@@ -141,7 +141,7 @@ static void fullscreen_mouse_set_busy(FullScreenData *fs, gboolean busy)
 
 static gboolean fullscreen_mouse_set_busy_cb(gpointer data)
 {
-       FullScreenData *fs = (FullScreenData *)data;
+       FullScreenData *fs = static_cast<FullScreenData *>(data);
 
        fs->busy_mouse_id = 0;
        fullscreen_mouse_set_busy(fs, TRUE);
@@ -159,7 +159,7 @@ static void fullscreen_mouse_set_busy_idle(FullScreenData *fs)
 
 static void fullscreen_image_update_cb(ImageWindow *UNUSED(imd), gpointer data)
 {
-       FullScreenData *fs = (FullScreenData *)data;
+       FullScreenData *fs = static_cast<FullScreenData *>(data);
 
        if (fs->imd->il &&
            image_loader_get_pixbuf(fs->imd->il) != image_get_pixbuf(fs->imd))
@@ -170,7 +170,7 @@ static void fullscreen_image_update_cb(ImageWindow *UNUSED(imd), gpointer data)
 
 static void fullscreen_image_complete_cb(ImageWindow *UNUSED(imd), gboolean preload, gpointer data)
 {
-       FullScreenData *fs = (FullScreenData *)data;
+       FullScreenData *fs = static_cast<FullScreenData *>(data);
 
        if (!preload) fullscreen_mouse_set_busy(fs, FALSE);
 }
@@ -207,7 +207,7 @@ static gboolean fullscreen_saver_block_cb(gpointer UNUSED(data))
 
 static gboolean fullscreen_delete_cb(GtkWidget *UNUSED(widget), GdkEventAny *UNUSED(event), gpointer data)
 {
-       FullScreenData *fs = (FullScreenData *)data;
+       FullScreenData *fs = static_cast<FullScreenData *>(data);
 
        fullscreen_stop(fs);
        return TRUE;
@@ -461,7 +461,7 @@ void fullscreen_prefs_list_free(GList *list)
        work = list;
        while (work)
                {
-               ScreenData *sd = (ScreenData *)work->data;
+               ScreenData *sd = static_cast<ScreenData *>(work->data);
                work = work->next;
 
                g_free(sd->description);
@@ -478,7 +478,7 @@ ScreenData *fullscreen_prefs_list_find(GList *list, gint screen)
        work = list;
        while (work)
                {
-               ScreenData *sd = (ScreenData *)work->data;
+               ScreenData *sd = static_cast<ScreenData *>(work->data);
                work = work->next;
 
                if (sd->number == screen) return sd;
@@ -681,7 +681,7 @@ GtkWidget *fullscreen_prefs_selection_new(const gchar *text, gint *screen_value,
        work = list;
        while (work)
                {
-               ScreenData *sd = (ScreenData *)work->data;
+               ScreenData *sd = static_cast<ScreenData *>(work->data);
 
                fullscreen_prefs_selection_add(store, sd->description, sd->number);
                if (*screen_value == sd->number) current = n;
index 395527d..0250104 100644 (file)
@@ -204,7 +204,7 @@ const HistMap *histmap_get(FileData *fd)
 
 static gboolean histmap_idle_cb(gpointer data)
 {
-       FileData *fd = (FileData *)data;
+       FileData *fd = static_cast<FileData *>(data);
        if (histmap_read(fd->histmap, FALSE))
                {
                /* finished */
index d7c0fba..9772787 100644 (file)
@@ -356,7 +356,7 @@ static HistoryData *history_list_find_by_key(const gchar *key)
 
        while (work)
                {
-               HistoryData *hd = (HistoryData *)work->data;
+               HistoryData *hd = static_cast<HistoryData *>(work->data);
                if (strcmp(hd->key, key) == 0) return hd;
                work = work->next;
                }
index d1d1156..a5bd583 100644 (file)
@@ -280,7 +280,7 @@ struct _ImageLoaderAreaParam {
 
 static gboolean image_loader_emit_area_ready_cb(gpointer data)
 {
-       ImageLoaderAreaParam *par = (ImageLoaderAreaParam *)data;
+       ImageLoaderAreaParam *par = static_cast<ImageLoaderAreaParam *>(data);
        ImageLoader *il = par->il;
        guint x, y, w, h;
        g_mutex_lock(il->data_mutex);
@@ -299,21 +299,21 @@ static gboolean image_loader_emit_area_ready_cb(gpointer data)
 
 static gboolean image_loader_emit_done_cb(gpointer data)
 {
-       ImageLoader *il = (ImageLoader *)data;
+       ImageLoader *il = static_cast<ImageLoader *>(data);
        g_signal_emit(il, signals[SIGNAL_DONE], 0);
        return FALSE;
 }
 
 static gboolean image_loader_emit_error_cb(gpointer data)
 {
-       ImageLoader *il = (ImageLoader *)data;
+       ImageLoader *il = static_cast<ImageLoader *>(data);
        g_signal_emit(il, signals[SIGNAL_ERROR], 0);
        return FALSE;
 }
 
 static gboolean image_loader_emit_percent_cb(gpointer data)
 {
-       ImageLoader *il = (ImageLoader *)data;
+       ImageLoader *il = static_cast<ImageLoader *>(data);
        g_signal_emit(il, signals[SIGNAL_PERCENT], 0, image_loader_get_percent(il));
        return FALSE;
 }
@@ -321,7 +321,7 @@ static gboolean image_loader_emit_percent_cb(gpointer data)
 static gboolean image_loader_emit_size_cb(gpointer data)
 {
        gint width, height;
-       ImageLoader *il = (ImageLoader *)data;
+       ImageLoader *il = static_cast<ImageLoader *>(data);
        g_mutex_lock(il->data_mutex);
        width = il->actual_width;
        height = il->actual_height;
@@ -475,7 +475,7 @@ static void image_loader_area_updated_cb(gpointer UNUSED(loader),
                                 guint x, guint y, guint w, guint h,
                                 gpointer data)
 {
-       ImageLoader *il = (ImageLoader *)data;
+       ImageLoader *il = static_cast<ImageLoader *>(data);
 
        if (!image_loader_get_pixbuf(il))
                {
@@ -499,7 +499,7 @@ static void image_loader_area_updated_cb(gpointer UNUSED(loader),
 
 static void image_loader_area_prepared_cb(gpointer loader, gpointer data)
 {
-       ImageLoader *il = (ImageLoader *)data;
+       ImageLoader *il = static_cast<ImageLoader *>(data);
        GdkPixbuf *pb;
        guchar *pix;
        size_t h, rs;
@@ -531,7 +531,7 @@ static void image_loader_area_prepared_cb(gpointer loader, gpointer data)
 static void image_loader_size_cb(gpointer loader,
                                 gint width, gint height, gpointer data)
 {
-       ImageLoader *il = (ImageLoader *)data;
+       ImageLoader *il = static_cast<ImageLoader *>(data);
        gchar **mime_types;
        gboolean scale = FALSE;
        gint n;
@@ -1137,7 +1137,7 @@ void image_loader_delay_area_ready(ImageLoader *il, gboolean enable)
 
                while (work)
                        {
-                       ImageLoaderAreaParam *par = (ImageLoaderAreaParam *)work->data;
+                       ImageLoaderAreaParam *par = static_cast<ImageLoaderAreaParam *>(work->data);
                        work = work->next;
 
                        g_signal_emit(il, signals[SIGNAL_AREA_READY], 0, par->x, par->y, par->w, par->h);
@@ -1159,7 +1159,7 @@ void image_loader_delay_area_ready(ImageLoader *il, gboolean enable)
 static gboolean image_loader_idle_cb(gpointer data)
 {
        gboolean ret = FALSE;
-       ImageLoader *il = (ImageLoader *)data;
+       ImageLoader *il = static_cast<ImageLoader *>(data);
 
        if (il->idle_id)
                {
@@ -1230,7 +1230,7 @@ static void image_loader_thread_wait_high(void)
 
 static void image_loader_thread_run(gpointer data, gpointer UNUSED(user_data))
 {
-       ImageLoader *il = (ImageLoader *)data;
+       ImageLoader *il = static_cast<ImageLoader *>(data);
        gboolean cont;
        gboolean err;
 
index 97a8a14..019f92e 100644 (file)
@@ -611,7 +611,7 @@ static void image_osd_info_hide(OverlayStateData *osd)
 
 static gboolean image_osd_update_cb(gpointer data)
 {
-       OverlayStateData *osd = (OverlayStateData *)data;
+       OverlayStateData *osd = static_cast<OverlayStateData *>(data);
 
        if (osd->show & OSD_SHOW_INFO)
                {
@@ -699,7 +699,7 @@ void image_osd_update(ImageWindow *imd)
 
 static gboolean image_osd_timer_cb(gpointer data)
 {
-       OverlayStateData *osd = (OverlayStateData *)data;
+       OverlayStateData *osd = static_cast<OverlayStateData *>(data);
        gboolean done = TRUE;
        gboolean changed = FALSE;
        gint i;
@@ -742,7 +742,7 @@ static void image_osd_timer_schedule(OverlayStateData *osd)
 
 static void image_osd_state_cb(ImageWindow *UNUSED(imd), ImageState state, gpointer data)
 {
-       OverlayStateData *osd = (OverlayStateData *)data;
+       OverlayStateData *osd = static_cast<OverlayStateData *>(data);
 
        osd->changed_states |= state;
        image_osd_update_schedule(osd, FALSE);
@@ -750,7 +750,7 @@ static void image_osd_state_cb(ImageWindow *UNUSED(imd), ImageState state, gpoin
 
 static void image_osd_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-       OverlayStateData *osd = (OverlayStateData *)data;
+       OverlayStateData *osd = static_cast<OverlayStateData *>(data);
 
        if ((type & (NOTIFY_HISTMAP)) && osd->imd && fd == osd->imd->image_fd)
                {
@@ -788,7 +788,7 @@ static void image_osd_free(OverlayStateData *osd)
 
 static void image_osd_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       OverlayStateData *osd = (OverlayStateData *)data;
+       OverlayStateData *osd = static_cast<OverlayStateData *>(data);
 
        osd->imd = NULL;
        image_osd_free(osd);
index ce40cb4..ed7aaba 100644 (file)
@@ -59,7 +59,7 @@ static gint rect_id = 0;
 
 static void image_click_cb(PixbufRenderer *UNUSED(pr), GdkEventButton *event, gpointer data)
 {
-       ImageWindow *imd = (ImageWindow *)data;
+       ImageWindow *imd = static_cast<ImageWindow *>(data);
        if (!options->image_lm_click_nav && event->button == MOUSE_BUTTON_MIDDLE)
                {
                imd->mouse_wheel_mode = !imd->mouse_wheel_mode;
@@ -139,7 +139,7 @@ static void switch_coords_orientation(ImageWindow *imd, gint x, gint y, gint wid
 
 static void image_press_cb(PixbufRenderer *pr, GdkEventButton *event, gpointer data)
 {
-       ImageWindow *imd = (ImageWindow *)data;
+       ImageWindow *imd = static_cast<ImageWindow *>(data);
        LayoutWindow *lw;
        gint x_pixel, y_pixel;
 
@@ -185,7 +185,7 @@ static void image_press_cb(PixbufRenderer *pr, GdkEventButton *event, gpointer d
 
 static void image_drag_cb(PixbufRenderer *pr, GdkEventMotion *event, gpointer data)
 {
-       ImageWindow *imd = (ImageWindow *)data;
+       ImageWindow *imd = static_cast<ImageWindow *>(data);
        gint width, height;
        gint rect_width;
        gint rect_height;
@@ -254,7 +254,7 @@ static void image_drag_cb(PixbufRenderer *pr, GdkEventMotion *event, gpointer da
 
 static void image_scroll_notify_cb(PixbufRenderer *pr, gpointer data)
 {
-       ImageWindow *imd = (ImageWindow *)data;
+       ImageWindow *imd = static_cast<ImageWindow *>(data);
 
        if (imd->func_scroll_notify && pr->scale)
                {
@@ -288,7 +288,7 @@ static void image_complete_util(ImageWindow *imd, gboolean preload)
 
 static void image_render_complete_cb(PixbufRenderer *UNUSED(pr), gpointer data)
 {
-       ImageWindow *imd = (ImageWindow *)data;
+       ImageWindow *imd = static_cast<ImageWindow *>(data);
 
        image_complete_util(imd, FALSE);
 }
@@ -314,7 +314,7 @@ static void image_state_unset(ImageWindow *imd, ImageState state)
 
 static void image_zoom_cb(PixbufRenderer *UNUSED(pr), gdouble UNUSED(zoom), gpointer data)
 {
-       ImageWindow *imd = (ImageWindow *)data;
+       ImageWindow *imd = static_cast<ImageWindow *>(data);
 
        if (imd->title_show_zoom) image_update_title(imd);
        image_state_set(imd, IMAGE_STATE_IMAGE);
@@ -731,7 +731,7 @@ static void image_read_ahead_cancel(ImageWindow *imd)
 
 static void image_read_ahead_done_cb(ImageLoader *UNUSED(il), gpointer data)
 {
-       ImageWindow *imd = (ImageWindow *)data;
+       ImageWindow *imd = static_cast<ImageWindow *>(data);
 
        if (!imd->read_ahead_fd || !imd->read_ahead_il) return;
 
@@ -853,7 +853,7 @@ static void image_load_pixbuf_ready(ImageWindow *imd)
 
 static void image_load_area_cb(ImageLoader *il, guint x, guint y, guint w, guint h, gpointer data)
 {
-       ImageWindow *imd = (ImageWindow *)data;
+       ImageWindow *imd = static_cast<ImageWindow *>(data);
        PixbufRenderer *pr;
 
        pr = (PixbufRenderer *)imd->pr;
@@ -871,7 +871,7 @@ static void image_load_area_cb(ImageLoader *il, guint x, guint y, guint w, guint
 
 static void image_load_done_cb(ImageLoader *UNUSED(il), gpointer data)
 {
-       ImageWindow *imd = (ImageWindow *)data;
+       ImageWindow *imd = static_cast<ImageWindow *>(data);
 
        DEBUG_1("%s image done", get_exec_time());
 
@@ -934,7 +934,7 @@ static void image_load_done_cb(ImageLoader *UNUSED(il), gpointer data)
 
 static void image_load_size_cb(ImageLoader *UNUSED(il), guint width, guint height, gpointer data)
 {
-       ImageWindow *imd = (ImageWindow *)data;
+       ImageWindow *imd = static_cast<ImageWindow *>(data);
 
        DEBUG_1("image_load_size_cb: %dx%d", width, height);
        pixbuf_renderer_set_size_early((PixbufRenderer *)imd->pr, width, height);
@@ -1182,7 +1182,7 @@ static void image_change_real(ImageWindow *imd, FileData *fd,
 
 static gboolean image_focus_in_cb(GtkWidget *UNUSED(widget), GdkEventFocus *UNUSED(event), gpointer data)
 {
-       ImageWindow *imd = (ImageWindow *)data;
+       ImageWindow *imd = static_cast<ImageWindow *>(data);
 
        if (imd->func_focus_in)
                {
@@ -1194,7 +1194,7 @@ static gboolean image_focus_in_cb(GtkWidget *UNUSED(widget), GdkEventFocus *UNUS
 
 static gboolean image_scroll_cb(GtkWidget *UNUSED(widget), GdkEventScroll *event, gpointer data)
 {
-       ImageWindow *imd = (ImageWindow *)data;
+       ImageWindow *imd = static_cast<ImageWindow *>(data);
        gboolean in_lw = FALSE;
        gint i = 0;
        LayoutWindow *lw = NULL;
@@ -1850,7 +1850,7 @@ void image_prebuffer_set(ImageWindow *imd, FileData *fd)
 
 static void image_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-       ImageWindow *imd = (ImageWindow *)data;
+       ImageWindow *imd = static_cast<ImageWindow *>(data);
 
        if (!imd || !image_get_pixbuf(imd) ||
            /* imd->il || */ /* loading in progress - do not check - it should start from the beginning anyway */
@@ -2110,7 +2110,7 @@ static void image_free(ImageWindow *imd)
 
 static void image_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ImageWindow *imd = (ImageWindow *)data;
+       ImageWindow *imd = static_cast<ImageWindow *>(data);
        image_free(imd);
 }
 
index 098924a..7cb7b4b 100644 (file)
@@ -382,7 +382,7 @@ static void view_step_to_end(ViewWindow *vw, gboolean last)
 
 static gboolean view_window_key_press_cb(GtkWidget * (widget), GdkEventKey *event, gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
        ImageWindow *imd;
        gint stop_signal;
        GtkWidget *menu;
@@ -633,7 +633,7 @@ static gboolean view_window_key_press_cb(GtkWidget * (widget), GdkEventKey *even
  */
 static void button_cb(ImageWindow *imd, GdkEventButton *event, gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
        GtkWidget *menu;
        gchar *dest_dir;
        LayoutWindow *lw_new;
@@ -677,7 +677,7 @@ static void button_cb(ImageWindow *imd, GdkEventButton *event, gpointer data)
 
 static void scroll_cb(ImageWindow *imd, GdkEventScroll *event, gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
 
        if ((event->state & GDK_CONTROL_MASK) ||
                                (imd->mouse_wheel_mode && !options->image_lm_click_nav))
@@ -738,7 +738,7 @@ static void view_image_set_buttons(ViewWindow *vw, ImageWindow *imd)
 
 static void view_fullscreen_stop_func(FullScreenData *UNUSED(fs), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
 
        vw->fs = NULL;
 
@@ -795,7 +795,7 @@ static void view_slideshow_prev(ViewWindow *vw)
 
 static void view_slideshow_stop_func(SlideShowData *UNUSED(fs), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
        GList *work;
        FileData *fd;
 
@@ -852,7 +852,7 @@ static void view_slideshow_stop(ViewWindow *vw)
 
 static void view_window_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
 
        view_window_list = g_list_remove(view_window_list, vw);
 
@@ -875,7 +875,7 @@ static void view_window_close(ViewWindow *vw)
 
 static gboolean view_window_delete_cb(GtkWidget *UNUSED(w), GdkEventAny *UNUSED(event), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
 
        view_window_close(vw);
        return TRUE;
@@ -999,7 +999,7 @@ static ViewWindow *real_view_window_new(FileData *fd, GList *list, CollectionDat
 
 static void view_window_collection_unref_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CollectionData *cd = (CollectionData *)data;
+       CollectionData *cd = static_cast<CollectionData *>(data);
 
        collection_unref(cd);
 }
@@ -1071,7 +1071,7 @@ void view_window_colors_update(void)
        work = view_window_list;
        while (work)
                {
-               ViewWindow *vw = (ViewWindow *)work->data;
+               ViewWindow *vw = static_cast<ViewWindow *>(work->data);
                work = work->next;
 
                image_background_set_color_from_options(vw->imd, !!vw->fs);
@@ -1085,7 +1085,7 @@ gboolean view_window_find_image(ImageWindow *imd, gint *index, gint *total)
        work = view_window_list;
        while (work)
                {
-               ViewWindow *vw = (ViewWindow *)work->data;
+               ViewWindow *vw = static_cast<ViewWindow *>(work->data);
                work = work->next;
 
                if (vw->imd == imd ||
@@ -1122,7 +1122,7 @@ gboolean view_window_find_image(ImageWindow *imd, gint *index, gint *total)
 
 static void view_new_window_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
        CollectionData *cd;
        CollectInfo *info;
 
@@ -1170,35 +1170,35 @@ static void view_alter_cb(GtkWidget *widget, gpointer data)
 
 static void view_zoom_in_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
 
        image_zoom_adjust(view_window_active_image(vw), get_zoom_increment());
 }
 
 static void view_zoom_out_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
 
        image_zoom_adjust(view_window_active_image(vw), -get_zoom_increment());
 }
 
 static void view_zoom_1_1_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
 
        image_zoom_set(view_window_active_image(vw), 1.0);
 }
 
 static void view_zoom_fit_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
 
        image_zoom_set(view_window_active_image(vw), 0.0);
 }
 
 static void view_copy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
        ImageWindow *imd;
 
        imd = view_window_active_image(vw);
@@ -1207,7 +1207,7 @@ static void view_copy_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void view_move_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
        ImageWindow *imd;
 
        imd = view_window_active_image(vw);
@@ -1216,7 +1216,7 @@ static void view_move_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void view_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
        ImageWindow *imd;
 
        imd = view_window_active_image(vw);
@@ -1225,7 +1225,7 @@ static void view_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void view_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
        ImageWindow *imd;
 
        imd = view_window_active_image(vw);
@@ -1235,7 +1235,7 @@ static void view_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void view_move_to_trash_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
        ImageWindow *imd;
 
        imd = view_window_active_image(vw);
@@ -1245,7 +1245,7 @@ static void view_move_to_trash_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void view_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
        ImageWindow *imd;
 
        imd = view_window_active_image(vw);
@@ -1254,7 +1254,7 @@ static void view_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void view_copy_path_unquoted_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
        ImageWindow *imd;
 
        imd = view_window_active_image(vw);
@@ -1263,35 +1263,35 @@ static void view_copy_path_unquoted_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void view_fullscreen_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
 
        view_fullscreen_toggle(vw, FALSE);
 }
 
 static void view_slideshow_start_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
 
        view_slideshow_start(vw);
 }
 
 static void view_slideshow_stop_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
 
        view_slideshow_stop(vw);
 }
 
 static void view_slideshow_pause_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
 
        slideshow_pause_toggle(vw->ss);
 }
 
 static void view_close_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
 
        view_window_close(vw);
 }
@@ -1309,7 +1309,7 @@ static LayoutWindow *view_new_layout_with_fd(FileData *fd)
 
 static void view_set_layout_path_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
        LayoutWindow *lw;
        ImageWindow *imd;
 
@@ -1327,7 +1327,7 @@ static void view_set_layout_path_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void view_popup_menu_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       GList *editmenu_fd_list = (GList *)data;
+       GList *editmenu_fd_list = static_cast<GList *>(data);
 
        filelist_free(editmenu_fd_list);
 }
@@ -1487,7 +1487,7 @@ static void view_dir_list_do(ViewWindow *vw, GList *list, gboolean skip, gboolea
        work = list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                if (isdir(fd->path))
@@ -1539,25 +1539,25 @@ static void view_dir_list_do(ViewWindow *vw, GList *list, gboolean skip, gboolea
 
 static void view_dir_list_add(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CViewConfirmD *d = (CViewConfirmD *)data;
+       CViewConfirmD *d = static_cast<CViewConfirmD *>(data);
        view_dir_list_do(d->vw, d->list, FALSE, FALSE);
 }
 
 static void view_dir_list_recurse(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CViewConfirmD *d = (CViewConfirmD *)data;
+       CViewConfirmD *d = static_cast<CViewConfirmD *>(data);
        view_dir_list_do(d->vw, d->list, FALSE, TRUE);
 }
 
 static void view_dir_list_skip(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CViewConfirmD *d = (CViewConfirmD *)data;
+       CViewConfirmD *d = static_cast<CViewConfirmD *>(data);
        view_dir_list_do(d->vw, d->list, TRUE, FALSE);
 }
 
 static void view_dir_list_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
-       CViewConfirmD *d = (CViewConfirmD *)data;
+       CViewConfirmD *d = static_cast<CViewConfirmD *>(data);
        filelist_free(d->list);
        g_free(d);
 }
@@ -1597,7 +1597,7 @@ static void view_window_get_dnd_data(GtkWidget *UNUSED(widget), GdkDragContext *
                                     GtkSelectionData *selection_data, guint info,
                                     guint UNUSED(time), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
        ImageWindow *imd;
 
        if (gtk_drag_get_source_widget(context) == vw->imd->pr) return;
@@ -1619,7 +1619,7 @@ static void view_window_get_dnd_data(GtkWidget *UNUSED(widget), GdkDragContext *
                        work = list;
                        while (work)
                                {
-                               FileData *fd = (FileData *)work->data;
+                               FileData *fd = static_cast<FileData *>(work->data);
                                if (isdir(fd->path))
                                        {
                                        GtkWidget *menu;
@@ -1676,7 +1676,7 @@ static void view_window_set_dnd_data(GtkWidget *UNUSED(widget), GdkDragContext *
                                     GtkSelectionData *selection_data, guint UNUSED(info),
                                     guint UNUSED(time), gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
        FileData *fd;
 
        fd = image_get_fd(vw->imd);
@@ -1805,7 +1805,7 @@ static void view_real_removed(ViewWindow *vw, FileData *fd)
 
 static void view_window_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-       ViewWindow *vw = (ViewWindow *)data;
+       ViewWindow *vw = static_cast<ViewWindow *>(data);
 
        if (!(type & NOTIFY_CHANGE) || !fd->change) return;
 
index 27148df..2ab6d42 100644 (file)
@@ -202,7 +202,7 @@ static gint mpo_parse_Index_IFD_entry(const guchar *tiff, guint offset,
        guint data_offset;
        guint data_length;
 
-       MPOData *mpo = (MPOData *)data;
+       MPOData *mpo = static_cast<MPOData *>(data);
 
        tag = tiff_byte_get_int16(tiff + offset + TIFF_TIFD_OFFSET_TAG, bo);
        format = tiff_byte_get_int16(tiff + offset + TIFF_TIFD_OFFSET_FORMAT, bo);
@@ -272,7 +272,7 @@ static gint mpo_parse_Attributes_IFD_entry(const guchar *tiff, guint offset,
        guint count;
        guint data_val;
 
-       MPOEntry *mpe = (MPOEntry *)data;
+       MPOEntry *mpe = static_cast<MPOEntry *>(data);
 
        tag = tiff_byte_get_int16(tiff + offset + TIFF_TIFD_OFFSET_TAG, bo);
        format = tiff_byte_get_int16(tiff + offset + TIFF_TIFD_OFFSET_FORMAT, bo);
index 1f853b5..a7e4278 100644 (file)
@@ -66,7 +66,7 @@ static gchar *layout_titles[] = { N_("Tools"), N_("Files"), N_("Image") };
 
 static void layout_config_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutConfig * lc = (LayoutConfig *)data;
+       LayoutConfig * lc = static_cast<LayoutConfig *>(data);
 
        g_list_free(lc->style_widgets);
        g_free(lc);
index 4d4fcc7..fb3cd5d 100644 (file)
@@ -72,7 +72,7 @@ static void layout_image_animate_update_image(LayoutWindow *lw);
 
 static void layout_image_full_screen_stop_func(FullScreenData *fs, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        /* restore image window */
        if (lw->image == fs->imd)
@@ -164,7 +164,7 @@ static void layout_image_slideshow_prev(LayoutWindow *lw)
 
 static void layout_image_slideshow_stop_func(SlideShowData *UNUSED(ss), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        lw->slideshow = NULL;
        layout_status_update_info(lw, NULL);
@@ -381,7 +381,7 @@ static void layout_image_animate_update_image(LayoutWindow *lw)
 static void animation_async_ready_cb(GObject *UNUSED(source_object), GAsyncResult *res, gpointer data)
 {
        GError *error = NULL;
-       AnimationData *animation = (AnimationData *)data;
+       AnimationData *animation = static_cast<AnimationData *>(data);
 
        if (animation)
                {
@@ -481,27 +481,27 @@ void layout_image_animate_toggle(LayoutWindow *lw)
 
 static void li_pop_menu_zoom_in_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_adjust(lw, get_zoom_increment(), FALSE);
 }
 
 static void li_pop_menu_zoom_out_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        layout_image_zoom_adjust(lw, -get_zoom_increment(), FALSE);
 }
 
 static void li_pop_menu_zoom_1_1_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set(lw, 1.0, FALSE);
 }
 
 static void li_pop_menu_zoom_fit_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set(lw, 0.0, FALSE);
 }
@@ -522,7 +522,7 @@ static void li_pop_menu_edit_cb(GtkWidget *widget, gpointer data)
 
 static void li_pop_menu_alter_cb(GtkWidget *widget, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        AlterType type;
 
        lw = submenu_item_get_data(widget);
@@ -533,7 +533,7 @@ static void li_pop_menu_alter_cb(GtkWidget *widget, gpointer data)
 
 static void li_pop_menu_new_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        view_window_new(layout_image_get_fd(lw));
 }
@@ -558,7 +558,7 @@ static GtkWidget *li_pop_menu_click_parent(GtkWidget *widget, LayoutWindow *lw)
 
 static void li_pop_menu_copy_cb(GtkWidget *widget, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        file_util_copy(layout_image_get_fd(lw), NULL, NULL,
                       li_pop_menu_click_parent(widget, lw));
@@ -566,21 +566,21 @@ static void li_pop_menu_copy_cb(GtkWidget *widget, gpointer data)
 
 static void li_pop_menu_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        file_util_copy_path_to_clipboard(layout_image_get_fd(lw), TRUE);
 }
 
 static void li_pop_menu_copy_path_unquoted_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        file_util_copy_path_to_clipboard(layout_image_get_fd(lw), FALSE);
 }
 
 static void li_pop_menu_copy_image_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        ImageWindow *imd = lw->image;
 
        GdkPixbuf *pixbuf;
@@ -591,7 +591,7 @@ static void li_pop_menu_copy_image_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void li_pop_menu_move_cb(GtkWidget *widget, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        file_util_move(layout_image_get_fd(lw), NULL, NULL,
                       li_pop_menu_click_parent(widget, lw));
@@ -599,7 +599,7 @@ static void li_pop_menu_move_cb(GtkWidget *widget, gpointer data)
 
 static void li_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        file_util_rename(layout_image_get_fd(lw), NULL,
                         li_pop_menu_click_parent(widget, lw));
@@ -607,7 +607,7 @@ static void li_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
 
 static void li_pop_menu_delete_cb(GtkWidget *widget, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        options->file_ops.safe_delete_enable = FALSE;
        file_util_delete(layout_image_get_fd(lw), NULL,
@@ -616,7 +616,7 @@ static void li_pop_menu_delete_cb(GtkWidget *widget, gpointer data)
 
 static void li_pop_menu_move_to_trash_cb(GtkWidget *widget, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        options->file_ops.safe_delete_enable = TRUE;
        file_util_delete(layout_image_get_fd(lw), NULL,
@@ -625,49 +625,49 @@ static void li_pop_menu_move_to_trash_cb(GtkWidget *widget, gpointer data)
 
 static void li_pop_menu_slide_start_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_slideshow_start(lw);
 }
 
 static void li_pop_menu_slide_stop_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_slideshow_stop(lw);
 }
 
 static void li_pop_menu_slide_pause_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_slideshow_pause_toggle(lw);
 }
 
 static void li_pop_menu_full_screen_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_full_screen_toggle(lw);
 }
 
 static void li_pop_menu_animate_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_animate_toggle(lw);
 }
 
 static void li_pop_menu_hide_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_tools_hide_toggle(lw);
 }
 
 static void li_set_layout_path_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        FileData *fd;
 
        if (!layout_valid(&lw)) return;
@@ -678,7 +678,7 @@ static void li_set_layout_path_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void li_open_archive_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        LayoutWindow *lw_new;
        gchar *dest_dir;
 
@@ -712,7 +712,7 @@ static gboolean li_check_if_current_path(LayoutWindow *lw, const gchar *path)
 
 static void layout_image_popup_menu_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       GList *editmenu_fd_list = (GList *)data;
+       GList *editmenu_fd_list = static_cast<GList *>(data);
 
        filelist_free(editmenu_fd_list);
 }
@@ -891,7 +891,7 @@ static void layout_image_dnd_receive(GtkWidget *widget, GdkDragContext *UNUSED(c
                                     GtkSelectionData *selection_data, guint info,
                                     guint UNUSED(time), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint i;
        gchar *url;
 
@@ -979,7 +979,7 @@ static void layout_image_dnd_get(GtkWidget *widget, GdkDragContext *UNUSED(conte
                                 GtkSelectionData *selection_data, guint UNUSED(info),
                                 guint UNUSED(time), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        FileData *fd;
        gint i;
 
@@ -1014,7 +1014,7 @@ static void layout_image_dnd_get(GtkWidget *widget, GdkDragContext *UNUSED(conte
 
 static void layout_image_dnd_end(GtkWidget *UNUSED(widget), GdkDragContext *context, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        if (gdk_drag_context_get_selected_action(context) == GDK_ACTION_MOVE)
                {
                FileData *fd;
@@ -1851,7 +1851,7 @@ static gint image_idx(LayoutWindow *lw, ImageWindow *imd)
 
 static void layout_image_focus_in_cb(ImageWindow *imd, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        gint i = image_idx(lw, imd);
 
@@ -1865,7 +1865,7 @@ static void layout_image_focus_in_cb(ImageWindow *imd, gpointer data)
 
 static void layout_image_button_cb(ImageWindow *imd, GdkEventButton *event, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        GtkWidget *menu;
        LayoutWindow *lw_new;
        gchar *dest_dir;
@@ -1913,7 +1913,7 @@ static void layout_image_button_cb(ImageWindow *imd, GdkEventButton *event, gpoi
 
 static void layout_image_scroll_cb(ImageWindow *imd, GdkEventScroll *event, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        gint i = image_idx(lw, imd);
 
@@ -1978,7 +1978,7 @@ static void layout_image_scroll_cb(ImageWindow *imd, GdkEventScroll *event, gpoi
 static void layout_image_drag_cb(ImageWindow *imd, GdkEventMotion *event, gdouble dx, gdouble dy, gpointer data)
 {
        gint i;
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gdouble sx, sy;
 
        if (lw->full_screen && lw->image != lw->full_screen->imd &&
@@ -2021,7 +2021,7 @@ static void layout_image_drag_cb(ImageWindow *imd, GdkEventMotion *event, gdoubl
 
 static void layout_image_button_inactive_cb(ImageWindow *imd, GdkEventButton *event, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        GtkWidget *menu;
        gint i = image_idx(lw, imd);
 
@@ -2048,7 +2048,7 @@ static void layout_image_button_inactive_cb(ImageWindow *imd, GdkEventButton *ev
 
 static void layout_image_drag_inactive_cb(ImageWindow *imd, GdkEventMotion *event, gdouble dx, gdouble dy, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint i = image_idx(lw, imd);
 
        if (i != -1)
@@ -2088,7 +2088,7 @@ static gint num_length(gint num)
 
 void layout_status_update_pixel_cb(PixbufRenderer *pr, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint x_pixel, y_pixel;
        gint width, height;
        gchar *text;
@@ -2139,7 +2139,7 @@ void layout_status_update_pixel_cb(PixbufRenderer *pr, gpointer data)
 
 static void layout_image_update_cb(ImageWindow *UNUSED(imd), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        layout_status_update_image(lw);
 }
 
@@ -2254,7 +2254,7 @@ static void layout_image_setup_split_common(LayoutWindow *lw, gint n)
 
                                while (work && j < i)
                                        {
-                                       FileData *fd = (FileData *)work->data;
+                                       FileData *fd = static_cast<FileData *>(work->data);
                                        work = work->prev;
 
                                        if (!fd || !*fd->path || fd->parent ||
@@ -2455,7 +2455,7 @@ static void layout_image_maint_removed(LayoutWindow *lw, FileData *fd)
 
 void layout_image_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        if (!(type & NOTIFY_CHANGE) || !fd->change) return;
 
index af35e29..17c2fbf 100644 (file)
@@ -97,7 +97,7 @@ static gboolean layout_key_match(guint keyval)
 
 gboolean layout_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        GtkWidget *focused;
        gboolean stop_signal = FALSE;
        gint x = 0;
@@ -251,7 +251,7 @@ static void layout_menu_clear_marks_cb(GtkAction *UNUSED(action), gpointer UNUSE
 
 static void layout_menu_new_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        collection_window_new(NULL);
@@ -259,7 +259,7 @@ static void layout_menu_new_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_open_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        collection_dialog_load(NULL);
@@ -267,7 +267,7 @@ static void layout_menu_open_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_search_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        search_new(lw->dir_fd, layout_image_get_fd(lw));
@@ -275,7 +275,7 @@ static void layout_menu_search_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_dupes_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        dupe_window_new();
@@ -283,7 +283,7 @@ static void layout_menu_dupes_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_pan_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        pan_window_new(lw->dir_fd);
@@ -291,56 +291,56 @@ static void layout_menu_pan_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_print_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        print_window_new(layout_image_get_fd(lw), layout_selection_list(lw), layout_list(lw), layout_window(lw));
 }
 
 static void layout_menu_dir_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        if (lw->vd) vd_new_folder(lw->vd, lw->dir_fd);
 }
 
 static void layout_menu_copy_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        file_util_copy(NULL, layout_selection_list(lw), NULL, layout_window(lw));
 }
 
 static void layout_menu_copy_path_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        file_util_copy_path_list_to_clipboard(layout_selection_list(lw), TRUE);
 }
 
 static void layout_menu_copy_path_unquoted_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        file_util_copy_path_list_to_clipboard(layout_selection_list(lw), FALSE);
 }
 
 static void layout_menu_move_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        file_util_move(NULL, layout_selection_list(lw), NULL, layout_window(lw));
 }
 
 static void layout_menu_rename_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        file_util_rename(NULL, layout_selection_list(lw), layout_window(lw));
 }
 
 static void layout_menu_delete_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        options->file_ops.safe_delete_enable = FALSE;
        file_util_delete(NULL, layout_selection_list(lw), layout_window(lw));
@@ -348,7 +348,7 @@ static void layout_menu_delete_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_move_to_trash_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        options->file_ops.safe_delete_enable = TRUE;
        file_util_delete(NULL, layout_selection_list(lw), layout_window(lw));
@@ -356,7 +356,7 @@ static void layout_menu_move_to_trash_cb(GtkAction *UNUSED(action), gpointer dat
 
 static void layout_menu_move_to_trash_key_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        if (options->file_ops.enable_delete_key)
                {
@@ -367,21 +367,21 @@ static void layout_menu_move_to_trash_key_cb(GtkAction *UNUSED(action), gpointer
 
 static void layout_menu_disable_grouping_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        file_data_disable_grouping_list(layout_selection_list(lw), TRUE);
 }
 
 static void layout_menu_enable_grouping_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        file_data_disable_grouping_list(layout_selection_list(lw), FALSE);
 }
 
 void layout_menu_close_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        layout_close(lw);
@@ -394,98 +394,98 @@ static void layout_menu_exit_cb(GtkAction *UNUSED(action), gpointer UNUSED(data)
 
 static void layout_menu_alter_90_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_alter_orientation(lw, ALTER_ROTATE_90);
 }
 
 static void layout_menu_rating_0_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_rating(lw, "0");
 }
 
 static void layout_menu_rating_1_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_rating(lw, "1");
 }
 
 static void layout_menu_rating_2_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_rating(lw, "2");
 }
 
 static void layout_menu_rating_3_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_rating(lw, "3");
 }
 
 static void layout_menu_rating_4_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_rating(lw, "4");
 }
 
 static void layout_menu_rating_5_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_rating(lw, "5");
 }
 
 static void layout_menu_rating_m1_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_rating(lw, "-1");
 }
 
 static void layout_menu_alter_90cc_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_alter_orientation(lw, ALTER_ROTATE_90_CC);
 }
 
 static void layout_menu_alter_180_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_alter_orientation(lw, ALTER_ROTATE_180);
 }
 
 static void layout_menu_alter_mirror_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_alter_orientation(lw, ALTER_MIRROR);
 }
 
 static void layout_menu_alter_flip_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_alter_orientation(lw, ALTER_FLIP);
 }
 
 static void layout_menu_alter_desaturate_cb(GtkToggleAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_set_desaturate(lw, gtk_toggle_action_get_active(action));
 }
 
 static void layout_menu_alter_ignore_alpha_cb(GtkToggleAction *action, gpointer data)
 {
-   LayoutWindow *lw = (LayoutWindow *)data;
+   LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        if (lw->options.ignore_alpha == gtk_toggle_action_get_active(action)) return;
 
@@ -494,14 +494,14 @@ static void layout_menu_alter_ignore_alpha_cb(GtkToggleAction *action, gpointer
 
 static void layout_menu_alter_none_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_alter_orientation(lw, ALTER_NONE);
 }
 
 static void layout_menu_exif_rotate_cb(GtkToggleAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        options->image.exif_rotate_enable = gtk_toggle_action_get_active(action);
        layout_image_reset_orientation(lw);
@@ -514,21 +514,21 @@ static void layout_menu_select_rectangle_cb(GtkToggleAction *action, gpointer UN
 
 static void layout_menu_split_pane_sync_cb(GtkToggleAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        lw->options.split_pane_sync = gtk_toggle_action_get_active(action);
 }
 
 static void layout_menu_select_overunderexposed_cb(GtkToggleAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_set_overunderexposed(lw, gtk_toggle_action_get_active(action));
 }
 
 static void layout_menu_write_rotate(GtkToggleAction *UNUSED(action), gpointer data, gboolean keep_date)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        GtkTreeModel *store;
        GList *work;
        GtkTreeSelection *selection;
@@ -629,7 +629,7 @@ static void layout_menu_write_rotate_cb(GtkToggleAction *action, gpointer data)
 
 static void layout_menu_config_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        show_config_window(lw);
@@ -637,7 +637,7 @@ static void layout_menu_config_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_editors_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        show_editor_list_window();
@@ -645,7 +645,7 @@ static void layout_menu_editors_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_layout_config_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        layout_show_config_window(lw);
@@ -653,7 +653,7 @@ static void layout_menu_layout_config_cb(GtkAction *UNUSED(action), gpointer dat
 
 static void layout_menu_remove_thumb_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        cache_manager_show();
@@ -661,7 +661,7 @@ static void layout_menu_remove_thumb_cb(GtkAction *UNUSED(action), gpointer data
 
 static void layout_menu_wallpaper_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_to_root(lw);
 }
@@ -669,83 +669,83 @@ static void layout_menu_wallpaper_cb(GtkAction *UNUSED(action), gpointer data)
 /* single window zoom */
 static void layout_menu_zoom_in_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_adjust(lw, get_zoom_increment(), FALSE);
 }
 
 static void layout_menu_zoom_out_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_adjust(lw, -get_zoom_increment(), FALSE);
 }
 
 static void layout_menu_zoom_1_1_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set(lw, 1.0, FALSE);
 }
 
 static void layout_menu_zoom_fit_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set(lw, 0.0, FALSE);
 }
 
 static void layout_menu_zoom_fit_hor_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set_fill_geometry(lw, FALSE, FALSE);
 }
 
 static void layout_menu_zoom_fit_vert_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set_fill_geometry(lw, TRUE, FALSE);
 }
 
 static void layout_menu_zoom_2_1_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set(lw, 2.0, FALSE);
 }
 
 static void layout_menu_zoom_3_1_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set(lw, 3.0, FALSE);
 }
 static void layout_menu_zoom_4_1_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set(lw, 4.0, FALSE);
 }
 
 static void layout_menu_zoom_1_2_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set(lw, -2.0, FALSE);
 }
 
 static void layout_menu_zoom_1_3_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set(lw, -3.0, FALSE);
 }
 
 static void layout_menu_zoom_1_4_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set(lw, -4.0, FALSE);
 }
@@ -753,83 +753,83 @@ static void layout_menu_zoom_1_4_cb(GtkAction *UNUSED(action), gpointer data)
 /* connected zoom */
 static void layout_menu_connect_zoom_in_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_adjust(lw, get_zoom_increment(), TRUE);
 }
 
 static void layout_menu_connect_zoom_out_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_adjust(lw, -get_zoom_increment(), TRUE);
 }
 
 static void layout_menu_connect_zoom_1_1_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set(lw, 1.0, TRUE);
 }
 
 static void layout_menu_connect_zoom_fit_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set(lw, 0.0, TRUE);
 }
 
 static void layout_menu_connect_zoom_fit_hor_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set_fill_geometry(lw, FALSE, TRUE);
 }
 
 static void layout_menu_connect_zoom_fit_vert_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set_fill_geometry(lw, TRUE, TRUE);
 }
 
 static void layout_menu_connect_zoom_2_1_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set(lw, 2.0, TRUE);
 }
 
 static void layout_menu_connect_zoom_3_1_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set(lw, 3.0, TRUE);
 }
 static void layout_menu_connect_zoom_4_1_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set(lw, 4.0, TRUE);
 }
 
 static void layout_menu_connect_zoom_1_2_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set(lw, -2.0, TRUE);
 }
 
 static void layout_menu_connect_zoom_1_3_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set(lw, -3.0, TRUE);
 }
 
 static void layout_menu_connect_zoom_1_4_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_zoom_set(lw, -4.0, TRUE);
 }
@@ -837,7 +837,7 @@ static void layout_menu_connect_zoom_1_4_cb(GtkAction *UNUSED(action), gpointer
 
 static void layout_menu_split_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(current), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        ImageSplitMode mode;
 
        layout_exit_fullscreen(lw);
@@ -848,7 +848,7 @@ static void layout_menu_split_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(
 
 static void layout_menu_thumb_cb(GtkToggleAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_thumb_set(lw, gtk_toggle_action_get_active(action));
 }
@@ -856,7 +856,7 @@ static void layout_menu_thumb_cb(GtkToggleAction *action, gpointer data)
 
 static void layout_menu_list_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(current), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        layout_views_set(lw, lw->options.dir_view_type, (FileViewType) gtk_radio_action_get_current_value(action));
@@ -864,7 +864,7 @@ static void layout_menu_list_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(c
 
 static void layout_menu_view_dir_as_cb(GtkToggleAction *action,  gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
 
@@ -880,7 +880,7 @@ static void layout_menu_view_dir_as_cb(GtkToggleAction *action,  gpointer data)
 
 static void layout_menu_view_in_new_window_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        view_window_new(layout_image_get_fd(lw));
@@ -888,7 +888,7 @@ static void layout_menu_view_in_new_window_cb(GtkAction *UNUSED(action), gpointe
 
 static void layout_menu_open_archive_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        LayoutWindow *lw_new;
        gchar *dest_dir;
        FileData *fd;
@@ -914,21 +914,21 @@ static void layout_menu_open_archive_cb(GtkAction *UNUSED(action), gpointer data
 
 static void layout_menu_fullscreen_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_full_screen_toggle(lw);
 }
 
 static void layout_menu_escape_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
 }
 
 static void layout_menu_overlay_toggle_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        image_osd_toggle(lw->image);
        layout_util_sync_views(lw);
@@ -937,7 +937,7 @@ static void layout_menu_overlay_toggle_cb(GtkAction *UNUSED(action), gpointer da
 
 static void layout_menu_overlay_cb(GtkToggleAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        if (gtk_toggle_action_get_active(action))
                {
@@ -957,7 +957,7 @@ static void layout_menu_overlay_cb(GtkToggleAction *action, gpointer data)
 
 static void layout_menu_histogram_cb(GtkToggleAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        if (gtk_toggle_action_get_active(action))
                {
@@ -974,7 +974,7 @@ static void layout_menu_histogram_cb(GtkToggleAction *action, gpointer data)
 
 static void layout_menu_animate_cb(GtkToggleAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        if (lw->options.animate == gtk_toggle_action_get_active(action)) return;
        layout_image_animate_toggle(lw);
@@ -987,7 +987,7 @@ static void layout_menu_rectangular_selection_cb(GtkToggleAction *action, gpoint
 
 static void layout_menu_histogram_toggle_channel_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        image_osd_histogram_toggle_channel(lw->image);
        layout_util_sync_views(lw);
@@ -995,7 +995,7 @@ static void layout_menu_histogram_toggle_channel_cb(GtkAction *UNUSED(action), g
 
 static void layout_menu_histogram_toggle_mode_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        image_osd_histogram_toggle_mode(lw->image);
        layout_util_sync_views(lw);
@@ -1003,7 +1003,7 @@ static void layout_menu_histogram_toggle_mode_cb(GtkAction *UNUSED(action), gpoi
 
 static void layout_menu_histogram_channel_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(current), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint channel = gtk_radio_action_get_current_value(action);
        GtkToggleAction *histogram_action = GTK_TOGGLE_ACTION(gtk_action_group_get_action(lw->action_group, "ImageHistogram"));
 
@@ -1015,7 +1015,7 @@ static void layout_menu_histogram_channel_cb(GtkRadioAction *action, GtkRadioAct
 
 static void layout_menu_histogram_mode_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(current), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint mode = gtk_radio_action_get_current_value(action);
        GtkToggleAction *histogram_action = GTK_TOGGLE_ACTION(gtk_action_group_get_action(lw->action_group, "ImageHistogram"));
 
@@ -1027,14 +1027,14 @@ static void layout_menu_histogram_mode_cb(GtkRadioAction *action, GtkRadioAction
 
 static void layout_menu_refresh_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_refresh(lw);
 }
 
 static void layout_menu_bar_exif_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        layout_exif_window_new(lw);
@@ -1042,7 +1042,7 @@ static void layout_menu_bar_exif_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_search_and_run_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        layout_search_and_run_window_new(lw);
@@ -1051,7 +1051,7 @@ static void layout_menu_search_and_run_cb(GtkAction *UNUSED(action), gpointer da
 
 static void layout_menu_float_cb(GtkToggleAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        if (lw->options.tools_float == gtk_toggle_action_get_active(action)) return;
 
@@ -1061,7 +1061,7 @@ static void layout_menu_float_cb(GtkToggleAction *action, gpointer data)
 
 static void layout_menu_hide_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        layout_tools_hide_toggle(lw);
@@ -1069,7 +1069,7 @@ static void layout_menu_hide_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_toolbar_cb(GtkToggleAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        if (lw->options.toolbar_hidden == gtk_toggle_action_get_active(action)) return;
 
@@ -1079,7 +1079,7 @@ static void layout_menu_toolbar_cb(GtkToggleAction *action, gpointer data)
 
 static void layout_menu_info_pixel_cb(GtkToggleAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        if (lw->options.show_info_pixel == gtk_toggle_action_get_active(action)) return;
 
@@ -1090,7 +1090,7 @@ static void layout_menu_info_pixel_cb(GtkToggleAction *action, gpointer data)
 /* NOTE: these callbacks are called also from layout_util_sync_views */
 static void layout_menu_bar_cb(GtkToggleAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        if (layout_bar_enabled(lw) == gtk_toggle_action_get_active(action)) return;
 
@@ -1100,7 +1100,7 @@ static void layout_menu_bar_cb(GtkToggleAction *action, gpointer data)
 
 static void layout_menu_bar_sort_cb(GtkToggleAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        if (layout_bar_sort_enabled(lw) == gtk_toggle_action_get_active(action)) return;
 
@@ -1110,7 +1110,7 @@ static void layout_menu_bar_sort_cb(GtkToggleAction *action, gpointer data)
 
 static void layout_menu_hide_bars_cb(GtkToggleAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        if (lw->options.bars_state.hidden == gtk_toggle_action_get_active(action))
                {
@@ -1121,7 +1121,7 @@ static void layout_menu_hide_bars_cb(GtkToggleAction *action, gpointer data)
 
 static void layout_menu_slideshow_cb(GtkToggleAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        if (layout_image_slideshow_active(lw) == gtk_toggle_action_get_active(action)) return;
        layout_image_slideshow_toggle(lw);
@@ -1129,7 +1129,7 @@ static void layout_menu_slideshow_cb(GtkToggleAction *action, gpointer data)
 
 static void layout_menu_slideshow_pause_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_image_slideshow_pause_toggle(lw);
 }
@@ -1151,7 +1151,7 @@ static void layout_menu_slideshow_faster_cb(GtkAction *UNUSED(action), gpointer
 
 static void layout_menu_stereo_mode_next_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint mode = layout_image_stereo_pixbuf_get(lw);
 
        /* 0->1, 1->2, 2->3, 3->1 - disable auto, then cycle */
@@ -1169,14 +1169,14 @@ static void layout_menu_stereo_mode_next_cb(GtkAction *UNUSED(action), gpointer
 
 static void layout_menu_stereo_mode_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(current), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint mode = gtk_radio_action_get_current_value(action);
        layout_image_stereo_pixbuf_set(lw, mode);
 }
 
 static void layout_menu_help_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        help_window_show("index.html");
@@ -1184,7 +1184,7 @@ static void layout_menu_help_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_help_search_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        help_search_window_show();
@@ -1192,7 +1192,7 @@ static void layout_menu_help_search_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_help_keys_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        help_window_show("GuideReferenceKeyboardShortcuts.html");
@@ -1200,7 +1200,7 @@ static void layout_menu_help_keys_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_notes_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        help_window_show("release_notes");
@@ -1208,7 +1208,7 @@ static void layout_menu_notes_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_changelog_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        help_window_show("changelog");
@@ -1255,7 +1255,7 @@ static void layout_menu_foreach_func(
        gchar *key_name, *menu_name;
        gchar **subset_lt_arr, **subset_gt_arr;
        gchar *subset_lt, *converted_name;
-       GPtrArray *array = (GPtrArray *)data;
+       GPtrArray *array = static_cast<GPtrArray *>(data);
 
        path = g_strescape(accel_path, NULL);
        name = gtk_accelerator_name(accel_key, accel_mods);
@@ -1378,7 +1378,7 @@ static void layout_menu_kbd_map_cb(GtkAction *UNUSED(action), gpointer UNUSED(da
 
 static void layout_menu_about_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        show_about_window(lw);
@@ -1386,7 +1386,7 @@ static void layout_menu_about_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_log_window_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_exit_fullscreen(lw);
        log_window_new(lw);
@@ -1401,35 +1401,35 @@ static void layout_menu_log_window_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_select_all_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_select_all(lw);
 }
 
 static void layout_menu_unselect_all_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_select_none(lw);
 }
 
 static void layout_menu_invert_selection_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_select_invert(lw);
 }
 
 static void layout_menu_file_filter_cb(GtkToggleAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_file_filter_set(lw, gtk_toggle_action_get_active(action));
 }
 
 static void layout_menu_marks_cb(GtkToggleAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_marks_set(lw, gtk_toggle_action_get_active(action));
 }
@@ -1437,7 +1437,7 @@ static void layout_menu_marks_cb(GtkToggleAction *action, gpointer data)
 
 static void layout_menu_set_mark_sel_cb(GtkAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num"));
        g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE);
 
@@ -1446,7 +1446,7 @@ static void layout_menu_set_mark_sel_cb(GtkAction *action, gpointer data)
 
 static void layout_menu_res_mark_sel_cb(GtkAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num"));
        g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE);
 
@@ -1455,7 +1455,7 @@ static void layout_menu_res_mark_sel_cb(GtkAction *action, gpointer data)
 
 static void layout_menu_toggle_mark_sel_cb(GtkAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num"));
        g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE);
 
@@ -1464,7 +1464,7 @@ static void layout_menu_toggle_mark_sel_cb(GtkAction *action, gpointer data)
 
 static void layout_menu_sel_mark_cb(GtkAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num"));
        g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE);
 
@@ -1473,7 +1473,7 @@ static void layout_menu_sel_mark_cb(GtkAction *action, gpointer data)
 
 static void layout_menu_sel_mark_or_cb(GtkAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num"));
        g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE);
 
@@ -1482,7 +1482,7 @@ static void layout_menu_sel_mark_or_cb(GtkAction *action, gpointer data)
 
 static void layout_menu_sel_mark_and_cb(GtkAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num"));
        g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE);
 
@@ -1491,7 +1491,7 @@ static void layout_menu_sel_mark_and_cb(GtkAction *action, gpointer data)
 
 static void layout_menu_sel_mark_minus_cb(GtkAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num"));
        g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE);
 
@@ -1500,7 +1500,7 @@ static void layout_menu_sel_mark_minus_cb(GtkAction *action, gpointer data)
 
 static void layout_menu_mark_filter_toggle_cb(GtkAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint mark = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "mark_num"));
        g_assert(mark >= 1 && mark <= FILEDATA_MARKS_SIZE);
 
@@ -1517,13 +1517,13 @@ static void layout_menu_mark_filter_toggle_cb(GtkAction *action, gpointer data)
 
 static void layout_menu_image_first_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        layout_image_first(lw);
 }
 
 static void layout_menu_image_prev_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint i;
 
        if (lw->options.split_pane_sync)
@@ -1549,7 +1549,7 @@ static void layout_menu_image_prev_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_image_next_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint i;
 
        if (lw->options.split_pane_sync)
@@ -1575,7 +1575,7 @@ static void layout_menu_image_next_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_page_first_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        FileData *fd = layout_image_get_fd(lw);
 
        if (fd->page_total > 0)
@@ -1586,7 +1586,7 @@ static void layout_menu_page_first_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_page_last_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        FileData *fd = layout_image_get_fd(lw);
 
        if (fd->page_total > 0)
@@ -1597,7 +1597,7 @@ static void layout_menu_page_last_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_page_next_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        FileData *fd = layout_image_get_fd(lw);
 
        if (fd->page_total > 0)
@@ -1608,7 +1608,7 @@ static void layout_menu_page_next_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_page_previous_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        FileData *fd = layout_image_get_fd(lw);
 
        if (fd->page_total > 0)
@@ -1619,7 +1619,7 @@ static void layout_menu_page_previous_cb(GtkAction *UNUSED(action), gpointer dat
 
 static void layout_menu_image_forward_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        /* Obtain next image */
        layout_set_path(lw, image_chain_forward());
@@ -1627,7 +1627,7 @@ static void layout_menu_image_forward_cb(GtkAction *UNUSED(action), gpointer dat
 
 static void layout_menu_image_back_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        /* Obtain previous image */
        layout_set_path(lw, image_chain_back());
@@ -1635,7 +1635,7 @@ static void layout_menu_image_back_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_split_pane_next_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint active_frame;
 
        active_frame = lw->active_split_image;
@@ -1653,7 +1653,7 @@ static void layout_menu_split_pane_next_cb(GtkAction *UNUSED(action), gpointer d
 
 static void layout_menu_split_pane_prev_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint active_frame;
 
        active_frame = lw->active_split_image;
@@ -1675,7 +1675,7 @@ static void layout_menu_split_pane_prev_cb(GtkAction *UNUSED(action), gpointer d
 
 static void layout_menu_split_pane_updown_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint active_frame;
 
        active_frame = lw->active_split_image;
@@ -1693,13 +1693,13 @@ static void layout_menu_split_pane_updown_cb(GtkAction *UNUSED(action), gpointer
 
 static void layout_menu_image_last_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        layout_image_last(lw);
 }
 
 static void layout_menu_back_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        FileData *dir_fd;
 
        /* Obtain previous path */
@@ -1710,7 +1710,7 @@ static void layout_menu_back_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_forward_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        FileData *dir_fd;
 
        /* Obtain next path */
@@ -1721,7 +1721,7 @@ static void layout_menu_forward_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_home_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        const gchar *path;
 
        if (lw->options.home_path && *lw->options.home_path)
@@ -1739,7 +1739,7 @@ static void layout_menu_home_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_up_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        ViewDir *vd = lw->vd;
        gchar *path;
 
@@ -1765,7 +1765,7 @@ static void layout_menu_up_cb(GtkAction *UNUSED(action), gpointer data)
 
 static void layout_menu_edit_cb(GtkAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        const gchar *key = gtk_action_get_name(action);
 
        if (!editor_window_flag_set(key))
@@ -1783,7 +1783,7 @@ static void layout_menu_metadata_write_cb(GtkAction *UNUSED(action), gpointer UN
 static GtkWidget *last_focussed = NULL;
 static void layout_menu_keyword_autocomplete_cb(GtkAction *UNUSED(action), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        GtkWidget *tmp;
        gboolean auto_has_focus;
 
@@ -1808,7 +1808,7 @@ static void layout_menu_keyword_autocomplete_cb(GtkAction *UNUSED(action), gpoin
 #ifdef HAVE_LCMS
 static void layout_color_menu_enable_cb(GtkToggleAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        if (layout_image_color_profile_get_use(lw) == gtk_toggle_action_get_active(action)) return;
 
@@ -1825,7 +1825,7 @@ static void layout_color_menu_enable_cb()
 #ifdef HAVE_LCMS
 static void layout_color_menu_use_image_cb(GtkToggleAction *action, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint input;
        gboolean use_image;
 
@@ -1844,7 +1844,7 @@ static void layout_color_menu_use_image_cb()
 #ifdef HAVE_LCMS
 static void layout_color_menu_input_cb(GtkRadioAction *action, GtkRadioAction *UNUSED(current), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint type;
        gint input;
        gboolean use_image;
@@ -1943,7 +1943,7 @@ void layout_recent_update_all(void)
        work = layout_window_list;
        while (work)
                {
-               LayoutWindow *lw = (LayoutWindow *)work->data;
+               LayoutWindow *lw = static_cast<LayoutWindow *>(work->data);
                work = work->next;
 
                layout_menu_recent_update(lw);
@@ -2123,7 +2123,7 @@ static void layout_menu_new_window_update(LayoutWindow *lw)
 
 static void window_rename_cancel_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       RenameWindow *rw = (RenameWindow *)data;
+       RenameWindow *rw = static_cast<RenameWindow *>(data);
 
        generic_dialog_close(rw->gd);
        g_free(rw);
@@ -2131,7 +2131,7 @@ static void window_rename_cancel_cb(GenericDialog *UNUSED(gd), gpointer data)
 
 static void window_rename_ok(GenericDialog *UNUSED(gd), gpointer data)
 {
-       RenameWindow *rw = (RenameWindow *)data;
+       RenameWindow *rw = static_cast<RenameWindow *>(data);
        gchar *path;
        gboolean window_layout_name_exists = FALSE;
        GList *list = NULL;
@@ -2184,28 +2184,28 @@ static void window_rename_ok(GenericDialog *UNUSED(gd), gpointer data)
 
 static void window_rename_ok_cb(GenericDialog *gd, gpointer data)
 {
-       RenameWindow *rw = (RenameWindow *)data;
+       RenameWindow *rw = static_cast<RenameWindow *>(data);
 
        window_rename_ok(gd, rw);
 }
 
 static void window_rename_entry_activate_cb(GenericDialog *gd, gpointer data)
 {
-       RenameWindow *rw = (RenameWindow *)data;
+       RenameWindow *rw = static_cast<RenameWindow *>(data);
 
        window_rename_ok(gd, rw);
 }
 
 static void window_delete_cancel_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       DeleteWindow *dw = (DeleteWindow *)data;
+       DeleteWindow *dw = static_cast<DeleteWindow *>(data);
 
        g_free(dw);
 }
 
 static void window_delete_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       DeleteWindow *dw = (DeleteWindow *)data;
+       DeleteWindow *dw = static_cast<DeleteWindow *>(data);
        gchar *path;
        gchar *xml_name;
 
@@ -2230,7 +2230,7 @@ static void layout_menu_window_default_cb(GtkWidget *UNUSED(widget), gpointer UN
 
 static void layout_menu_windows_menu_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        GtkWidget *menu;
        GtkWidget *sub_menu;
        gchar *menu_label;
@@ -2260,7 +2260,7 @@ static void layout_menu_windows_menu_cb(GtkWidget *UNUSED(widget), gpointer data
 
 static void layout_menu_view_menu_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        GtkWidget *menu;
        GtkWidget *sub_menu;
        gchar *menu_label;
@@ -2347,7 +2347,7 @@ static void change_window_id(const gchar *infile, const gchar *outfile)
 
 static void layout_menu_window_from_current_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gint fd_in = -1;
        gint fd_out = -1;
        char * tmp_file_in;
@@ -2383,14 +2383,14 @@ static void layout_menu_window_from_current_cb(GtkWidget *UNUSED(widget), gpoint
 
 static void layout_menu_window_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_menu_new_window_update(lw);
 }
 
 static void layout_menu_window_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        RenameWindow *rw;
        GtkWidget *hbox;
 
@@ -2421,7 +2421,7 @@ static void layout_menu_window_rename_cb(GtkWidget *UNUSED(widget), gpointer dat
 
 static void layout_menu_window_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        DeleteWindow *dw;
        GtkWidget *hbox;
 
@@ -3181,7 +3181,7 @@ static void layout_actions_setup_editors(LayoutWindow *lw)
        while (work)
                {
                GList *path;
-               EditorDescription *editor = (EditorDescription *)work->data;
+               EditorDescription *editor = static_cast<EditorDescription *>(work->data);
                GtkActionEntry entry = { editor->key,
                                         NULL,
                                         editor->name,
@@ -3320,7 +3320,7 @@ static gboolean layout_editors_reload_idle_cb(gpointer UNUSED(data))
                work = layout_window_list;
                while (work)
                        {
-                       LayoutWindow *lw = (LayoutWindow *)work->data;
+                       LayoutWindow *lw = static_cast<LayoutWindow *>(work->data);
                        work = work->next;
                        layout_actions_setup_editors(lw);
                        if (lw->bar_sort_enabled)
@@ -3656,7 +3656,7 @@ void layout_util_status_update_write_all(void)
        work = layout_window_list;
        while (work)
                {
-               LayoutWindow *lw = (LayoutWindow *)work->data;
+               LayoutWindow *lw = static_cast<LayoutWindow *>(work->data);
                work = work->next;
 
                layout_util_status_update_write(lw);
@@ -3929,7 +3929,7 @@ static gboolean layout_bar_enabled(LayoutWindow *lw)
 
 static void layout_bar_destroyed(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        lw->bar = NULL;
 /*
@@ -4024,7 +4024,7 @@ static gboolean layout_bar_sort_enabled(LayoutWindow *lw)
 
 static void layout_bar_sort_destroyed(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        lw->bar_sort = NULL;
 
@@ -4173,7 +4173,7 @@ void layout_bars_close(LayoutWindow *lw)
 
 static gboolean layout_exif_window_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        lw->exif_window = NULL;
 
        return TRUE;
index b4919b3..bfe4e5a 100644 (file)
@@ -95,7 +95,7 @@ LayoutWindow *layout_find_by_image(ImageWindow *imd)
        work = layout_window_list;
        while (work)
                {
-               LayoutWindow *lw = (LayoutWindow *)work->data;
+               LayoutWindow *lw = static_cast<LayoutWindow *>(work->data);
                work = work->next;
 
                if (lw->image == imd) return lw;
@@ -111,7 +111,7 @@ LayoutWindow *layout_find_by_image_fd(ImageWindow *imd)
        work = layout_window_list;
        while (work)
                {
-               LayoutWindow *lw = (LayoutWindow *)work->data;
+               LayoutWindow *lw = static_cast<LayoutWindow *>(work->data);
                work = work->next;
 
                if (lw->image->image_fd == imd->image_fd)
@@ -137,7 +137,7 @@ LayoutWindow *layout_find_by_layout_id(const gchar *id)
        work = layout_window_list;
        while (work)
                {
-               LayoutWindow *lw = (LayoutWindow *)work->data;
+               LayoutWindow *lw = static_cast<LayoutWindow *>(work->data);
                work = work->next;
 
                if (lw->options.id && strcmp(id, lw->options.id) == 0)
@@ -188,7 +188,7 @@ static void layout_set_unique_id(LayoutWindow *lw)
 
 static gboolean layout_set_current_cb(GtkWidget *UNUSED(widget), GdkEventFocus *UNUSED(event), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        current_lw = lw;
        return FALSE;
 }
@@ -216,7 +216,7 @@ static void layout_box_folders_changed_cb(GtkWidget *widget, gpointer UNUSED(dat
 
 static void layout_path_entry_changed_cb(GtkWidget *widget, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gchar *buf;
 
        if (gtk_combo_box_get_active(GTK_COMBO_BOX(widget)) < 0) return;
@@ -232,7 +232,7 @@ static void layout_path_entry_changed_cb(GtkWidget *widget, gpointer data)
 
 static void layout_path_entry_tab_cb(const gchar *path, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gchar *buf;
 
        buf = g_strdup(path);
@@ -266,7 +266,7 @@ static void layout_path_entry_tab_cb(const gchar *path, gpointer data)
 
 static void layout_path_entry_cb(const gchar *path, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gchar *buf;
 
        buf = g_strdup(path);
@@ -283,14 +283,14 @@ static void layout_path_entry_cb(const gchar *path, gpointer data)
 
 static void layout_vd_select_cb(ViewDir *UNUSED(vd), FileData *fd, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_set_fd(lw, fd);
 }
 
 static void layout_path_entry_tab_append_cb(const gchar *UNUSED(path), gpointer data, gint n)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        if (!lw || !lw->back_button) return;
        if (!layout_valid(&lw)) return;
@@ -422,7 +422,7 @@ static void layout_sort_menu_cb(GtkWidget *widget, gpointer data)
 
 static void layout_sort_menu_ascend_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_sort_set(lw, lw->sort_method, !lw->sort_ascend);
 }
@@ -435,7 +435,7 @@ static void layout_sort_menu_hide_cb(GtkWidget *widget, gpointer UNUSED(data))
 
 static void layout_sort_button_press_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        GtkWidget *menu;
 
        menu = submenu_add_sort(NULL, G_CALLBACK(layout_sort_menu_cb), lw, FALSE, FALSE, TRUE, lw->sort_method);
@@ -515,7 +515,7 @@ static void layout_zoom_menu_hide_cb(GtkWidget *widget, gpointer UNUSED(data))
 
 static void layout_zoom_button_press_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        GtkWidget *menu;
 
        menu = submenu_add_zoom(NULL, G_CALLBACK(layout_zoom_menu_cb),
@@ -916,14 +916,14 @@ static GtkWidget *layout_tools_new(LayoutWindow *lw)
 
 static void layout_list_status_cb(ViewFile *UNUSED(vf), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_status_update_info(lw, NULL);
 }
 
 static void layout_list_thumb_cb(ViewFile *UNUSED(vf), gdouble val, const gchar *text, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_status_update_progress(lw, val, text);
 }
@@ -1568,7 +1568,7 @@ static void layout_tools_hide(LayoutWindow *lw, gboolean hide)
 
 static gboolean layout_tools_delete_cb(GtkWidget *UNUSED(widget), GdkEventAny *UNUSED(event), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_tools_float_toggle(lw);
 
@@ -2014,7 +2014,7 @@ void layout_colors_update(void)
        while (work)
                {
                gint i;
-               LayoutWindow *lw = (LayoutWindow *)work->data;
+               LayoutWindow *lw = static_cast<LayoutWindow *>(work->data);
                work = work->next;
 
                if (!lw->image) continue;
@@ -2163,7 +2163,7 @@ static gint layout_config_delete_cb(GtkWidget *w, GdkEventAny *event, gpointer d
 
 static void layout_config_close_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutConfig *lc = (LayoutConfig *)data;
+       LayoutConfig *lc = static_cast<LayoutConfig *>(data);
 
        gtk_widget_destroy(lc->configwindow);
        free_layout_options_content(&lc->options);
@@ -2178,7 +2178,7 @@ static gint layout_config_delete_cb(GtkWidget *w, GdkEventAny *UNUSED(event), gp
 
 static void layout_config_apply_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutConfig *lc = (LayoutConfig *)data;
+       LayoutConfig *lc = static_cast<LayoutConfig *>(data);
 
        g_free(lc->options.order);
        lc->options.order = layout_config_get(lc->layout_widget, &lc->options.style);
@@ -2195,20 +2195,20 @@ static void layout_config_help_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(dat
 
 static void layout_config_ok_cb(GtkWidget *widget, gpointer data)
 {
-       LayoutConfig *lc = (LayoutConfig *)data;
+       LayoutConfig *lc = static_cast<LayoutConfig *>(data);
        layout_config_apply_cb(widget, lc);
        layout_config_close_cb(widget, lc);
 }
 
 static void home_path_set_current_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LayoutConfig *lc = (LayoutConfig *)data;
+       LayoutConfig *lc = static_cast<LayoutConfig *>(data);
        gtk_entry_set_text(GTK_ENTRY(lc->home_path_entry), layout_get_path(lc->lw));
 }
 
 static void startup_path_set_current_cb(GtkWidget *widget, gpointer data)
 {
-       LayoutConfig *lc = (LayoutConfig *)data;
+       LayoutConfig *lc = static_cast<LayoutConfig *>(data);
        if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
                {
                return;
@@ -2218,7 +2218,7 @@ static void startup_path_set_current_cb(GtkWidget *widget, gpointer data)
 
 static void startup_path_set_last_cb(GtkWidget *widget, gpointer data)
 {
-       LayoutConfig *lc = (LayoutConfig *)data;
+       LayoutConfig *lc = static_cast<LayoutConfig *>(data);
        if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
                {
                return;
@@ -2228,7 +2228,7 @@ static void startup_path_set_last_cb(GtkWidget *widget, gpointer data)
 
 static void startup_path_set_home_cb(GtkWidget *widget, gpointer data)
 {
-       LayoutConfig *lc = (LayoutConfig *)data;
+       LayoutConfig *lc = static_cast<LayoutConfig *>(data);
        if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
                {
                return;
@@ -2512,7 +2512,7 @@ void layout_free(LayoutWindow *lw)
 
 static gboolean layout_delete_cb(GtkWidget *UNUSED(widget), GdkEventAny *UNUSED(event), gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
 
        layout_close(lw);
        return TRUE;
@@ -2531,7 +2531,7 @@ gboolean release_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
 static gboolean move_window_to_workspace_cb(gpointer data)
 {
 #ifdef GDK_WINDOWING_X11
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        GdkWindow *window;
        GdkDisplay *display;
 
index e6dc120..c8be49a 100644 (file)
@@ -151,7 +151,7 @@ static void log_window_pause_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data)
 
 static void log_window_line_wrap_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       LogWindow *logwin = (LogWindow *)data;
+       LogWindow *logwin = static_cast<LogWindow *>(data);
 
        options->log_window.line_wrap = !options->log_window.line_wrap;
 
@@ -642,7 +642,7 @@ void log_window_append(const gchar *str, LogType type)
                        while (g_list_length(memory) >= (guint)options->log_window_lines)
                                {
                                GList *work = g_list_last(memory);
-                               LogMsg *oldest_msg = (LogMsg *)work->data;
+                               LogMsg *oldest_msg = static_cast<LogMsg *>(work->data);
 
                                g_free(oldest_msg->text);
                                memory = g_list_delete_link(memory, work);
@@ -672,7 +672,7 @@ void log_window_append(const gchar *str, LogType type)
        while (work)
                {
                GList *prev;
-               LogMsg *oldest_msg = (LogMsg *)work->data;
+               LogMsg *oldest_msg = static_cast<LogMsg *>(work->data);
 
                log_window_insert_text(buffer, &iter, oldest_msg->text,
                                                                        logwindow->color_tags[oldest_msg->type]);
index 0b17662..107a2e6 100644 (file)
@@ -294,7 +294,7 @@ static void parse_command_line_add_dir(const gchar *dir, gchar **UNUSED(path), g
                work = files;
                while (work)
                        {
-                       FileData *fd = (FileData *)work->data;
+                       FileData *fd = static_cast<FileData *>(work->data);
                        if (!*path) *path = remove_level_from_path(fd->path);
                        if (!*file) *file = g_strdup(fd->path);
                        *list = g_list_prepend(*list, fd);
@@ -895,7 +895,7 @@ static void gq_accel_map_print(
                    gboolean    changed)
 {
        GString *gstring = g_string_new(changed ? NULL : "; ");
-       SecureSaveInfo *ssi = (SecureSaveInfo *)data;
+       SecureSaveInfo *ssi = static_cast<SecureSaveInfo *>(data);
        gchar *tmp, *name;
 
        g_string_append(gstring, "(gtk_accel_path \"");
index d98fc7d..dc79c40 100644 (file)
@@ -76,7 +76,7 @@ static void add_edit_items(GtkWidget *menu, GCallback func, GList *fd_list)
 
        while (work)
                {
-               const EditorDescription *editor = (const EditorDescription *)work->data;
+               const EditorDescription *editor = static_cast<const EditorDescription *>(work->data);
                work = work->next;
                gboolean active = TRUE;
 
index 0caa544..7ea81c4 100644 (file)
@@ -91,7 +91,7 @@ static void metadata_cache_update(FileData *fd, const gchar *key, const GList *v
        work = fd->cached_metadata;
        while (work)
                {
-               GList *entry = (GList *)work->data;
+               GList *entry = static_cast<GList *>(work->data);
                gchar *entry_key = entry->data;
 
                if (strcmp(entry_key, key) == 0)
@@ -122,7 +122,7 @@ static const GList *metadata_cache_get(FileData *fd, const gchar *key)
        work = fd->cached_metadata;
        while (work)
                {
-               GList *entry = (GList *)work->data;
+               GList *entry = static_cast<GList *>(work->data);
                gchar *entry_key = entry->data;
 
                if (strcmp(entry_key, key) == 0)
@@ -144,7 +144,7 @@ static void metadata_cache_remove(FileData *fd, const gchar *key)
        work = fd->cached_metadata;
        while (work)
                {
-               GList *entry = (GList *)work->data;
+               GList *entry = static_cast<GList *>(work->data);
                gchar *entry_key = entry->data;
 
                if (strcmp(entry_key, key) == 0)
@@ -168,7 +168,7 @@ void metadata_cache_free(FileData *fd)
        work = fd->cached_metadata;
        while (work)
                {
-               GList *entry = (GList *)work->data;
+               GList *entry = static_cast<GList *>(work->data);
                string_list_free(entry);
 
                work = work->next;
@@ -238,7 +238,7 @@ gboolean metadata_write_queue_remove(FileData *fd)
        //work = list;
        //while (work)
                //{
-               //FileData *fd = (//FileData *)work->data;
+               //FileData *fd = static_cast<//FileData *>(work->data);
                //work = work->next;
                //ret = ret && metadata_write_queue_remove(fd);
                //}
@@ -271,7 +271,7 @@ gboolean metadata_write_queue_confirm(gboolean force_dialog, FileUtilDoneFunc do
        work = metadata_write_queue;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                if (!isname(fd->path))
@@ -400,7 +400,7 @@ gboolean metadata_write_list(FileData *fd, const gchar *key, const GList *values
 
                while (work)
                        {
-                       FileData *sfd = (FileData *)work->data;
+                       FileData *sfd = static_cast<FileData *>(work->data);
                        work = work->next;
 
                        if (sfd->format_class == FORMAT_CLASS_META) continue;
@@ -1050,7 +1050,7 @@ GList *string_to_keywords_list(const gchar *text)
 gboolean meta_data_get_keyword_mark(FileData *fd, gint UNUSED(n), gpointer data)
 {
        /** @FIXME do not use global keyword_tree */
-       GList *path = (GList *)data;
+       GList *path = static_cast<GList *>(data);
        GList *keywords;
        gboolean found = FALSE;
        keywords = metadata_read_list(fd, KEYWORD_KEY, METADATA_PLAIN);
@@ -1067,7 +1067,7 @@ gboolean meta_data_get_keyword_mark(FileData *fd, gint UNUSED(n), gpointer data)
 
 gboolean meta_data_set_keyword_mark(FileData *fd, gint UNUSED(n), gboolean value, gpointer data)
 {
-       GList *path = (GList *)data;
+       GList *path = static_cast<GList *>(data);
        GList *keywords = NULL;
        GtkTreeIter iter;
 
@@ -1688,7 +1688,7 @@ void keyword_hide_unset_in(GtkTreeStore *keyword_tree, gpointer id, GList *keywo
 static gboolean keyword_show_set_in_cb(GtkTreeModel *model, GtkTreePath *UNUSED(path), GtkTreeIter *iter_ptr, gpointer data)
 {
        GtkTreeIter iter = *iter_ptr;
-       GList *keywords = (GList *)data;
+       GList *keywords = static_cast<GList *>(data);
        gpointer id = keywords->data;
        keywords = keywords->next; /* hack */
        if (keyword_tree_is_set(model, &iter, keywords))
index 1e14ef4..dd79dfd 100644 (file)
@@ -93,7 +93,7 @@ struct _TagData
 
 static void tag_button_cb(GtkWidget *widget, gpointer data)
 {
-       GtkTextView *image_overlay_template_view = (GtkTextView *)data;
+       GtkTextView *image_overlay_template_view = static_cast<GtkTextView *>(data);
        GtkTextBuffer *buffer;
        TagData *td;
 
@@ -109,7 +109,7 @@ static void osd_dnd_get_cb(GtkWidget *btn, GdkDragContext *UNUSED(context),
                                                                guint UNUSED(time), gpointer data)
 {
        TagData *td;
-       GtkTextView *image_overlay_template_view = (GtkTextView *)data;
+       GtkTextView *image_overlay_template_view = static_cast<GtkTextView *>(data);
 
        td = g_object_get_data(G_OBJECT(btn), "tag_data");
        gtk_selection_data_set_text(selection_data, td->key, -1);
index 4d5c986..98c226e 100644 (file)
@@ -778,7 +778,7 @@ void pixbuf_renderer_overlay_remove(PixbufRenderer *pr, gint id)
 
 static gboolean pr_scroller_update_cb(gpointer data)
 {
-       PixbufRenderer *pr = (PixbufRenderer *)data;
+       PixbufRenderer *pr = static_cast<PixbufRenderer *>(data);
        gint x, y;
        gint xinc, yinc;
 
@@ -1099,7 +1099,7 @@ static SourceTile *pr_source_tile_find(PixbufRenderer *pr, gint x, gint y)
        work = pr->source_tiles;
        while (work)
                {
-               SourceTile *st = (SourceTile *)work->data;
+               SourceTile *st = static_cast<SourceTile *>(work->data);
 
                if (x >= st->x && x < st->x + pr->source_tile_width &&
                    y >= st->y && y < st->y + pr->source_tile_height)
@@ -1944,7 +1944,7 @@ static void pr_size_sync(PixbufRenderer *pr, gint new_width, gint new_height)
 
 static void pr_size_cb(GtkWidget *UNUSED(widget), GtkAllocation *allocation, gpointer data)
 {
-       PixbufRenderer *pr = (PixbufRenderer *)data;
+       PixbufRenderer *pr = static_cast<PixbufRenderer *>(data);
 
        pr_size_sync(pr, allocation->width, allocation->height);
 }
index ea1fe16..530645f 100644 (file)
@@ -520,7 +520,7 @@ static void config_window_close_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(da
 
 static void config_window_help_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       GtkWidget *notebook = (GtkWidget *)data;
+       GtkWidget *notebook = static_cast<GtkWidget *>(data);
        gint i;
 
        static const gchar *html_section[] =
@@ -554,7 +554,7 @@ static gboolean config_window_delete(GtkWidget *UNUSED(widget), GdkEventAny *UNU
 static void config_window_ok_cb(GtkWidget *widget, gpointer data)
 {
        LayoutWindow *lw;
-       GtkNotebook *notebook = (GtkNotebook *)data;
+       GtkNotebook *notebook = static_cast<GtkNotebook *>(data);
        GdkWindow *window;
        gint x;
        gint y;
@@ -1106,7 +1106,7 @@ static void video_menu_cb(GtkWidget *combo, gpointer data)
 static void video_menu_populate(gpointer data, gpointer user_data)
 {
        GtkWidget *combo = user_data;
-       EditorDescription *ed = (EditorDescription *)data;
+       EditorDescription *ed = static_cast<EditorDescription *>(data);
 
        gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), ed->name);
 }
@@ -1161,8 +1161,8 @@ static void filter_store_populate(void)
 static void filter_store_ext_edit_cb(GtkCellRendererText *UNUSED(cell), gchar *path_str,
                                     gchar *new_text, gpointer data)
 {
-       GtkWidget *model = (GtkWidget *)data;
-       FilterEntry *fe = (FilterEntry *)data;
+       GtkWidget *model = static_cast<GtkWidget *>(data);
+       FilterEntry *fe = static_cast<FilterEntry *>(data);
        GtkTreePath *tpath;
        GtkTreeIter iter;
 
@@ -1182,8 +1182,8 @@ static void filter_store_ext_edit_cb(GtkCellRendererText *UNUSED(cell), gchar *p
 static void filter_store_class_edit_cb(GtkCellRendererText *UNUSED(cell), gchar *path_str,
                                       gchar *new_text, gpointer data)
 {
-       GtkWidget *model = (GtkWidget *)data;
-       FilterEntry *fe = (FilterEntry *)data;
+       GtkWidget *model = static_cast<GtkWidget *>(data);
+       FilterEntry *fe = static_cast<FilterEntry *>(data);
        GtkTreePath *tpath;
        GtkTreeIter iter;
        gint i;
@@ -1210,7 +1210,7 @@ static void filter_store_class_edit_cb(GtkCellRendererText *UNUSED(cell), gchar
 static void filter_store_desc_edit_cb(GtkCellRendererText *UNUSED(cell), gchar *path_str,
                                      gchar *new_text, gpointer data)
 {
-       GtkWidget *model = (GtkWidget *)data;
+       GtkWidget *model = static_cast<GtkWidget *>(data);
        FilterEntry *fe;
        GtkTreePath *tpath;
        GtkTreeIter iter;
@@ -1230,7 +1230,7 @@ static void filter_store_desc_edit_cb(GtkCellRendererText *UNUSED(cell), gchar *
 static void filter_store_enable_cb(GtkCellRendererToggle *UNUSED(renderer),
                                   gchar *path_str, gpointer data)
 {
-       GtkWidget *model = (GtkWidget *)data;
+       GtkWidget *model = static_cast<GtkWidget *>(data);
        FilterEntry *fe;
        GtkTreePath *tpath;
        GtkTreeIter iter;
@@ -1248,7 +1248,7 @@ static void filter_store_enable_cb(GtkCellRendererToggle *UNUSED(renderer),
 static void filter_store_writable_cb(GtkCellRendererToggle *UNUSED(renderer),
                                     gchar *path_str, gpointer data)
 {
-       GtkWidget *model = (GtkWidget *)data;
+       GtkWidget *model = static_cast<GtkWidget *>(data);
        FilterEntry *fe;
        GtkTreePath *tpath;
        GtkTreeIter iter;
@@ -1267,7 +1267,7 @@ static void filter_store_writable_cb(GtkCellRendererToggle *UNUSED(renderer),
 static void filter_store_sidecar_cb(GtkCellRendererToggle *UNUSED(renderer),
                                    gchar *path_str, gpointer data)
 {
-       GtkWidget *model = (GtkWidget *)data;
+       GtkWidget *model = static_cast<GtkWidget *>(data);
        FilterEntry *fe;
        GtkTreePath *tpath;
        GtkTreeIter iter;
@@ -1376,7 +1376,7 @@ static void filter_add_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void filter_remove_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       GtkWidget *filter_view = (GtkWidget *)data;
+       GtkWidget *filter_view = static_cast<GtkWidget *>(data);
        GtkTreeSelection *selection;
        GtkTreeIter iter;
        FilterEntry *fe;
@@ -1441,7 +1441,7 @@ static void filter_default_cb(GtkWidget *widget, gpointer data)
 
 static void filter_disable_cb(GtkWidget *widget, gpointer data)
 {
-       GtkWidget *frame = (GtkWidget *)data;
+       GtkWidget *frame = static_cast<GtkWidget *>(data);
 
        gtk_widget_set_sensitive(frame,
                                 !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)));
@@ -1495,7 +1495,7 @@ static void image_overlay_template_view_changed_cb(GtkWidget *UNUSED(widget), gp
 
 static void image_overlay_default_template_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       GtkTextView *text_view = (GtkTextView *)data;
+       GtkTextView *text_view = static_cast<GtkTextView *>(data);
        GtkTextBuffer *buffer;
 
        set_default_image_overlay_template_string(&options->image_overlay.template_string);
@@ -1878,7 +1878,7 @@ static void star_rating_rejected_icon_cb(GtkEntry *UNUSED(entry), GtkEntryIconPo
 
 static guint star_rating_symbol_test(GtkWidget *UNUSED(widget), gpointer data)
 {
-       GtkContainer *hbox = (GtkContainer *)data;
+       GtkContainer *hbox = static_cast<GtkContainer *>(data);
        GString *str = g_string_new(NULL);
        GtkEntry *hex_code_entry;
        gchar *hex_code_full;
@@ -2358,7 +2358,7 @@ static void save_default_window_layout_cb(GtkWidget *UNUSED(widget), gpointer UN
 
 static gboolean popover_cb(gpointer data)
 {
-       GtkPopover *popover = (GtkPopover *)data;
+       GtkPopover *popover = static_cast<GtkPopover *>(data);
 
        gtk_popover_popdown(popover);
 
@@ -3034,7 +3034,7 @@ static void keywords_find_reset(KeywordFindData *kfd)
 
 static void keywords_find_close_cb(GenericDialog *UNUSED(fd), gpointer data)
 {
-       KeywordFindData *kfd = (KeywordFindData *)data;
+       KeywordFindData *kfd = static_cast<KeywordFindData *>(data);
 
        if (!gtk_widget_get_sensitive(kfd->button_close)) return;
 
@@ -3058,7 +3058,7 @@ static void keywords_find_finish(KeywordFindData *kfd)
 
 static void keywords_find_stop_cb(GenericDialog *UNUSED(fd), gpointer data)
 {
-       KeywordFindData *kfd = (KeywordFindData *)data;
+       KeywordFindData *kfd = static_cast<KeywordFindData *>(data);
 
        g_idle_remove_by_data(kfd);
 
@@ -3067,7 +3067,7 @@ static void keywords_find_stop_cb(GenericDialog *UNUSED(fd), gpointer data)
 
 static gboolean keywords_find_file(gpointer data)
 {
-       KeywordFindData *kfd = (KeywordFindData *)data;
+       KeywordFindData *kfd = static_cast<KeywordFindData *>(data);
        GtkTextIter iter;
        GtkTextBuffer *buffer;
        gchar *tmp;
@@ -3119,7 +3119,7 @@ static gboolean keywords_find_file(gpointer data)
 
 static void keywords_find_start_cb(GenericDialog *UNUSED(fd), gpointer data)
 {
-       KeywordFindData *kfd = (KeywordFindData *)data;
+       KeywordFindData *kfd = static_cast<KeywordFindData *>(data);
        gchar *path;
 
        if (kfd->list || !gtk_widget_get_sensitive(kfd->button_start)) return;
@@ -4196,7 +4196,7 @@ static void image_overlay_set_text_colours()
 static void timezone_async_ready_cb(GObject *source_object, GAsyncResult *res, gpointer data)
 {
        GError *error = NULL;
-       TZData *tz = (TZData *)data;
+       TZData *tz = static_cast<TZData *>(data);
        gchar *tmp_filename;
        gchar *timezone_bin;
        gchar *tmp_dir = NULL;
@@ -4250,7 +4250,7 @@ static void timezone_async_ready_cb(GObject *source_object, GAsyncResult *res, g
 
 static void timezone_progress_cb(goffset current_num_bytes, goffset total_num_bytes, gpointer data)
 {
-       TZData *tz = (TZData *)data;
+       TZData *tz = static_cast<TZData *>(data);
 
        if (!g_cancellable_is_cancelled(tz->cancellable))
                {
@@ -4260,14 +4260,14 @@ static void timezone_progress_cb(goffset current_num_bytes, goffset total_num_by
 
 static void timezone_cancel_button_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       TZData *tz = (TZData *)data;
+       TZData *tz = static_cast<TZData *>(data);
 
        g_cancellable_cancel(tz->cancellable);
 }
 
 static void timezone_database_install_cb(GtkWidget *widget, gpointer data)
 {
-       TZData *tz = (TZData *)data;
+       TZData *tz = static_cast<TZData *>(data);
        GError *error = NULL;
        GFileIOStream *io_stream;
 
index 34a44ff..1e87cbb 100644 (file)
@@ -79,7 +79,7 @@ static gboolean print_job_render_image(PrintWindow *pw);
 
 static void print_job_render_image_loader_done(ImageLoader *il, gpointer data)
 {
-       PrintWindow *pw = (PrintWindow *)data;
+       PrintWindow *pw = static_cast<PrintWindow *>(data);
        GdkPixbuf *pixbuf;
 
        pixbuf = image_loader_get_pixbuf(il);
@@ -175,7 +175,7 @@ static gint set_toggle(GSList *list, TextPosition pos)
 
 static void image_text_position_h1_cb(GtkWidget *widget, gpointer data)
 {
-       PrintWindow *pw = (PrintWindow *)data;
+       PrintWindow *pw = static_cast<PrintWindow *>(data);
        gint new_set;
 
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
@@ -191,7 +191,7 @@ static void image_text_position_h1_cb(GtkWidget *widget, gpointer data)
 
 static void image_text_position_h2_cb(GtkWidget *widget, gpointer data)
 {
-       PrintWindow *pw = (PrintWindow *)data;
+       PrintWindow *pw = static_cast<PrintWindow *>(data);
        gint new_set;
 
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
@@ -207,7 +207,7 @@ static void image_text_position_h2_cb(GtkWidget *widget, gpointer data)
 
 static void image_text_position_f1_cb(GtkWidget *widget, gpointer data)
 {
-       PrintWindow *pw = (PrintWindow *)data;
+       PrintWindow *pw = static_cast<PrintWindow *>(data);
        gint new_set;
 
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
@@ -223,7 +223,7 @@ static void image_text_position_f1_cb(GtkWidget *widget, gpointer data)
 
 static void image_text_position_f2_cb(GtkWidget *widget, gpointer data)
 {
-       PrintWindow *pw = (PrintWindow *)data;
+       PrintWindow *pw = static_cast<PrintWindow *>(data);
        gint new_set;
 
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
@@ -239,7 +239,7 @@ static void image_text_position_f2_cb(GtkWidget *widget, gpointer data)
 
 static void page_text_position_h1_cb(GtkWidget *widget, gpointer data)
 {
-       PrintWindow *pw = (PrintWindow *)data;
+       PrintWindow *pw = static_cast<PrintWindow *>(data);
        gint new_set;
 
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
@@ -255,7 +255,7 @@ static void page_text_position_h1_cb(GtkWidget *widget, gpointer data)
 
 static void page_text_position_h2_cb(GtkWidget *widget, gpointer data)
 {
-       PrintWindow *pw = (PrintWindow *)data;
+       PrintWindow *pw = static_cast<PrintWindow *>(data);
        gint new_set;
 
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
@@ -271,7 +271,7 @@ static void page_text_position_h2_cb(GtkWidget *widget, gpointer data)
 
 static void page_text_position_f1_cb(GtkWidget *widget, gpointer data)
 {
-       PrintWindow *pw = (PrintWindow *)data;
+       PrintWindow *pw = static_cast<PrintWindow *>(data);
        gint new_set;
 
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
@@ -287,7 +287,7 @@ static void page_text_position_f1_cb(GtkWidget *widget, gpointer data)
 
 static void page_text_position_f2_cb(GtkWidget *widget, gpointer data)
 {
-       PrintWindow *pw = (PrintWindow *)data;
+       PrintWindow *pw = static_cast<PrintWindow *>(data);
        gint new_set;
 
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
@@ -464,7 +464,7 @@ static gboolean paginate_cb(GtkPrintOperation *UNUSED(operation),
                                                                        GtkPrintContext *UNUSED(context),
                                                                        gpointer data)
 {
-       PrintWindow *pw = (PrintWindow *)data;
+       PrintWindow *pw = static_cast<PrintWindow *>(data);
 
        if (pw->job_render_finished)
                {
@@ -542,7 +542,7 @@ gchar *form_image_text(const gchar *template_string, FileData *fd, PrintWindow *
 static void draw_page(GtkPrintOperation *UNUSED(operation), GtkPrintContext *context,
                                                                        gint page_nr, gpointer data)
 {
-       PrintWindow *pw = (PrintWindow *)data;
+       PrintWindow *pw = static_cast<PrintWindow *>(data);
        FileData *fd;
        cairo_t *cr;
        gdouble context_width, context_height;
@@ -789,7 +789,7 @@ static void print_pref_store(PrintWindow *pw)
 static void end_print_cb(GtkPrintOperation *operation,
                                                                GtkPrintContext *UNUSED(context), gpointer data)
 {
-       PrintWindow *pw = (PrintWindow *)data;
+       PrintWindow *pw = static_cast<PrintWindow *>(data);
        GList *work;
        GdkPixbuf *pixbuf;
        gchar *path;
index 0038092..88c2d09 100644 (file)
@@ -711,7 +711,7 @@ gboolean save_config_to_file(const gchar *utf8_path, ConfOptions *options, Layou
                        work = layout_window_list;
                        while (work)
                                {
-                               LayoutWindow *lw = (LayoutWindow *)work->data;
+                               LayoutWindow *lw = static_cast<LayoutWindow *>(work->data);
                                layout_write_config(lw, outstr, indent);
                                work = work->next;
                                }
@@ -1288,14 +1288,14 @@ static void options_parse_filter_end(GQParserData *parser_data, GMarkupParseCont
 
 static void options_parse_keyword_end(GQParserData *UNUSED(parser_data), GMarkupParseContext *UNUSED(context), const gchar *UNUSED(element_name), gpointer data, GError **UNUSED(error))
 {
-       GtkTreeIter *iter_ptr = (GtkTreeIter *)data;
+       GtkTreeIter *iter_ptr = static_cast<GtkTreeIter *>(data);
        gtk_tree_iter_free(iter_ptr);
 }
 
 
 static void options_parse_keyword(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
 {
-       GtkTreeIter *iter_ptr = (GtkTreeIter *)data;
+       GtkTreeIter *iter_ptr = static_cast<GtkTreeIter *>(data);
        if (g_ascii_strcasecmp(element_name, "keyword") == 0)
                {
                GtkTreeIter *child = keyword_add_from_config(keyword_tree, iter_ptr, attribute_names, attribute_values);
@@ -1375,7 +1375,7 @@ static void options_parse_global_end(GQParserData *UNUSED(parser_data), GMarkupP
 
 static void options_parse_pane_exif(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
 {
-       GtkWidget *pane = (GtkWidget *)data;
+       GtkWidget *pane = static_cast<GtkWidget *>(data);
        if (g_ascii_strcasecmp(element_name, "entry") == 0)
                {
                bar_pane_exif_entry_add_from_config(pane, attribute_names, attribute_values);
@@ -1390,7 +1390,7 @@ static void options_parse_pane_exif(GQParserData *parser_data, GMarkupParseConte
 
 static void options_parse_pane_keywords(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
 {
-       GtkWidget *pane = (GtkWidget *)data;
+       GtkWidget *pane = static_cast<GtkWidget *>(data);
 
        if (g_ascii_strcasecmp(element_name, "expanded") == 0)
                {
@@ -1406,7 +1406,7 @@ static void options_parse_pane_keywords(GQParserData *parser_data, GMarkupParseC
 
 static void options_parse_bar(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
 {
-       GtkWidget *bar = (GtkWidget *)data;
+       GtkWidget *bar = static_cast<GtkWidget *>(data);
        if (g_ascii_strcasecmp(element_name, "pane_comment") == 0)
                {
                GtkWidget *pane = bar_find_pane_by_id(bar, PANE_COMMENT, options_get_id(attribute_names, attribute_values));
@@ -1513,7 +1513,7 @@ static void options_parse_bar(GQParserData *parser_data, GMarkupParseContext *UN
 
 static void options_parse_toolbar(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        if (g_ascii_strcasecmp(element_name, "toolitem") == 0)
                {
                layout_toolbar_add_from_config(lw, TOOLBAR_MAIN, attribute_names, attribute_values);
@@ -1533,7 +1533,7 @@ static void options_parse_toolbar(GQParserData *parser_data, GMarkupParseContext
 
 static void options_parse_statusbar(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        if (g_ascii_strcasecmp(element_name, "toolitem") == 0)
                {
                layout_toolbar_add_from_config(lw, TOOLBAR_STATUS, attribute_names, attribute_values);
@@ -1567,7 +1567,7 @@ static void options_parse_dialogs(GQParserData *parser_data, GMarkupParseContext
 
 static void options_parse_layout(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        if (g_ascii_strcasecmp(element_name, "bar") == 0)
                {
                if (!lw->bar)
@@ -1608,7 +1608,9 @@ static void options_parse_layout(GQParserData *parser_data, GMarkupParseContext
 
 static void options_parse_layout_end(GQParserData *UNUSED(parser_data), GMarkupParseContext *UNUSED(context), const gchar *UNUSED(element_name), gpointer data, GError **UNUSED(error))
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
+       //~ LayoutWindow *lw = (LayoutWindow *)data;
+       //~ LayoutWindow *lw = data;
        layout_util_sync(lw);
 }
 
index 4b9c3b4..1e296dc 100644 (file)
@@ -116,7 +116,7 @@ static gchar *set_pwd(gchar *filename)
 
 static gboolean remote_server_client_cb(GIOChannel *source, GIOCondition condition, gpointer data)
 {
-       RemoteClient *client = (RemoteClient *)data;
+       RemoteClient *client = static_cast<RemoteClient *>(data);
        RemoteConnection *rc;
        GIOStatus status = G_IO_STATUS_NORMAL;
 
@@ -211,7 +211,7 @@ static void remote_server_clients_close(RemoteConnection *rc)
 
 static gboolean remote_server_read_cb(GIOChannel *UNUSED(source), GIOCondition UNUSED(condition), gpointer data)
 {
-       RemoteConnection *rc = (RemoteConnection *)data;
+       RemoteConnection *rc = static_cast<RemoteConnection *>(data);
        gint fd;
        guint alen;
 
@@ -932,7 +932,7 @@ static void gr_get_selection(const gchar *UNUSED(text), GIOChannel *channel, gbo
        GList *work = selected;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                g_assert(fd->magick == FD_MAGICK);
 
                g_string_append_printf(out_string, "%s    %s\n",
@@ -970,7 +970,7 @@ static void gr_selection_add(const gchar *text, GIOChannel *UNUSED(channel), gpo
                GList *file_list = layout_list(lw_id);
                for (GList *work = file_list; work && !fd_to_select; work = work->next)
                        {
-                       FileData *fd = (FileData *)work->data;
+                       FileData *fd = static_cast<FileData *>(work->data);
                        if (!strcmp(path, fd->path) || g_str_has_suffix(fd->path, slash_plus_filename))
                                {
                                fd_to_select = file_data_ref(fd);
@@ -1054,7 +1054,7 @@ static void gr_selection_remove(const gchar *text, GIOChannel *UNUSED(channel),
        GList *link_to_remove = NULL;
        for (GList *work = selected; work; prior_link = work, work = work->next)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                if (fd_to_deselect)
                        {
                        if (fd == fd_to_deselect)
@@ -1431,7 +1431,7 @@ static void gr_file_view(const gchar *text, GIOChannel *UNUSED(channel), gpointe
 
 static void gr_list_clear(const gchar *UNUSED(text), GIOChannel *UNUSED(channel), gpointer data)
 {
-       RemoteData *remote_data = (RemoteData *)data;
+       RemoteData *remote_data = static_cast<RemoteData *>(data);
 
        remote_data->command_collection = NULL;
        remote_data->file_list = NULL;
@@ -1440,7 +1440,7 @@ static void gr_list_clear(const gchar *UNUSED(text), GIOChannel *UNUSED(channel)
 
 static void gr_list_add(const gchar *text, GIOChannel *UNUSED(channel), gpointer data)
 {
-       RemoteData *remote_data = (RemoteData *)data;
+       RemoteData *remote_data = static_cast<RemoteData *>(data);
        gboolean is_new = TRUE;
        gchar *path = NULL;
        FileData *fd;
index 882c07d..23b8e72 100644 (file)
@@ -697,7 +697,7 @@ static void rt_overlay_queue_all(RendererTiles *rt, gint x1, gint y1, gint x2, g
        work = rt->overlay_list;
        while (work)
                {
-               OverlayData *od = (OverlayData *)work->data;
+               OverlayData *od = static_cast<OverlayData *>(work->data);
                work = work->next;
 
                rt_overlay_queue_draw(rt, od, x1, y1, x2, y2);
@@ -711,7 +711,7 @@ static void rt_overlay_update_sizes(RendererTiles *rt)
        work = rt->overlay_list;
        while (work)
                {
-               OverlayData *od = (OverlayData *)work->data;
+               OverlayData *od = static_cast<OverlayData *>(work->data);
                work = work->next;
 
                if (!od->window) rt_overlay_init_window(rt, od);
@@ -733,7 +733,7 @@ static OverlayData *rt_overlay_find(RendererTiles *rt, gint id)
        work = rt->overlay_list;
        while (work)
                {
-               OverlayData *od = (OverlayData *)work->data;
+               OverlayData *od = static_cast<OverlayData *>(work->data);
                work = work->next;
 
                if (od->id == id) return od;
@@ -810,7 +810,7 @@ static void rt_overlay_list_reset_window(RendererTiles *rt)
        work = rt->overlay_list;
        while (work)
                {
-               OverlayData *od = (OverlayData *)work->data;
+               OverlayData *od = static_cast<OverlayData *>(work->data);
                work = work->next;
                if (od->window) gdk_window_destroy(od->window);
                od->window = NULL;
@@ -862,7 +862,7 @@ gboolean renderer_tiles_overlay_get(void *renderer, gint id, GdkPixbuf **pixbuf,
 
 static void rt_hierarchy_changed_cb(GtkWidget *UNUSED(widget), GtkWidget *UNUSED(previous_toplevel), gpointer data)
 {
-       RendererTiles *rt = (RendererTiles *)data;
+       RendererTiles *rt = static_cast<RendererTiles *>(data);
        rt_overlay_list_reset_window(rt);
 }
 
@@ -1580,7 +1580,7 @@ static gint rt_get_queued_area(GList *work)
 
        while (work)
                {
-               QueueData *qd = (QueueData *)work->data;
+               QueueData *qd = static_cast<QueueData *>(work->data);
                area += qd->w * qd->h;
                work = work->next;
                }
@@ -1636,7 +1636,7 @@ static gboolean rt_queue_schedule_next_draw(RendererTiles *rt, gboolean force_se
 
 static gboolean rt_queue_draw_idle_cb(gpointer data)
 {
-       RendererTiles *rt = (RendererTiles *)data;
+       RendererTiles *rt = static_cast<RendererTiles *>(data);
        PixbufRenderer *pr = rt->pr;
        QueueData *qd;
        gboolean fast;
@@ -2168,7 +2168,7 @@ static gboolean rt_realize_cb(GtkWidget *widget, gpointer data)
 
 static gboolean rt_size_allocate_cb(GtkWidget *widget,  GdkRectangle *allocation, gpointer data)
 {
-       RendererTiles *rt = (RendererTiles *)data;
+       RendererTiles *rt = static_cast<RendererTiles *>(data);
        cairo_t *cr;
        cairo_surface_t *old_surface;
 
index af9fc20..f051c70 100644 (file)
@@ -174,7 +174,7 @@ static void command_store_populate(SarData* sar)
 
 static gboolean search_and_run_destroy(gpointer data)
 {
-       SarData *sar = (SarData *)data;
+       SarData *sar = static_cast<SarData *>(data);
 
        sar->lw->sar_window = NULL;
        gtk_widget_destroy(sar->window);
@@ -184,7 +184,7 @@ static gboolean search_and_run_destroy(gpointer data)
 
 static gboolean entry_box_activate_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SarData *sar = (SarData *)data;
+       SarData *sar = static_cast<SarData *>(data);
 
        if (sar->action)
                {
@@ -198,7 +198,7 @@ static gboolean entry_box_activate_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static gboolean keypress_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
 {
-       SarData *sar = (SarData *)data;
+       SarData *sar = static_cast<SarData *>(data);
        gboolean ret = FALSE;
 
        switch (event->keyval)
@@ -219,7 +219,7 @@ static gboolean keypress_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpoin
 
 static gboolean match_selected_cb(GtkEntryCompletion *UNUSED(widget), GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
 {
-       SarData *sar = (SarData *)data;
+       SarData *sar = static_cast<SarData *>(data);
 
        gtk_tree_model_get(GTK_TREE_MODEL(model), iter, SAR_ACTION, &sar->action, -1);
 
@@ -235,7 +235,7 @@ static gboolean match_selected_cb(GtkEntryCompletion *UNUSED(widget), GtkTreeMod
 
 static gboolean match_func(GtkEntryCompletion *completion, const gchar *key, GtkTreeIter *iter, gpointer data)
 {
-       SarData *sar = (SarData *)data;
+       SarData *sar = static_cast<SarData *>(data);
        gboolean ret = FALSE;
        gchar *normalized;
        GtkTreeModel *model;
index aa6b350..9708d78 100644 (file)
@@ -485,7 +485,7 @@ static gboolean search_result_row_selected(SearchData *sd, FileData *fd)
        work = slist;
        while (!found && work)
                {
-               GtkTreePath *tpath = (GtkTreePath *)work->data;
+               GtkTreePath *tpath = static_cast<GtkTreePath *>(work->data);
                MatchFileData *mfd_n;
                GtkTreeIter iter;
 
@@ -520,7 +520,7 @@ static gint search_result_selection_util(SearchData *sd, gint64 *bytes, GList **
 
                if (bytes || list)
                        {
-                       GtkTreePath *tpath = (GtkTreePath *)work->data;
+                       GtkTreePath *tpath = static_cast<GtkTreePath *>(work->data);
                        MatchFileData *mfd;
                        GtkTreeIter iter;
 
@@ -742,7 +742,7 @@ static void search_result_remove_selection(SearchData *sd)
        work = slist;
        while (work)
                {
-               GtkTreePath *tpath = (GtkTreePath *)work->data;
+               GtkTreePath *tpath = static_cast<GtkTreePath *>(work->data);
                GtkTreeIter iter;
                MatchFileData *mfd;
 
@@ -757,7 +757,7 @@ static void search_result_remove_selection(SearchData *sd)
        work = flist;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                search_result_remove(sd, fd);
@@ -785,7 +785,7 @@ static void search_result_collection_from_selection(SearchData *sd)
 
 static gboolean search_result_update_idle_cb(gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        search_status_update(sd);
 
@@ -805,7 +805,7 @@ static void search_result_update_idle_cancel(SearchData *sd)
 static gboolean search_result_select_cb(GtkTreeSelection *UNUSED(selection), GtkTreeModel *UNUSED(store),
                                        GtkTreePath *UNUSED(tpath), gboolean UNUSED(selected), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        if (!sd->update_idle_id)
                {
@@ -850,7 +850,7 @@ static void search_result_thumb_do(SearchData *sd)
 
 static void search_result_thumb_done_cb(ThumbLoader *UNUSED(tl), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        search_result_thumb_do(sd);
        search_result_thumb_step(sd);
@@ -989,14 +989,14 @@ static void search_result_thumb_enable(SearchData *sd, gboolean enable)
 
 static void sr_menu_view_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        if (sd->click_fd) layout_set_fd(NULL, sd->click_fd);
 }
 
 static void sr_menu_viewnew_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
        GList *list;
 
        list = search_result_selection_list(sd);
@@ -1006,7 +1006,7 @@ static void sr_menu_viewnew_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void sr_menu_select_all_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
        GtkTreeSelection *selection;
 
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(sd->result_view));
@@ -1015,7 +1015,7 @@ static void sr_menu_select_all_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void sr_menu_select_none_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
        GtkTreeSelection *selection;
 
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(sd->result_view));
@@ -1035,7 +1035,7 @@ static void sr_menu_edit_cb(GtkWidget *widget, gpointer data)
 
 static void sr_menu_print_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        print_window_new(sd->click_fd, search_result_selection_list(sd),
                         search_result_get_filelist(sd), sd->window);
@@ -1043,28 +1043,28 @@ static void sr_menu_print_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void sr_menu_copy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        file_util_copy(NULL, search_result_selection_list(sd), NULL, sd->window);
 }
 
 static void sr_menu_move_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        file_util_move(NULL, search_result_selection_list(sd), NULL, sd->window);
 }
 
 static void sr_menu_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        file_util_rename(NULL, search_result_selection_list(sd), sd->window);
 }
 
 static void sr_menu_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        options->file_ops.safe_delete_enable = FALSE;
        file_util_delete(NULL, search_result_selection_list(sd), sd->window);
@@ -1072,7 +1072,7 @@ static void sr_menu_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void sr_menu_move_to_trash_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        options->file_ops.safe_delete_enable = TRUE;
        file_util_delete(NULL, search_result_selection_list(sd), sd->window);
@@ -1080,28 +1080,28 @@ static void sr_menu_move_to_trash_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void sr_menu_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        file_util_copy_path_list_to_clipboard(search_result_selection_list(sd), TRUE);
 }
 
 static void sr_menu_copy_path_unquoted_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        file_util_copy_path_list_to_clipboard(search_result_selection_list(sd), FALSE);
 }
 
 static void sr_menu_play_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        start_editor_from_file(options->image_l_click_video_editor, sd->click_fd);
 }
 
 static void search_result_menu_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       GList *editmenu_fd_list = (GList *)data;
+       GList *editmenu_fd_list = static_cast<GList *>(data);
 
        filelist_free(editmenu_fd_list);
 }
@@ -1201,7 +1201,7 @@ static GtkWidget *search_result_menu(SearchData *sd, gboolean on_row, gboolean e
 
 static gboolean search_result_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
        GtkTreeModel *store;
        GtkTreePath *tpath;
        GtkTreeIter iter;
@@ -1268,7 +1268,7 @@ static gboolean search_result_press_cb(GtkWidget *widget, GdkEventButton *bevent
 
 static gboolean search_result_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
        GtkTreeModel *store;
        GtkTreePath *tpath;
        GtkTreeIter iter;
@@ -1331,7 +1331,7 @@ static gboolean search_result_release_cb(GtkWidget *widget, GdkEventButton *beve
 
 static gboolean search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
        gboolean stop_signal = FALSE;
        GtkTreeModel *store;
        GtkTreeSelection *selection;
@@ -1452,7 +1452,7 @@ static gboolean search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event,
 
 static gboolean search_window_keypress_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
        gboolean stop_signal = FALSE;
 
        if (event->state & GDK_CONTROL_MASK)
@@ -1506,7 +1506,7 @@ static void search_dnd_data_set(GtkWidget *UNUSED(widget), GdkDragContext *UNUSE
                                GtkSelectionData *selection_data, guint UNUSED(info),
                                guint UNUSED(time), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
        GList *list;
 
        list = search_result_selection_list(sd);
@@ -1518,7 +1518,7 @@ static void search_dnd_data_set(GtkWidget *UNUSED(widget), GdkDragContext *UNUSE
 
 static void search_dnd_begin(GtkWidget *widget, GdkDragContext *context, gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        if (sd->click_fd && !search_result_row_selected(sd, sd->click_fd))
                {
@@ -1553,7 +1553,7 @@ static void search_gps_dnd_received_cb(GtkWidget *UNUSED(pane), GdkDragContext *
                                                                                GtkSelectionData *selection_data, guint info,
                                                                                guint UNUSED(time), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
        GList *list;
        gdouble latitude, longitude;
        FileData *fd;
@@ -1592,7 +1592,7 @@ static void search_path_entry_dnd_received_cb(GtkWidget *UNUSED(pane), GdkDragCo
                                                                                GtkSelectionData *selection_data, guint info,
                                                                                guint UNUSED(time), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
        GList *list;
        FileData *fd;
 
@@ -1621,7 +1621,7 @@ static void search_image_content_dnd_received_cb(GtkWidget *UNUSED(pane), GdkDra
                                                                                GtkSelectionData *selection_data, guint info,
                                                                                guint UNUSED(time), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
        GList *list;
        FileData *fd;
 
@@ -1698,7 +1698,7 @@ static void search_buffer_flush(SearchData *sd)
        work = g_list_last(sd->search_buffer_list);
        while (work)
                {
-               MatchFileData *mfd = (MatchFileData *)work->data;
+               MatchFileData *mfd = static_cast<MatchFileData *>(work->data);
                work = work->prev;
 
                search_result_append(sd, mfd);
@@ -1808,7 +1808,7 @@ static void search_file_load_process(SearchData *sd, CacheData *cd)
 
 static void search_file_load_done_cb(ImageLoader *UNUSED(il), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
        search_file_load_process(sd, sd->img_cd);
 }
 
@@ -2443,7 +2443,7 @@ static gboolean search_file_next(SearchData *sd)
 
 static gboolean search_step_cb(gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
        FileData *fd;
 
        if (sd->search_buffer_count > SEARCH_BUFFER_FLUSH_SIZE)
@@ -2554,7 +2554,7 @@ static gboolean search_step_cb(gpointer data)
 
 static void search_similarity_load_done_cb(ImageLoader *UNUSED(il), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
        search_file_load_process(sd, sd->search_similarity_cd);
 }
 
@@ -2661,7 +2661,7 @@ static void search_start(SearchData *sd)
 
 static void search_start_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
        GtkTreeViewColumn *column;
        gchar *path;
        gchar *entry_text;
@@ -2829,7 +2829,7 @@ enum {
 
 static void search_thumb_toggle_cb(GtkWidget *button, gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        search_result_thumb_enable(sd, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
 }
@@ -2952,7 +2952,7 @@ static gboolean menu_choice_get_match_type(GtkWidget *combo, MatchType *type)
 
 static void menu_choice_path_cb(GtkWidget *combo, gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        if (!menu_choice_get_match_type(combo, &sd->search_type)) return;
 
@@ -2963,14 +2963,14 @@ static void menu_choice_path_cb(GtkWidget *combo, gpointer data)
 
 static void menu_choice_name_cb(GtkWidget *combo, gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        if (!menu_choice_get_match_type(combo, &sd->match_name)) return;
 }
 
 static void menu_choice_size_cb(GtkWidget *combo, gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        if (!menu_choice_get_match_type(combo, &sd->match_size)) return;
 
@@ -2980,7 +2980,7 @@ static void menu_choice_size_cb(GtkWidget *combo, gpointer data)
 
 static void menu_choice_rating_cb(GtkWidget *combo, gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        if (!menu_choice_get_match_type(combo, &sd->match_rating)) return;
 
@@ -2990,21 +2990,21 @@ static void menu_choice_rating_cb(GtkWidget *combo, gpointer data)
 
 static void menu_choice_class_cb(GtkWidget *combo, gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        if (!menu_choice_get_match_type(combo, &sd->match_class)) return;
 }
 
 static void menu_choice_marks_cb(GtkWidget *combo, gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        if (!menu_choice_get_match_type(combo, &sd->match_marks)) return;
 }
 
 static void menu_choice_date_cb(GtkWidget *combo, gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        if (!menu_choice_get_match_type(combo, &sd->match_date)) return;
 
@@ -3014,7 +3014,7 @@ static void menu_choice_date_cb(GtkWidget *combo, gpointer data)
 
 static void menu_choice_dimensions_cb(GtkWidget *combo, gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        if (!menu_choice_get_match_type(combo, &sd->match_dimensions)) return;
 
@@ -3024,14 +3024,14 @@ static void menu_choice_dimensions_cb(GtkWidget *combo, gpointer data)
 
 static void menu_choice_keyword_cb(GtkWidget *combo, gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        if (!menu_choice_get_match_type(combo, &sd->match_keywords)) return;
 }
 
 static void menu_choice_comment_cb(GtkWidget *combo, gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        if (!menu_choice_get_match_type(combo, &sd->match_comment)) return;
 }
@@ -3045,7 +3045,7 @@ static void menu_choice_spin_cb(GtkAdjustment *adjustment, gpointer data)
 
 static void menu_choice_gps_cb(GtkWidget *combo, gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        if (!menu_choice_get_match_type(combo, &sd->match_gps)) return;
 
@@ -3072,7 +3072,7 @@ static GtkWidget *menu_spin(GtkWidget *box, gdouble min, gdouble max, gint value
 
 static void menu_choice_check_cb(GtkWidget *button, gpointer data)
 {
-       GtkWidget *widget = (GtkWidget *)data;
+       GtkWidget *widget = static_cast<GtkWidget *>(data);
        gboolean active;
        gboolean *value;
 
@@ -3183,7 +3183,7 @@ static void search_window_close(SearchData *sd)
 
 static void search_window_close_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        search_window_close(sd);
 }
@@ -3195,7 +3195,7 @@ static void search_window_help_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(dat
 
 static gboolean search_window_delete_cb(GtkWidget *UNUSED(widget), GdkEventAny *UNUSED(event), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        search_window_close(sd);
        return TRUE;
@@ -3203,7 +3203,7 @@ static gboolean search_window_delete_cb(GtkWidget *UNUSED(widget), GdkEventAny *
 
 static void search_window_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        search_window_list = g_list_remove(search_window_list, sd);
 
@@ -3242,7 +3242,7 @@ static void select_collection_dialog_close_cb(FileDialog *fdlg, gpointer UNUSED(
 
 static void select_collection_dialog_ok_cb(FileDialog *fdlg, gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
        gchar *path;
        gchar *path_noext;
        gchar *collection;
@@ -3261,7 +3261,7 @@ static void select_collection_dialog_ok_cb(FileDialog *fdlg, gpointer data)
 
 static void select_collection_clicked_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
        FileDialog *fdlg;
        const gchar *title;
        const gchar *btntext;
@@ -3786,7 +3786,7 @@ static void search_result_change_path(SearchData *sd, FileData *fd)
 
 static void search_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-       SearchData *sd = (SearchData *)data;
+       SearchData *sd = static_cast<SearchData *>(data);
 
        if (!(type & NOTIFY_CHANGE) || !fd->change) return;
 
@@ -3813,7 +3813,7 @@ void mfd_list_free(GList *list)
        work = list;
        while (work)
                {
-               MatchFileData *mfd = (MatchFileData *)work->data;
+               MatchFileData *mfd = static_cast<MatchFileData *>(work->data);
                file_data_unref((FileData *)mfd->fd);
                work = work->next;
                }
index a6131b8..d2228ff 100644 (file)
@@ -46,7 +46,7 @@ struct _ShortcutsData
 
 static void shortcuts_bookmark_select(const gchar *path, gpointer data)
 {
-       ShortcutsData *scd = (ShortcutsData *)data;
+       ShortcutsData *scd = static_cast<ShortcutsData *>(data);
 
        if (file_extension_match(path, GQ_COLLECTION_EXT))
                {
@@ -68,7 +68,7 @@ static void shortcuts_add_close(ShortcutsData *scd)
 
 static void shortcuts_add_ok_cb(FileDialog *fd, gpointer data)
 {
-       ShortcutsData *scd = (ShortcutsData *)data;
+       ShortcutsData *scd = static_cast<ShortcutsData *>(data);
        const gchar *name = gtk_entry_get_text(GTK_ENTRY(scd->dialog_name_entry));
        gboolean empty_name = (name[0] == '\0');
 
@@ -86,14 +86,14 @@ static void shortcuts_add_ok_cb(FileDialog *fd, gpointer data)
 
 static void shortcuts_add_cancel_cb(FileDialog *UNUSED(fd), gpointer data)
 {
-       ShortcutsData *scd = (ShortcutsData *)data;
+       ShortcutsData *scd = static_cast<ShortcutsData *>(data);
 
        shortcuts_add_close(scd);
 }
 
 static void shortcuts_add_cb(GtkWidget *button, gpointer data)
 {
-       ShortcutsData *scd = (ShortcutsData *)data;
+       ShortcutsData *scd = static_cast<ShortcutsData *>(data);
        GtkWidget *hbox;
        const gchar *title;
 
@@ -127,7 +127,7 @@ static void shortcuts_add_cb(GtkWidget *button, gpointer data)
 
 static void shortcuts_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ShortcutsData *scd = (ShortcutsData *)data;
+       ShortcutsData *scd = static_cast<ShortcutsData *>(data);
 
        shortcuts_add_close(scd);
 
index 22d1584..3fac11a 100644 (file)
@@ -305,7 +305,7 @@ static void slideshow_timer_reset(SlideShowData *ss);
 
 static gboolean slideshow_loop_cb(gpointer data)
 {
-       SlideShowData *ss = (SlideShowData *)data;
+       SlideShowData *ss = static_cast<SlideShowData *>(data);
 
        if (ss->paused) return TRUE;
 
index 595aa9d..b5c0b18 100644 (file)
@@ -666,7 +666,7 @@ static gboolean thumb_loader_std_next_source(ThumbLoaderStd *tl, gboolean remove
 
 static void thumb_loader_std_done_cb(ImageLoader *il, gpointer data)
 {
-       ThumbLoaderStd *tl = (ThumbLoaderStd *)data;
+       ThumbLoaderStd *tl = static_cast<ThumbLoaderStd *>(data);
        GdkPixbuf *pixbuf;
 
        DEBUG_1("thumb image done: %s", tl->fd ? tl->fd->path : "???");
@@ -701,7 +701,7 @@ static void thumb_loader_std_done_cb(ImageLoader *il, gpointer data)
 
 static void thumb_loader_std_error_cb(ImageLoader *il, gpointer data)
 {
-       ThumbLoaderStd *tl = (ThumbLoaderStd *)data;
+       ThumbLoaderStd *tl = static_cast<ThumbLoaderStd *>(data);
 
        /* if at least some of the image is available, go to done */
        if (image_loader_get_pixbuf(tl->il) != NULL)
@@ -722,7 +722,7 @@ static void thumb_loader_std_error_cb(ImageLoader *il, gpointer data)
 
 static void thumb_loader_std_progress_cb(ImageLoader *UNUSED(il), gdouble percent, gpointer data)
 {
-       ThumbLoaderStd *tl = (ThumbLoaderStd *)data;
+       ThumbLoaderStd *tl = static_cast<ThumbLoaderStd *>(data);
 
        tl->progress = (gdouble)percent;
 
@@ -920,7 +920,7 @@ static void thumb_loader_std_thumb_file_validate_finish(ThumbValidate *tv, gbool
 
 static void thumb_loader_std_thumb_file_validate_done_cb(ThumbLoaderStd *UNUSED(tl), gpointer data)
 {
-       ThumbValidate *tv = (ThumbValidate *)data;
+       ThumbValidate *tv = static_cast<ThumbValidate *>(data);
        GdkPixbuf *pixbuf;
        gboolean valid = FALSE;
 
@@ -978,14 +978,14 @@ static void thumb_loader_std_thumb_file_validate_done_cb(ThumbLoaderStd *UNUSED(
 
 static void thumb_loader_std_thumb_file_validate_error_cb(ThumbLoaderStd *UNUSED(tl), gpointer data)
 {
-       ThumbValidate *tv = (ThumbValidate *)data;
+       ThumbValidate *tv = static_cast<ThumbValidate *>(data);
 
        thumb_loader_std_thumb_file_validate_finish(tv, FALSE);
 }
 
 static gboolean thumb_loader_std_thumb_file_validate_idle_cb(gpointer data)
 {
-       ThumbValidate *tv = (ThumbValidate *)data;
+       ThumbValidate *tv = static_cast<ThumbValidate *>(data);
 
        tv->idle_id = 0;
        thumb_loader_std_thumb_file_validate_finish(tv, FALSE);
@@ -1088,7 +1088,7 @@ static gboolean thumb_std_maint_move_idle(gpointer data);
 
 static void thumb_std_maint_move_validate_cb(const gchar *UNUSED(path), gboolean UNUSED(valid), gpointer data)
 {
-       TMaintMove *tm = (TMaintMove *)data;
+       TMaintMove *tm = static_cast<TMaintMove *>(data);
        GdkPixbuf *pixbuf;
 
        /* get the original thumbnail pixbuf (unrotated, with original options)
index c7912ff..fab80dc 100644 (file)
@@ -114,7 +114,7 @@ static gboolean thumb_loader_save_thumbnail(ThumbLoader *tl, gboolean mark_failu
 
 static void thumb_loader_percent_cb(ImageLoader *UNUSED(il), gdouble percent, gpointer data)
 {
-       ThumbLoader *tl = (ThumbLoader *)data;
+       ThumbLoader *tl = static_cast<ThumbLoader *>(data);
 
        tl->percent_done = percent;
 
@@ -129,7 +129,7 @@ static void thumb_loader_set_fallback(ThumbLoader *tl)
 
 static void thumb_loader_done_cb(ImageLoader *il, gpointer data)
 {
-       ThumbLoader *tl = (ThumbLoader *)data;
+       ThumbLoader *tl = static_cast<ThumbLoader *>(data);
        GdkPixbuf *pixbuf;
        gint pw, ph;
        gint save;
@@ -247,7 +247,7 @@ static void thumb_loader_done_cb(ImageLoader *il, gpointer data)
 
 static void thumb_loader_error_cb(ImageLoader *il, gpointer data)
 {
-       ThumbLoader *tl = (ThumbLoader *)data;
+       ThumbLoader *tl = static_cast<ThumbLoader *>(data);
 
        /* if at least some of the image is available, go to done_cb */
        if (image_loader_get_pixbuf(tl->il) != NULL)
@@ -268,7 +268,7 @@ static void thumb_loader_error_cb(ImageLoader *il, gpointer data)
 
 static gboolean thumb_loader_done_delay_cb(gpointer data)
 {
-       ThumbLoader *tl = (ThumbLoader *)data;
+       ThumbLoader *tl = static_cast<ThumbLoader *>(data);
 
        tl->idle_done_id = 0;
 
index e701646..9387b34 100644 (file)
@@ -161,7 +161,7 @@ static const UseableToolbarItems useable_toolbar_items[] = {
 static void toolbar_item_move(GtkWidget *UNUSED(widget), gpointer data,
                                                                        gboolean up, gboolean single_step)
 {
-       GtkWidget *list_item = (GtkWidget *)data;
+       GtkWidget *list_item = static_cast<GtkWidget *>(data);
        GtkWidget *box;
        gint pos = 0;
 
@@ -231,7 +231,7 @@ static void toolbar_menu_popup(GtkWidget *widget)
 
 static gboolean toolbar_press_cb(GtkGesture *UNUSED(gesture), int UNUSED(n_press), double UNUSED(x), double UNUSED(y), gpointer data)
 {
-       ToolbarButtonData *button_data = (ToolbarButtonData *)data;
+       ToolbarButtonData *button_data = static_cast<ToolbarButtonData *>(data);
 
        toolbar_menu_popup(button_data->button);
 
@@ -350,7 +350,7 @@ 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");
-       ToolbarData *tbbd = (ToolbarData *)data;
+       ToolbarData *tbbd = static_cast<ToolbarData *>(data);
 
        toolbarlist_add_button(name, label, stock_id, GTK_BOX(tbbd->vbox));
 }
@@ -366,7 +366,7 @@ static void get_desktop_data(const gchar *name, gchar **label, gchar **stock_id)
        work = editors_list;
        while (work)
                {
-               const EditorDescription *editor = (const EditorDescription *)work->data;
+               const EditorDescription *editor = static_cast<const EditorDescription *>(work->data);
 
                if (g_strcmp0(name, editor->key) == 0)
                        {
@@ -384,7 +384,7 @@ static void toolbar_menu_add_popup(GtkWidget *UNUSED(widget), gpointer data)
        GtkWidget *menu;
        GList *editors_list;
        GList *work;
-       ToolbarData *toolbarlist = (ToolbarData *)data;
+       ToolbarData *toolbarlist = static_cast<ToolbarData *>(data);
        const UseableToolbarItems *list = useable_toolbar_items;
 
        menu = popup_menu_short_lived();
@@ -407,7 +407,7 @@ static void toolbar_menu_add_popup(GtkWidget *UNUSED(widget), gpointer data)
        work = editors_list;
        while (work)
                {
-               const EditorDescription *editor = (const EditorDescription *)work->data;
+               const EditorDescription *editor = static_cast<const EditorDescription *>(work->data);
 
                GtkWidget *item;
                gchar *icon = g_strconcat(editor->icon, ".desktop", NULL);
@@ -427,7 +427,7 @@ static void toolbar_menu_add_popup(GtkWidget *UNUSED(widget), gpointer data)
 
 static gboolean toolbar_menu_add_cb(GtkWidget *widget, gpointer data)
 {
-       ToolbarData *toolbarlist = (ToolbarData *)data;
+       ToolbarData *toolbarlist = static_cast<ToolbarData *>(data);
 
        toolbar_menu_add_popup(widget, toolbarlist);
        return TRUE;
index d4cdcd0..0c64c98 100644 (file)
@@ -199,7 +199,7 @@ static gchar *bookmark_string(const gchar *name, const gchar *path, const gchar
 
 static void bookmark_select_cb(GtkWidget *button, gpointer data)
 {
-       BookMarkData *bm = (BookMarkData *)data;
+       BookMarkData *bm = static_cast<BookMarkData *>(data);
        BookButtonData *b;
 
        b = g_object_get_data(G_OBJECT(button), "bookbuttondata");
@@ -210,7 +210,7 @@ static void bookmark_select_cb(GtkWidget *button, gpointer data)
 
 static void bookmark_edit_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       BookPropData *p = (BookPropData *)data;
+       BookPropData *p = static_cast<BookPropData *>(data);
 
        bookmark_free(p->bb);
        g_free(p);
@@ -222,7 +222,7 @@ static void bookmark_edit_cancel_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(d
 
 static void bookmark_edit_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       BookPropData *p = (BookPropData *)data;
+       BookPropData *p = static_cast<BookPropData *>(data);
        const gchar *name;
        gchar *path;
        const gchar *icon;
@@ -342,7 +342,7 @@ static void bookmark_move(BookMarkData *bm, GtkWidget *button, gint direction)
 
 static void bookmark_menu_prop_cb(GtkWidget *widget, gpointer data)
 {
-       BookMarkData *bm = (BookMarkData *)data;
+       BookMarkData *bm = static_cast<BookMarkData *>(data);
 
        if (!bm->active_button) return;
 
@@ -368,7 +368,7 @@ static void bookmark_menu_down_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void bookmark_menu_remove_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       BookMarkData *bm = (BookMarkData *)data;
+       BookMarkData *bm = static_cast<BookMarkData *>(data);
 
        if (!bm->active_button) return;
 
@@ -409,7 +409,7 @@ static void bookmark_menu_popup(BookMarkData *bm, GtkWidget *button,
 
 static gboolean bookmark_press_cb(GtkWidget *button, GdkEventButton *event, gpointer data)
 {
-       BookMarkData *bm = (BookMarkData *)data;
+       BookMarkData *bm = static_cast<BookMarkData *>(data);
 
        if (event->button != MOUSE_BUTTON_RIGHT) return FALSE;
 
@@ -420,7 +420,7 @@ static gboolean bookmark_press_cb(GtkWidget *button, GdkEventButton *event, gpoi
 
 static gboolean bookmark_keypress_cb(GtkWidget *button, GdkEventKey *event, gpointer data)
 {
-       BookMarkData *bm = (BookMarkData *)data;
+       BookMarkData *bm = static_cast<BookMarkData *>(data);
 
        switch (event->keyval)
                {
@@ -454,7 +454,7 @@ static void bookmark_drag_set_data(GtkWidget *button,
                                   GdkDragContext *context, GtkSelectionData *selection_data,
                                   guint UNUSED(info), guint UNUSED(time), gpointer data)
 {
-       BookMarkData *bm = (BookMarkData *)data;
+       BookMarkData *bm = static_cast<BookMarkData *>(data);
        BookButtonData *b;
        GList *list = NULL;
 
@@ -697,7 +697,7 @@ static void bookmark_dnd_get_data(GtkWidget *UNUSED(widget),
                                  GtkSelectionData *selection_data, guint UNUSED(info),
                                  guint UNUSED(time), gpointer data)
 {
-       BookMarkData *bm = (BookMarkData *)data;
+       BookMarkData *bm = static_cast<BookMarkData *>(data);
        GList *list = NULL;
        GList *errors = NULL;
        GList *work;
@@ -738,7 +738,7 @@ static void bookmark_dnd_get_data(GtkWidget *UNUSED(widget),
 
 static void bookmark_list_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
-       BookMarkData *bm = (BookMarkData *)data;
+       BookMarkData *bm = static_cast<BookMarkData *>(data);
 
        bookmark_widget_list = g_list_remove(bookmark_widget_list, bm);
 
@@ -886,7 +886,7 @@ struct _HistoryComboData
 
 static void history_combo_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
-       HistoryComboData *hc = (HistoryComboData *)data;
+       HistoryComboData *hc = static_cast<HistoryComboData *>(data);
 
        g_free(hc->history_key);
        g_free(data);
index 11dcdd4..de0c0e0 100644 (file)
@@ -1018,7 +1018,7 @@ struct _WebData
 static void web_file_async_ready_cb(GObject *source_object, GAsyncResult *res, gpointer data)
 {
        GError *error = NULL;
-       WebData *web = (WebData *)data;
+       WebData *web = static_cast<WebData *>(data);
        gchar *tmp_filename;
 
        if (!g_cancellable_is_cancelled(web->cancellable))
@@ -1045,7 +1045,7 @@ static void web_file_async_ready_cb(GObject *source_object, GAsyncResult *res, g
 
 static void web_file_progress_cb(goffset current_num_bytes, goffset total_num_bytes, gpointer data)
 {
-       WebData *web = (WebData *)data;
+       WebData *web = static_cast<WebData *>(data);
 
        if (!g_cancellable_is_cancelled(web->cancellable))
                {
@@ -1055,7 +1055,7 @@ static void web_file_progress_cb(goffset current_num_bytes, goffset total_num_by
 
 static void download_web_file_cancel_button_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       WebData *web = (WebData *)data;
+       WebData *web = static_cast<WebData *>(data);
 
        g_cancellable_cancel(web->cancellable);
 }
@@ -1063,7 +1063,7 @@ static void download_web_file_cancel_button_cb(GenericDialog *UNUSED(gd), gpoint
 gboolean download_web_file(const gchar *text, gboolean minimized, gpointer data)
 {
        gchar *scheme;
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        gchar *tmp_dir;
        GError *error = NULL;
        WebData *web;
index 4f96884..86ba50a 100644 (file)
@@ -151,7 +151,7 @@ static gboolean help_window_delete_cb(GtkWidget *widget, GdkEventAny *UNUSED(eve
 
 static void help_window_close(GtkWidget *UNUSED(widget), gpointer data)
 {
-       GtkWidget *window = (GtkWidget *)data;
+       GtkWidget *window = static_cast<GtkWidget *>(data);
        gtk_widget_destroy(window);
 }
 
index 92507fd..77c84e1 100644 (file)
@@ -361,7 +361,7 @@ GtkWidget *pref_checkbox_new_int(GtkWidget *parent_box, const gchar *text, gbool
 
 static void pref_checkbox_link_sensitivity_cb(GtkWidget *button, gpointer data)
 {
-       GtkWidget *widget = (GtkWidget *)data;
+       GtkWidget *widget = static_cast<GtkWidget *>(data);
 
        gtk_widget_set_sensitive(widget, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
 }
@@ -376,7 +376,7 @@ void pref_checkbox_link_sensitivity(GtkWidget *button, GtkWidget *widget)
 
 static void pref_checkbox_link_sensitivity_swap_cb(GtkWidget *button, gpointer data)
 {
-       GtkWidget *widget = (GtkWidget *)data;
+       GtkWidget *widget = static_cast<GtkWidget *>(data);
 
        gtk_widget_set_sensitive(widget, !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
 }
@@ -548,7 +548,7 @@ GtkWidget *pref_spin_new_int(GtkWidget *parent_box, const gchar *text, const gch
 
 static void pref_link_sensitivity_cb(GtkWidget *watch, GtkStateType UNUSED(prev_state), gpointer data)
 {
-       GtkWidget *widget = (GtkWidget *)data;
+       GtkWidget *widget = static_cast<GtkWidget *>(data);
 
        gtk_widget_set_sensitive(widget, gtk_widget_is_sensitive(watch));
 }
@@ -843,7 +843,7 @@ static void date_selection_popup_hide(DateSelection *ds)
 
 static gboolean date_selection_popup_release_cb(GtkWidget *UNUSED(widget), GdkEventButton *UNUSED(event), gpointer data)
 {
-       DateSelection *ds = (DateSelection *)data;
+       DateSelection *ds = static_cast<DateSelection *>(data);
 
        date_selection_popup_hide(ds);
        return TRUE;
@@ -851,7 +851,7 @@ static gboolean date_selection_popup_release_cb(GtkWidget *UNUSED(widget), GdkEv
 
 static gboolean date_selection_popup_press_cb(GtkWidget *UNUSED(widget), GdkEventButton *event, gpointer data)
 {
-       DateSelection *ds = (DateSelection *)data;
+       DateSelection *ds = static_cast<DateSelection *>(data);
        gint x, y;
        gint w, h;
        gint xr, yr;
@@ -885,7 +885,7 @@ static void date_selection_popup_sync(DateSelection *ds)
 
 static gboolean date_selection_popup_keypress_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
 {
-       DateSelection *ds = (DateSelection *)data;
+       DateSelection *ds = static_cast<DateSelection *>(data);
 
        switch (event->keyval)
                {
@@ -908,14 +908,14 @@ static gboolean date_selection_popup_keypress_cb(GtkWidget *UNUSED(widget), GdkE
 
 static void date_selection_day_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DateSelection *ds = (DateSelection *)data;
+       DateSelection *ds = static_cast<DateSelection *>(data);
 
        date_selection_popup_sync(ds);
 }
 
 static void date_selection_doubleclick_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DateSelection *ds = (DateSelection *)data;
+       DateSelection *ds = static_cast<DateSelection *>(data);
 
        date_selection_popup_hide(ds);
 }
@@ -982,7 +982,7 @@ static void date_selection_popup(DateSelection *ds)
 
 static void date_selection_button_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DateSelection *ds = (DateSelection *)data;
+       DateSelection *ds = static_cast<DateSelection *>(data);
 
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ds->button)) == (!ds->window))
                {
@@ -992,7 +992,7 @@ static void date_selection_button_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void button_size_allocate_cb(GtkWidget *button, GtkAllocation *allocation, gpointer data)
 {
-       GtkWidget *spin = (GtkWidget *)data;
+       GtkWidget *spin = static_cast<GtkWidget *>(data);
        GtkRequisition spin_requisition;
        gtk_widget_get_requisition(spin, &spin_requisition);
 
@@ -1020,7 +1020,7 @@ static void spin_increase(GtkWidget *spin, gint value)
 
 static void date_selection_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       DateSelection *ds = (DateSelection *)data;
+       DateSelection *ds = static_cast<DateSelection *>(data);
 
        date_selection_popup_hide(ds);
 
@@ -1314,7 +1314,7 @@ gboolean pref_list_int_get(const gchar *group, const gchar *key, gint *result)
 
 void pref_color_button_set_cb(GtkWidget *widget, gpointer data)
 {
-       GdkColor *color = (GdkColor *)data;
+       GdkColor *color = static_cast<GdkColor *>(data);
 
        gtk_color_button_get_color(GTK_COLOR_BUTTON(widget), color);
 }
@@ -1419,7 +1419,7 @@ gchar *text_widget_text_pull_selected(GtkWidget *text_widget)
 
 gboolean defined_mouse_buttons(GtkWidget *UNUSED(widget), GdkEventButton *event, gpointer data)
 {
-       LayoutWindow *lw = (LayoutWindow *)data;
+       LayoutWindow *lw = static_cast<LayoutWindow *>(data);
        GtkAction *action;
        gboolean ret = FALSE;
 
index e79d042..bea126b 100644 (file)
@@ -95,7 +95,7 @@ static void dest_view_delete_dlg_cancel(GenericDialog *gd, gpointer data);
 
 static void dest_free_data(GtkWidget *UNUSED(widget), gpointer data)
 {
-       Dest_Data *dd = (Dest_Data *)data;
+       Dest_Data *dd = static_cast<Dest_Data *>(data);
 
        if (dd->gd)
                {
@@ -398,7 +398,7 @@ static void dest_view_store_selection(Dest_Data *dd, GtkTreeView *view)
 
 static gint dest_view_rename_cb(TreeEditData *ted, const gchar *old_name, const gchar *new_name, gpointer data)
 {
-       Dest_Data *dd = (Dest_Data *)data;
+       Dest_Data *dd = static_cast<Dest_Data *>(data);
        GtkTreeModel *model;
        GtkTreeIter iter;
        gchar *buf;
@@ -466,7 +466,7 @@ static void dest_view_rename(Dest_Data *dd, GtkTreeView *view)
 
 static void dest_view_delete_dlg_cancel(GenericDialog *UNUSED(gd), gpointer data)
 {
-       DestDel_Data *dl = (DestDel_Data *)data;
+       DestDel_Data *dl = static_cast<DestDel_Data *>(data);
 
        dl->dd->gd = NULL;
        g_free(dl->path);
@@ -475,7 +475,7 @@ static void dest_view_delete_dlg_cancel(GenericDialog *UNUSED(gd), gpointer data
 
 static void dest_view_delete_dlg_ok_cb(GenericDialog *gd, gpointer data)
 {
-       DestDel_Data *dl = (DestDel_Data *)data;
+       DestDel_Data *dl = static_cast<DestDel_Data *>(data);
 
        if (!unlink_file(dl->path))
                {
@@ -554,31 +554,31 @@ static void dest_view_bookmark(Dest_Data *dd, GtkTreeView *view)
 
 static void dest_popup_dir_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       Dest_Data *dd = (Dest_Data *)data;
+       Dest_Data *dd = static_cast<Dest_Data *>(data);
        dest_view_rename(dd, GTK_TREE_VIEW(dd->d_view));
 }
 
 static void dest_popup_dir_bookmark_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       Dest_Data *dd = (Dest_Data *)data;
+       Dest_Data *dd = static_cast<Dest_Data *>(data);
        dest_view_bookmark(dd, GTK_TREE_VIEW(dd->d_view));
 }
 
 static void dest_popup_file_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       Dest_Data *dd = (Dest_Data *)data;
+       Dest_Data *dd = static_cast<Dest_Data *>(data);
        dest_view_rename(dd, GTK_TREE_VIEW(dd->f_view));
 }
 
 static void dest_popup_file_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       Dest_Data *dd = (Dest_Data *)data;
+       Dest_Data *dd = static_cast<Dest_Data *>(data);
        dest_view_delete(dd, GTK_TREE_VIEW(dd->f_view));
 }
 
 static void dest_popup_file_bookmark_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       Dest_Data *dd = (Dest_Data *)data;
+       Dest_Data *dd = static_cast<Dest_Data *>(data);
        dest_view_bookmark(dd, GTK_TREE_VIEW(dd->f_view));
 }
 
@@ -637,7 +637,7 @@ static gboolean dest_popup_menu(Dest_Data *dd, GtkTreeView *view,
 
 static gboolean dest_press_cb(GtkWidget *view, GdkEventButton *event, gpointer data)
 {
-       Dest_Data *dd = (Dest_Data *)data;
+       Dest_Data *dd = static_cast<Dest_Data *>(data);
        GtkTreePath *tpath;
        GtkTreeViewColumn *column;
        gint cell_x, cell_y;
@@ -666,7 +666,7 @@ static gboolean dest_press_cb(GtkWidget *view, GdkEventButton *event, gpointer d
 
 static gboolean dest_keypress_cb(GtkWidget *view, GdkEventKey *event, gpointer data)
 {
-       Dest_Data *dd = (Dest_Data *)data;
+       Dest_Data *dd = static_cast<Dest_Data *>(data);
 
        switch (event->keyval)
                {
@@ -706,7 +706,7 @@ static gboolean dest_keypress_cb(GtkWidget *view, GdkEventKey *event, gpointer d
 
 static void dest_new_dir_cb(GtkWidget *widget, gpointer data)
 {
-       Dest_Data *dd = (Dest_Data *)data;
+       Dest_Data *dd = static_cast<Dest_Data *>(data);
        gchar *path;
        GtkWidget *dialog_window;
 
@@ -766,7 +766,7 @@ static void dest_new_dir_cb(GtkWidget *widget, gpointer data)
 
 static void dest_select_cb(GtkTreeSelection *selection, gpointer data)
 {
-       Dest_Data *dd = (Dest_Data *)data;
+       Dest_Data *dd = static_cast<Dest_Data *>(data);
        GtkTreeView *view;
        GtkTreeModel *store;
        GtkTreeIter iter;
@@ -792,7 +792,7 @@ static void dest_select_cb(GtkTreeSelection *selection, gpointer data)
 
 static void dest_activate_cb(GtkWidget *view, GtkTreePath *tpath, GtkTreeViewColumn *UNUSED(column), gpointer data)
 {
-       Dest_Data *dd = (Dest_Data *)data;
+       Dest_Data *dd = static_cast<Dest_Data *>(data);
        GtkTreeModel *store;
        GtkTreeIter iter;
        gchar *path;
@@ -818,14 +818,14 @@ static void dest_activate_cb(GtkWidget *view, GtkTreePath *tpath, GtkTreeViewCol
 
 static void dest_home_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       Dest_Data *dd = (Dest_Data *)data;
+       Dest_Data *dd = static_cast<Dest_Data *>(data);
 
        dest_change_dir(dd, homedir(), (dd->f_view != NULL));
 }
 
 static void dest_show_hidden_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       Dest_Data *dd = (Dest_Data *)data;
+       Dest_Data *dd = static_cast<Dest_Data *>(data);
        gchar *buf;
 
        dd->show_hidden = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dd->hidden_button));
@@ -837,7 +837,7 @@ static void dest_show_hidden_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void dest_entry_changed_cb(GtkEditable *UNUSED(editable), gpointer data)
 {
-       Dest_Data *dd = (Dest_Data *)data;
+       Dest_Data *dd = static_cast<Dest_Data *>(data);
        const gchar *path;
        gchar *buf;
 
@@ -956,7 +956,7 @@ static void dest_filter_clear(Dest_Data *dd)
 
 static void dest_filter_changed_cb(GtkEditable *UNUSED(editable), gpointer data)
 {
-       Dest_Data *dd = (Dest_Data *)data;
+       Dest_Data *dd = static_cast<Dest_Data *>(data);
        GtkWidget *entry;
        const gchar *buf;
        gchar *path;
@@ -975,7 +975,7 @@ static void dest_filter_changed_cb(GtkEditable *UNUSED(editable), gpointer data)
 
 static void dest_bookmark_select_cb(const gchar *path, gpointer data)
 {
-       Dest_Data *dd = (Dest_Data *)data;
+       Dest_Data *dd = static_cast<Dest_Data *>(data);
 
        if (isdir(path))
                {
index 1b78568..7e675dd 100644 (file)
@@ -62,7 +62,7 @@ static void spinner_increment_frame(SpinnerData *sp)
 
 static gboolean spinner_loop_cb(gpointer data)
 {
-       SpinnerData *sp = (SpinnerData *)data;
+       SpinnerData *sp = static_cast<SpinnerData *>(data);
 
        if (sp->list) spinner_increment_frame(sp);
 
@@ -93,7 +93,7 @@ static void spinner_set_timeout(SpinnerData *sp, gint interval)
 
 static void spinner_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       SpinnerData *sp = (SpinnerData *)data;
+       SpinnerData *sp = static_cast<SpinnerData *>(data);
        GList *work;
 
        spinner_set_timeout(sp, 0);
@@ -101,7 +101,7 @@ static void spinner_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
        work = sp->list;
        while (work)
                {
-               GdkPixbuf *pb = (GdkPixbuf *)work->data;
+               GdkPixbuf *pb = static_cast<GdkPixbuf *>(work->data);
                work = work->next;
 
                g_object_unref(pb);
index eb82140..8762906 100644 (file)
@@ -153,7 +153,7 @@ static void tab_completion_read_dir(TabCompData *td, const gchar *path)
 
 static void tab_completion_destroy(GtkWidget *UNUSED(widget), gpointer data)
 {
-       TabCompData *td = (TabCompData *)data;
+       TabCompData *td = static_cast<TabCompData *>(data);
 
        tab_completion_free_list(td);
        g_free(td->history_key);
@@ -208,7 +208,7 @@ static void tab_completion_emit_tab_signal(TabCompData *td)
 #ifdef TAB_COMPLETION_ENABLE_POPUP_MENU
 void tab_completion_iter_menu_items(GtkWidget *widget, gpointer data)
 {
-       TabCompData *td = (TabCompData *)data;
+       TabCompData *td = static_cast<TabCompData *>(data);
        GtkWidget *child;
 
        if (!gtk_widget_get_visible(widget)) return;
@@ -235,7 +235,7 @@ void tab_completion_iter_menu_items(GtkWidget *widget, gpointer data)
 
 static gboolean tab_completion_popup_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       TabCompData *td = (TabCompData *)data;
+       TabCompData *td = static_cast<TabCompData *>(data);
 
        if (event->keyval == GDK_KEY_Tab ||
            event->keyval == GDK_KEY_BackSpace ||
@@ -532,7 +532,7 @@ static gboolean tab_completion_do(TabCompData *td)
 
 static gboolean tab_completion_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       TabCompData *td = (TabCompData *)data;
+       TabCompData *td = static_cast<TabCompData *>(data);
        gboolean stop_signal = FALSE;
 
        switch (event->keyval)
@@ -571,7 +571,7 @@ static gboolean tab_completion_key_pressed(GtkWidget *widget, GdkEventKey *event
 static void tab_completion_button_pressed(GtkWidget *UNUSED(widget), gpointer data)
 {
        TabCompData *td;
-       GtkWidget *entry = (GtkWidget *)data;
+       GtkWidget *entry = static_cast<GtkWidget *>(data);
 
        td = g_object_get_data(G_OBJECT(entry), "tab_completion_data");
 
@@ -590,7 +590,7 @@ static void tab_completion_button_pressed(GtkWidget *UNUSED(widget), gpointer da
 
 static void tab_completion_button_size_allocate(GtkWidget *button, GtkAllocation *allocation, gpointer data)
 {
-       GtkWidget *parent = (GtkWidget *)data;
+       GtkWidget *parent = static_cast<GtkWidget *>(data);
        GtkAllocation parent_allocation;
        gtk_widget_get_allocation(parent, &parent_allocation);
 
@@ -824,7 +824,7 @@ gchar *remove_trailing_slash(const gchar *path)
 
 static void tab_completion_select_cancel_cb(FileDialog *fd, gpointer data)
 {
-       TabCompData *td = (TabCompData *)data;
+       TabCompData *td = static_cast<TabCompData *>(data);
 
        td->fd = NULL;
        file_dialog_close(fd);
@@ -832,7 +832,7 @@ static void tab_completion_select_cancel_cb(FileDialog *fd, gpointer data)
 
 static void tab_completion_select_ok_cb(FileDialog *fd, gpointer data)
 {
-       TabCompData *td = (TabCompData *)data;
+       TabCompData *td = static_cast<TabCompData *>(data);
 
        gtk_entry_set_text(GTK_ENTRY(td->entry), gtk_entry_get_text(GTK_ENTRY(fd->entry)));
 
@@ -895,7 +895,7 @@ static void tab_completion_select_show(TabCompData *td)
 
 static void tab_completion_select_pressed(GtkWidget *UNUSED(widget), gpointer data)
 {
-       TabCompData *td = (TabCompData *)data;
+       TabCompData *td = static_cast<TabCompData *>(data);
 
        tab_completion_select_show(td);
 }
index 3c313d8..a0792d2 100644 (file)
@@ -63,7 +63,7 @@ static void tree_edit_do(TreeEditData *ted)
 
 static gboolean tree_edit_click_end_cb(GtkWidget *UNUSED(widget), GdkEventButton *UNUSED(event), gpointer data)
 {
-       TreeEditData *ted = (TreeEditData *)data;
+       TreeEditData *ted = static_cast<TreeEditData *>(data);
 
        tree_edit_do(ted);
        tree_edit_close(ted);
@@ -73,7 +73,7 @@ static gboolean tree_edit_click_end_cb(GtkWidget *UNUSED(widget), GdkEventButton
 
 static gboolean tree_edit_click_cb(GtkWidget *UNUSED(widget), GdkEventButton *event, gpointer data)
 {
-       TreeEditData *ted = (TreeEditData *)data;
+       TreeEditData *ted = static_cast<TreeEditData *>(data);
        GdkWindow *window = gtk_widget_get_window(ted->window);
 
        gint x, y;
@@ -100,7 +100,7 @@ static gboolean tree_edit_click_cb(GtkWidget *UNUSED(widget), GdkEventButton *ev
 
 static gboolean tree_edit_key_press_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
 {
-       TreeEditData *ted = (TreeEditData *)data;
+       TreeEditData *ted = static_cast<TreeEditData *>(data);
 
        switch (event->keyval)
                {
@@ -130,7 +130,7 @@ static gboolean tree_edit_key_press_cb(GtkWidget *UNUSED(widget), GdkEventKey *e
 
 static gboolean tree_edit_by_path_idle_cb(gpointer data)
 {
-       TreeEditData *ted = (TreeEditData *)data;
+       TreeEditData *ted = static_cast<TreeEditData *>(data);
        GdkRectangle rect;
        gint x, y, w, h;        /* geometry of cell within tree */
        gint wx, wy;            /* geometry of tree from root window */
@@ -555,7 +555,7 @@ void widget_auto_scroll_stop(GtkWidget *widget)
 
 static gboolean widget_auto_scroll_cb(gpointer data)
 {
-       AutoScrollData *sd = (AutoScrollData *)data;
+       AutoScrollData *sd = static_cast<AutoScrollData *>(data);
        GdkWindow *window;
        gint x, y;
        gint w, h;
index c627f0e..731fd26 100644 (file)
@@ -58,7 +58,7 @@ static void generic_dialog_save_window(const gchar *title, const gchar *role, gi
        work = g_list_first(dialog_windows);
        while (work)
                {
-               DialogWindow *dw = (DialogWindow *)work->data;
+               DialogWindow *dw = static_cast<DialogWindow *>(work->data);
                if (g_strcmp0(dw->title ,title) == 0 && g_strcmp0(dw->role, role) == 0)
                        {
                        dw->x = x;
@@ -88,7 +88,7 @@ static gboolean generic_dialog_find_window(const gchar *title, const gchar *role
        work = g_list_first(dialog_windows);
        while (work)
                {
-               DialogWindow *dw = (DialogWindow *)work->data;
+               DialogWindow *dw = static_cast<DialogWindow *>(work->data);
 
                if (g_strcmp0(dw->title,title) == 0 && g_strcmp0(dw->role, role) == 0)
                        {
@@ -132,7 +132,7 @@ void generic_dialog_close(GenericDialog *gd)
 
 static void generic_dialog_click_cb(GtkWidget *widget, gpointer data)
 {
-       GenericDialog *gd = (GenericDialog *)data;
+       GenericDialog *gd = static_cast<GenericDialog *>(data);
        void (*func)(GenericDialog *, gpointer);
        gboolean auto_close;
 
@@ -145,7 +145,7 @@ static void generic_dialog_click_cb(GtkWidget *widget, gpointer data)
 
 static gboolean generic_dialog_default_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       GenericDialog *gd = (GenericDialog *)data;
+       GenericDialog *gd = static_cast<GenericDialog *>(data);
 
        if (event->keyval == GDK_KEY_Return && gtk_widget_has_focus(widget)
            && gd->default_cb)
@@ -170,7 +170,7 @@ void generic_dialog_attach_default(GenericDialog *gd, GtkWidget *widget)
 
 static gboolean generic_dialog_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       GenericDialog *gd = (GenericDialog *)data;
+       GenericDialog *gd = static_cast<GenericDialog *>(data);
        gboolean auto_close = gd->auto_close;
 
        if (event->keyval == GDK_KEY_Escape)
@@ -191,7 +191,7 @@ static gboolean generic_dialog_key_press_cb(GtkWidget *widget, GdkEventKey *even
 
 static gboolean generic_dialog_delete_cb(GtkWidget *UNUSED(w), GdkEventAny *UNUSED(event), gpointer data)
 {
-       GenericDialog *gd = (GenericDialog *)data;
+       GenericDialog *gd = static_cast<GenericDialog *>(data);
        gboolean auto_close;
 
        auto_close = gd->auto_close;
@@ -204,7 +204,7 @@ static gboolean generic_dialog_delete_cb(GtkWidget *UNUSED(w), GdkEventAny *UNUS
 
 static void generic_dialog_show_cb(GtkWidget *widget, gpointer data)
 {
-       GenericDialog *gd = (GenericDialog *)data;
+       GenericDialog *gd = static_cast<GenericDialog *>(data);
        if (gd->cancel_button)
                {
                gtk_box_reorder_child(GTK_BOX(gd->hbox), gd->cancel_button, -1);
@@ -361,7 +361,7 @@ void generic_dialog_windows_write_config(GString *outstr, gint indent)
                work = g_list_first(dialog_windows);
                while (work)
                        {
-                       DialogWindow *dw = (DialogWindow *)work->data;
+                       DialogWindow *dw = static_cast<DialogWindow *>(work->data);
                        WRITE_NL(); WRITE_STRING("<window ");
                        write_char_option(outstr, indent + 1, "title", dw->title);
                        write_char_option(outstr, indent + 1, "role", dw->role);
@@ -740,14 +740,14 @@ GtkWidget *file_dialog_add_button(FileDialog *fdlg, const gchar *stock_id, const
 
 static void file_dialog_entry_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       FileDialog *fdlg = (FileDialog *)data;
+       FileDialog *fdlg = static_cast<FileDialog *>(data);
        g_free(fdlg->dest_path);
        fdlg->dest_path = remove_trailing_slash(gtk_entry_get_text(GTK_ENTRY(fdlg->entry)));
 }
 
 static void file_dialog_entry_enter_cb(const gchar *UNUSED(path), gpointer data)
 {
-       GenericDialog *gd = (GenericDialog *)data;
+       GenericDialog *gd = static_cast<GenericDialog *>(data);
 
        file_dialog_entry_cb(NULL, data);
 
index 659cb45..04355ed 100644 (file)
@@ -556,7 +556,7 @@ static gint file_util_perform_ci_cb(gpointer resume_data, EditorFlags flags, GLi
 
 static void file_util_resume_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
        if (ud->external)
                editor_resume(ud->resume_data);
        else
@@ -565,7 +565,7 @@ static void file_util_resume_cb(GenericDialog *UNUSED(gd), gpointer data)
 
 static void file_util_abort_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
        if (ud->external)
                editor_skip(ud->resume_data);
        else
@@ -576,7 +576,7 @@ static void file_util_abort_cb(GenericDialog *UNUSED(gd), gpointer data)
 
 static gint file_util_perform_ci_cb(gpointer resume_data, EditorFlags flags, GList *list, gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
        gint ret = EDITOR_CB_CONTINUE;
 
        ud->resume_data = resume_data;
@@ -663,7 +663,7 @@ static gint file_util_perform_ci_cb(gpointer resume_data, EditorFlags flags, GLi
 
 static gboolean file_util_perform_ci_internal(gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
 
        if (!ud->perform_idle_id)
                {
@@ -863,7 +863,7 @@ static void file_util_perform_ci_dir(UtilityData *ud, gboolean internal, gboolea
 
 static gint file_util_perform_ci_dir_cb(gpointer UNUSED(resume_data), EditorFlags flags, GList *UNUSED(list), gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
        file_util_perform_ci_dir(ud, FALSE, !EDITOR_ERRORS_BUT_SKIPPED(flags));
        return EDITOR_CB_CONTINUE; /* does not matter, there was just single directory */
 }
@@ -987,14 +987,14 @@ static GdkPixbuf *file_util_get_error_icon(FileData *fd, GList *list, GtkWidget
 
 static void file_util_check_resume_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
        ud->phase = UTILITY_PHASE_CHECKED;
        file_util_dialog_run(ud);
 }
 
 static void file_util_check_abort_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
        ud->phase = UTILITY_PHASE_START;
        file_util_dialog_run(ud);
 }
@@ -1078,7 +1078,7 @@ void file_util_check_ci(UtilityData *ud)
 
 static void file_util_cancel_cb(GenericDialog *gd, gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
 
        generic_dialog_close(gd);
 
@@ -1090,7 +1090,7 @@ static void file_util_cancel_cb(GenericDialog *gd, gpointer data)
 
 static void file_util_discard_cb(GenericDialog *gd, gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
 
        generic_dialog_close(gd);
 
@@ -1102,7 +1102,7 @@ static void file_util_discard_cb(GenericDialog *gd, gpointer data)
 
 static void file_util_ok_cb(GenericDialog *gd, gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
 
        generic_dialog_close(gd);
 
@@ -1113,7 +1113,7 @@ static void file_util_ok_cb(GenericDialog *gd, gpointer data)
 
 static void file_util_fdlg_cancel_cb(FileDialog *fdlg, gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
 
        file_dialog_close(fdlg);
 
@@ -1156,7 +1156,7 @@ static void file_util_dest_folder_update_path(UtilityData *ud)
 
 static void file_util_fdlg_rename_cb(FileDialog *fdlg, gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
        gchar *desc = NULL;
        GenericDialog *d = NULL;
 
@@ -1192,7 +1192,7 @@ static void file_util_fdlg_rename_cb(FileDialog *fdlg, gpointer data)
 
 static void file_util_fdlg_ok_cb(FileDialog *fdlg, gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
 
        file_util_dest_folder_update_path(ud);
        if (isdir(ud->dest_path)) file_dialog_sync_history(fdlg, TRUE);
@@ -1208,7 +1208,7 @@ static void file_util_fdlg_ok_cb(FileDialog *fdlg, gpointer data)
 
 static void file_util_dest_folder_entry_cb(GtkWidget *UNUSED(entry), gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
        file_util_dest_folder_update_path(ud);
 }
 
@@ -1429,19 +1429,19 @@ static void file_util_rename_preview_update(UtilityData *ud)
 
 static void file_util_rename_preview_entry_cb(GtkWidget *UNUSED(entry), gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
        file_util_rename_preview_update(ud);
 }
 
 static void file_util_rename_preview_adj_cb(GtkWidget *UNUSED(spin), gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
        file_util_rename_preview_update(ud);
 }
 
 static gboolean file_util_rename_idle_cb(gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
 
        file_util_rename_preview_update(ud);
 
@@ -1452,7 +1452,7 @@ static gboolean file_util_rename_idle_cb(gpointer data)
 static void file_util_rename_preview_order_cb(GtkTreeModel *UNUSED(treemodel), GtkTreePath *UNUSED(tpath),
                                              GtkTreeIter *UNUSED(iter), gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
 
        if (ud->update_idle_id) return;
 
@@ -1464,7 +1464,7 @@ static gboolean file_util_preview_cb(GtkTreeSelection *UNUSED(selection), GtkTre
                                     GtkTreePath *tpath, gboolean path_currently_selected,
                                     gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
        GtkTreeIter iter;
        FileData *fd = NULL;
 
@@ -1509,7 +1509,7 @@ static void box_append_safe_delete_status(GenericDialog *gd)
 
 static void file_util_details_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
        if (ud->details_func && ud->sel_fd)
                {
                ud->details_func(ud, ud->sel_fd);
@@ -1808,7 +1808,7 @@ static void file_util_finalize_all(UtilityData *ud)
 
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
                if (ud->phase == UTILITY_PHASE_DONE) ud->finalize_func(fd);
                else if (ud->phase == UTILITY_PHASE_DISCARD) ud->discard_func(fd);
@@ -1942,7 +1942,7 @@ static void file_util_details_dialog_close_cb(GtkWidget *UNUSED(widget), gpointe
 
 static void file_util_details_dialog_destroy_cb(GtkWidget *widget, gpointer data)
 {
-       UtilityData *ud = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
        g_signal_handlers_disconnect_by_func(ud->gd->dialog, (gpointer)(file_util_details_dialog_close_cb), widget);
 }
 
@@ -1954,7 +1954,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 = (UtilityData *)data;
+       UtilityData *ud = static_cast<UtilityData *>(data);
        FileData *fd = g_object_get_data(G_OBJECT(gd->dialog), "file_data");
 
        if (!fd) return;
@@ -1996,7 +1996,7 @@ static gchar *file_util_details_get_message(UtilityData *ud, FileData *fd, const
 
                while (work)
                        {
-                       FileData *sfd = (FileData *)work->data;
+                       FileData *sfd = static_cast<FileData *>(work->data);
                        work =work->next;
                        g_string_append_printf(message, _(" '%s'\n"), sfd->path);
                        }
@@ -2162,7 +2162,7 @@ static void file_util_mark_ungrouped_files(GList *work)
 {
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                file_data_set_regroup_when_finished(fd, TRUE);
                work = work->next;
                }
@@ -2935,7 +2935,7 @@ static void file_util_create_dir_full(FileData *fd, const gchar *dest_path, GtkW
 
 static gboolean file_util_write_metadata_first_after_done(gpointer data)
 {
-       UtilityDelayData *dd = (UtilityDelayData *)data;
+       UtilityDelayData *dd = static_cast<UtilityDelayData *>(data);
 
        /* start the delayed operation with original arguments */
        switch (dd->type)
@@ -2958,7 +2958,7 @@ static gboolean file_util_write_metadata_first_after_done(gpointer data)
 
 static void file_util_write_metadata_first_done(gboolean success, const gchar *UNUSED(done_path), gpointer data)
 {
-       UtilityDelayData *dd = (UtilityDelayData *)data;
+       UtilityDelayData *dd = static_cast<UtilityDelayData *>(data);
 
        if (success)
                {
@@ -2983,7 +2983,7 @@ static gboolean file_util_write_metadata_first(UtilityType type, UtilityPhase ph
        work = flist;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                work = work->next;
 
                if (fd->change)
@@ -3272,7 +3272,7 @@ void file_util_copy_path_list_to_clipboard(GList *fd_list, gboolean quoted)
 
 static void new_folder_entry_activate_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       GtkDialog *dialog = (GtkDialog *)data;
+       GtkDialog *dialog = static_cast<GtkDialog *>(data);
 
        gtk_dialog_response(dialog, GTK_RESPONSE_ACCEPT);
 }
index b2a8575..f193440 100644 (file)
@@ -71,7 +71,7 @@ FileData *vdlist_row_by_path(ViewDir *vd, const gchar *path, gint *row)
        work = VDLIST(vd)->list;
        while (work)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                if (strcmp(fd->path, path) == 0)
                        {
                        if (row) *row = n;
@@ -340,7 +340,7 @@ gboolean vdlist_set_fd(ViewDir *vd, FileData *dir_fd)
        work = VDLIST(vd)->list;
        while (work && !found)
                {
-               FileData *fd = (FileData *)work->data;
+               FileData *fd = static_cast<FileData *>(work->data);
                if (!old_path || strcmp(old_path, fd->name) == 0) found = fd;
                work = work->next;
                }
@@ -359,7 +359,7 @@ void vdlist_refresh(ViewDir *vd)
 
 gboolean vdlist_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        GtkTreePath *tpath;
 
        if (event->keyval != GDK_KEY_Menu) return FALSE;
@@ -392,7 +392,7 @@ gboolean vdlist_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer dat
 
 gboolean vdlist_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        GtkTreePath *tpath;
        GtkTreeIter iter;
        FileData *fd = NULL;
@@ -426,7 +426,7 @@ gboolean vdlist_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer dat
 
 void vdlist_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
 
        vd_dnd_drop_scroll_cancel(vd);
        widget_auto_scroll_stop(vd->view);
index f4b5d75..a66e4e1 100644 (file)
@@ -182,7 +182,7 @@ static void vdtree_node_free(NodeData *nd)
 
 static gboolean vdtree_dnd_drop_expand_cb(gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        GtkTreeIter iter;
 
        if (vd->drop_fd && vd_find_row(vd, vd->drop_fd, &iter))
@@ -259,7 +259,7 @@ static void parts_list_free(GList *list)
        GList *work = list;
        while (work)
                {
-               PathData *pd = (PathData *)work->data;
+               PathData *pd = static_cast<PathData *>(work->data);
                g_free(pd->name);
                g_free(pd);
                work = work->next;
@@ -591,7 +591,7 @@ gboolean vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gboolean f
        work = old;
        while (work)
                {
-               NodeData *cnd = (NodeData *)work->data;
+               NodeData *cnd = static_cast<NodeData *>(work->data);
                work = work->next;
 
                if (vd->click_fd == cnd->fd) vd->click_fd = NULL;
@@ -633,7 +633,7 @@ FileData *vdtree_populate_path(ViewDir *vd, FileData *target_fd, gboolean expand
        work = list;
        while (work)
                {
-               PathData *pd = (PathData *)work->data;
+               PathData *pd = static_cast<PathData *>(work->data);
                if (pd->node == NULL)
                        {
                        PathData *parent_pd;
@@ -691,7 +691,7 @@ FileData *vdtree_populate_path(ViewDir *vd, FileData *target_fd, gboolean expand
        work = g_list_last(list);
        if (work)
                {
-               PathData *pd = (PathData *)work->data;
+               PathData *pd = static_cast<PathData *>(work->data);
                fd = pd->node;
                }
        parts_list_free(list);
@@ -783,7 +783,7 @@ const gchar *vdtree_row_get_path(ViewDir *UNUSED(vd), gint UNUSED(row))
 
 gboolean vdtree_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        GtkTreePath *tpath;
        GtkTreeIter iter;
        FileData *fd = NULL;
@@ -862,7 +862,7 @@ static gboolean vdtree_clicked_on_expander(GtkTreeView *treeview, GtkTreePath *t
 
 gboolean vdtree_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        GtkTreePath *tpath;
        GtkTreeViewColumn *column;
        GtkTreeIter iter;
@@ -925,7 +925,7 @@ gboolean vdtree_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer dat
 
 static void vdtree_row_expanded(GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *tpath, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        GtkTreeModel *store;
        NodeData *nd = NULL;
        FileData *fd;
@@ -951,7 +951,7 @@ static void vdtree_row_expanded(GtkTreeView *treeview, GtkTreeIter *iter, GtkTre
 
 static void vdtree_row_collapsed(GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *tpath, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        GtkTreeModel *store;
        NodeData *nd = NULL;
        FileData *fd;
@@ -1022,7 +1022,7 @@ static gboolean vdtree_destroy_node_cb(GtkTreeModel *store, GtkTreePath *UNUSED(
 
 void vdtree_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        GtkTreeModel *store;
 
        vdtree_dnd_drop_expand_cancel(vd);
index 6f4ec64..224822c 100644 (file)
@@ -80,7 +80,7 @@ static void vd_notify_cb(FileData *fd, NotifyType type, gpointer data);
 
 static void vd_destroy_cb(GtkWidget *widget, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
 
        file_data_unregister_notify_func(vd_notify_cb, vd);
 
@@ -251,7 +251,7 @@ FileData *vd_get_fd_from_tree_path(ViewDir *vd, GtkTreeView *tview, GtkTreePath
 
 static void vd_rename_finished_cb(gboolean success, const gchar *new_path, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        if (success)
                {
                FileData *fd = file_data_new_dir(new_path);
@@ -268,7 +268,7 @@ static void vd_rename_finished_cb(gboolean success, const gchar *new_path, gpoin
 
 static gboolean vd_rename_cb(TreeEditData *td, const gchar *UNUSED(old_name), const gchar *new_name, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        FileData *fd;
        gchar *new_path;
        gchar *base;
@@ -324,7 +324,7 @@ void vd_color_set(ViewDir *vd, FileData *fd, gint color_set)
 
 void vd_popup_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
 
        vd_color_set(vd, vd->click_fd, FALSE);
        vd->click_fd = NULL;
@@ -344,7 +344,7 @@ void vd_popup_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void vd_drop_menu_copy_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        const gchar *path;
        GList *list;
 
@@ -359,7 +359,7 @@ static void vd_drop_menu_copy_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void vd_drop_menu_move_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        const gchar *path;
        GList *list;
 
@@ -375,7 +375,7 @@ static void vd_drop_menu_move_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void vd_drop_menu_filter_cb(GtkWidget *widget, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        const gchar *path;
        GList *list;
        const gchar *key;
@@ -414,7 +414,7 @@ GtkWidget *vd_drop_menu(ViewDir *vd, gint active)
        while (work)
                {
                GtkWidget *item;
-               const EditorDescription *editor = (const EditorDescription *)work->data;
+               const EditorDescription *editor = static_cast<const EditorDescription *>(work->data);
                gchar *key;
                work = work->next;
 
@@ -440,7 +440,7 @@ GtkWidget *vd_drop_menu(ViewDir *vd, gint active)
 
 static void vd_pop_menu_up_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        gchar *path;
 
        if (!vd->dir_fd || strcmp(vd->dir_fd->path, G_DIR_SEPARATOR_S) == 0) return;
@@ -458,7 +458,7 @@ static void vd_pop_menu_up_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void vd_pop_menu_slide_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
 
        if (!vd->layout) return;
        if (!vd->click_fd) return;
@@ -471,7 +471,7 @@ static void vd_pop_menu_slide_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void vd_pop_menu_slide_rec_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        GList *list;
 
        if (!vd->layout) return;
@@ -508,19 +508,19 @@ static void vd_pop_menu_dupe(ViewDir *vd, gint recursive)
 
 static void vd_pop_menu_dupe_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        vd_pop_menu_dupe(vd, FALSE);
 }
 
 static void vd_pop_menu_dupe_rec_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        vd_pop_menu_dupe(vd, TRUE);
 }
 
 static void vd_pop_menu_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
 
        if (!vd->click_fd) return;
        file_util_delete_dir(vd->click_fd, vd->widget);
@@ -528,7 +528,7 @@ static void vd_pop_menu_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void vd_pop_menu_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
 
        if (!vd->click_fd) return;
 
@@ -537,7 +537,7 @@ static void vd_pop_menu_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void vd_pop_menu_copy_path_unquoted_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
 
        if (!vd->click_fd) return;
 
@@ -546,7 +546,7 @@ static void vd_pop_menu_copy_path_unquoted_cb(GtkWidget *UNUSED(widget), gpointe
 
 static void vd_pop_submenu_dir_view_as_cb(GtkWidget *widget, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
 
        DirViewType new_type = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "menu_item_radio_data"));
        layout_views_set(vd->layout, new_type, vd->layout->options.file_view_type);
@@ -554,14 +554,14 @@ static void vd_pop_submenu_dir_view_as_cb(GtkWidget *widget, gpointer data)
 
 static void vd_pop_menu_refresh_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
 
        if (vd->layout) layout_refresh(vd->layout);
 }
 
 static void vd_toggle_show_hidden_files_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
 
        options->file_filter.show_hidden_files = !options->file_filter.show_hidden_files;
        if (vd->layout) layout_refresh(vd->layout);
@@ -569,7 +569,7 @@ static void vd_toggle_show_hidden_files_cb(GtkWidget *UNUSED(widget), gpointer d
 
 static void vd_pop_menu_new_folder_cb(gboolean success, const gchar *new_path, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        FileData *fd = NULL;
        GtkTreeIter iter;
        GtkTreePath *tpath;
@@ -604,7 +604,7 @@ static void vd_pop_menu_new_folder_cb(gboolean success, const gchar *new_path, g
 
 static void vd_pop_menu_new_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        FileData *dir_fd = NULL;
 
        switch (vd->type)
@@ -628,14 +628,14 @@ static void vd_pop_menu_new_cb(GtkWidget *UNUSED(widget), gpointer data)
 
 static void vd_pop_menu_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
 
        vd_rename_by_data(vd, vd->click_fd);
 }
 
 static void vd_pop_menu_sort_ascend_cb(GtkWidget *widget, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        gboolean ascend;
 
        if (!vd) return;
@@ -805,7 +805,7 @@ static void vd_dnd_get(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context
                           GtkSelectionData *selection_data, guint info,
                           guint UNUSED(time), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        GList *list;
 
        if (!vd->click_fd) return;
@@ -823,7 +823,7 @@ static void vd_dnd_get(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context
 
 static void vd_dnd_begin(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
 
        vd_color_set(vd, vd->click_fd, TRUE);
        vd_dest_set(vd, FALSE);
@@ -831,7 +831,7 @@ static void vd_dnd_begin(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(conte
 
 static void vd_dnd_end(GtkWidget *UNUSED(widget), GdkDragContext *context, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
 
        vd_color_set(vd, vd->click_fd, FALSE);
 
@@ -847,7 +847,7 @@ static void vd_dnd_drop_receive(GtkWidget *widget,
                                GtkSelectionData *selection_data, guint info,
                                guint UNUSED(time), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        GtkTreePath *tpath;
        FileData *fd = NULL;
        GdkDragAction action = GDK_ACTION_ASK;
@@ -964,7 +964,7 @@ void vd_dnd_drop_scroll_cancel(ViewDir *vd)
 
 static gboolean vd_auto_scroll_idle_cb(gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        GdkSeat *seat;
        GdkDevice *device;
 
@@ -993,7 +993,7 @@ static gboolean vd_auto_scroll_idle_cb(gpointer data)
 
 static gboolean vd_auto_scroll_notify_cb(GtkWidget *UNUSED(widget), gint UNUSED(x), gint UNUSED(y), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
 
        if (!vd->drop_fd || vd->drop_list) return FALSE;
 
@@ -1005,7 +1005,7 @@ static gboolean vd_auto_scroll_notify_cb(GtkWidget *UNUSED(widget), gint UNUSED(
 static gboolean vd_dnd_drop_motion(GtkWidget *UNUSED(widget), GdkDragContext *context,
                                   gint x, gint y, guint time, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
 
        vd->click_fd = NULL;
 
@@ -1033,7 +1033,7 @@ static gboolean vd_dnd_drop_motion(GtkWidget *UNUSED(widget), GdkDragContext *co
 
 static void vd_dnd_drop_leave(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context), guint UNUSED(time), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
 
        if (vd->drop_fd != vd->click_fd) vd_color_set(vd, vd->drop_fd, FALSE);
 
@@ -1071,7 +1071,7 @@ void vd_dnd_init(ViewDir *vd)
 
 //void vd_menu_position_cb(GtkMenu *menu, gint *x, gint *y, gboolean *UNUSED(push_in), gpointer data)
 //{
-       //ViewDir *vd = (//ViewDir *)data;
+       //ViewDir *vd = static_cast<//ViewDir *>(data);
        //GtkTreeModel *store;
        //GtkTreeIter iter;
        //GtkTreePath *tpath;
@@ -1088,7 +1088,7 @@ void vd_dnd_init(ViewDir *vd)
 
 void vd_activate_cb(GtkTreeView *tview, GtkTreePath *tpath, GtkTreeViewColumn *UNUSED(column), gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        FileData *fd = vd_get_fd_from_tree_path(vd, tview, tpath);
 
        vd_select_row(vd, fd);
@@ -1115,7 +1115,7 @@ static GdkColor *vd_color_shifted(GtkWidget *widget)
 void vd_color_cb(GtkTreeViewColumn *UNUSED(tree_column), GtkCellRenderer *cell,
                 GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        gboolean set;
 
        gtk_tree_model_get(tree_model, iter, DIR_COLUMN_COLOR, &set, -1);
@@ -1126,7 +1126,7 @@ void vd_color_cb(GtkTreeViewColumn *UNUSED(tree_column), GtkCellRenderer *cell,
 
 gboolean vd_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        GtkTreePath *tpath;
        FileData *fd = NULL;
 
@@ -1161,7 +1161,7 @@ gboolean vd_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
 
 gboolean vd_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        gboolean ret = FALSE;
 
        switch (vd->type)
@@ -1175,7 +1175,7 @@ gboolean vd_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 
 gboolean vd_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        gboolean ret = FALSE;
        FileData *fd;
        GtkTreePath *tpath;
@@ -1224,7 +1224,7 @@ gboolean vd_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
 
 static void vd_notify_cb(FileData *fd, NotifyType type, gpointer data)
 {
-       ViewDir *vd = (ViewDir *)data;
+       ViewDir *vd = static_cast<ViewDir *>(data);
        gboolean refresh;
        gchar *base;
 
index 00d7b6e..59fc5db 100644 (file)
@@ -340,7 +340,7 @@ static void help_search_window_show_icon_press(GtkEntry *UNUSED(entry), GtkEntry
 
 static void help_search_window_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       HelpSearchData *hsd = (HelpSearchData *)data;
+       HelpSearchData *hsd = static_cast<HelpSearchData *>(data);
        gchar *search_command;
 
        search_command = g_strconcat(options->help_search_engine,
@@ -354,7 +354,7 @@ static void help_search_window_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
 
 static void help_search_window_cancel_cb(GenericDialog *UNUSED(gd), gpointer data)
 {
-       HelpSearchData *hsd = (HelpSearchData *)data;
+       HelpSearchData *hsd = static_cast<HelpSearchData *>(data);
 
        g_free(hsd);
 }