* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include <inttypes.h>
-
-#include "main.h"
#include "dupe.h"
+#include <sys/time.h>
+#include <sys/types.h>
+
+#include <cinttypes>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+
+#include <gdk/gdk.h>
+#include <gio/gio.h>
+#include <glib-object.h>
+
#include "cache.h"
#include "collect-table.h"
+#include "collect.h"
+#include "compat.h"
+#include "debug.h"
#include "dnd.h"
#include "filedata.h"
#include "history-list.h"
#include "image-load.h"
#include "img-view.h"
+#include "intl.h"
#include "layout-image.h"
#include "layout-util.h"
+#include "layout.h"
+#include "main-defines.h"
#include "md5-util.h"
#include "menu.h"
#include "misc.h"
-#include "pixbuf-util.h"
+#include "options.h"
#include "print.h"
+#include "similar.h"
#include "thumb.h"
+#include "typedefs.h"
#include "ui-fileops.h"
#include "ui-menu.h"
#include "ui-misc.h"
#include "ui-tree-edit.h"
+#include "ui-utildlg.h"
#include "uri-utils.h"
#include "utilops.h"
#include "window.h"
-#include <math.h>
-
-
-#define DUPE_DEF_WIDTH 800
-#define DUPE_DEF_HEIGHT 400
+enum {
+ DUPE_DEF_WIDTH = 800,
+ DUPE_DEF_HEIGHT = 400
+};
#define DUPE_PROGRESS_PULSE_STEP 0.0001
/** column assignment order (simply change them here)
DUPE_COLUMN_COUNT /**< total columns */
};
-typedef enum {
+enum DUPE_CHECK_RESULT {
DUPE_MATCH = 0,
DUPE_NO_MATCH,
DUPE_NAME_MATCH
-} DUPE_CHECK_RESULT;
+};
-typedef struct _DupeQueueItem DupeQueueItem;
/** Used for similarity checks. One for each item pushed
* onto the thread pool.
*/
-struct _DupeQueueItem
+struct DupeQueueItem
{
DupeItem *needle;
DupeWindow *dw;
gint index; /**< The order items pushed onto thread pool. Used to sort returned matches */
};
-typedef struct _DupeSearchMatch DupeSearchMatch;
/** Used for similarity checks thread. One for each pair match found.
*/
-struct _DupeSearchMatch
+struct DupeSearchMatch
{
DupeItem *a; /**< \a a / \a b matched pair found */
DupeItem *b; /**< \a a / \a b matched pair found */
};
static DupeMatchType param_match_mask;
-static GList *dupe_window_list = NULL; /**< list of open DupeWindow *s */
+static GList *dupe_window_list = nullptr; /**< list of open DupeWindow *s */
/*
* Well, after adding the 'compare two sets' option things got a little sloppy in here
{GDK_CONTROL_MASK, 'R', N_("Rename")},
{GDK_CONTROL_MASK, 'D', N_("Move to Trash")},
{GDK_SHIFT_MASK, GDK_KEY_Delete, N_("Delete")},
- {0, GDK_KEY_Delete, N_("Remove")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Delete, N_("Remove")},
{GDK_CONTROL_MASK, GDK_KEY_Delete, N_("Clear")},
{GDK_CONTROL_MASK, 'A', N_("Select all")},
- {GDK_CONTROL_MASK + GDK_SHIFT_MASK, 'A', N_("Select none")},
+ {static_cast<GdkModifierType>(GDK_CONTROL_MASK + GDK_SHIFT_MASK), 'A', N_("Select none")},
{GDK_CONTROL_MASK, 'T', N_("Toggle thumbs")},
{GDK_CONTROL_MASK, 'W', N_("Close window")},
- {0, GDK_KEY_Return, N_("View")},
- {0, 'V', N_("View in new window")},
- {0, 'C', N_("Collection from selection")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Return, N_("View")},
+ {static_cast<GdkModifierType>(0), 'V', N_("View in new window")},
+ {static_cast<GdkModifierType>(0), 'C', N_("Collection from selection")},
{GDK_CONTROL_MASK, 'L', N_("Append list")},
- {0, '0', N_("Select none")},
- {0, '1', N_("Select group 1 duplicates")},
- {0, '2', N_("Select group 2 duplicates")},
- {0, 0, NULL}
+ {static_cast<GdkModifierType>(0), '0', N_("Select none")},
+ {static_cast<GdkModifierType>(0), '1', N_("Select group 1 duplicates")},
+ {static_cast<GdkModifierType>(0), '2', N_("Select group 2 duplicates")},
+ {static_cast<GdkModifierType>(0), 0, nullptr}
};
/**
* @brief The function run in threads for similarity checks
* @param d1 #DupeQueueItem
* @param d2 #DupeWindow
- *
+ *
* Used only for similarity checks.\n
* Search \a dqi->list for \a dqi->needle and if a match is
* found, create a #DupeSearchMatch and add to \a dw->search_matches list\n
*/
static void dupe_comparison_func(gpointer d1, gpointer d2)
{
- DupeQueueItem *dqi = static_cast<DupeQueueItem *>(d1);
- DupeWindow *dw = static_cast<DupeWindow *>(d2);
+ auto dqi = static_cast<DupeQueueItem *>(d1);
+ auto dw = static_cast<DupeWindow *>(d2);
DupeSearchMatch *dsm;
DupeItem *di;
- GList *matches = NULL;
+ GList *matches = nullptr;
gdouble rank = 0;
if (!dw->abort)
/**
* @brief Update display of status label
- * @param dw
- * @param count_only
- *
- *
+ * @param dw
+ * @param count_only
+ *
+ *
*/
static void dupe_window_update_count(DupeWindow *dw, gboolean count_only)
{
/**
* @brief Returns time in µsec since Epoch
- * @returns
- *
- *
+ * @returns
+ *
+ *
*/
-static guint64 msec_time(void)
+static guint64 msec_time()
{
struct timeval tv;
- if (gettimeofday(&tv, NULL) == -1) return 0;
+ if (gettimeofday(&tv, nullptr) == -1) return 0;
- return (guint64)tv.tv_sec * 1000000 + (guint64)tv.tv_usec;
+ return static_cast<guint64>(tv.tv_sec) * 1000000 + static_cast<guint64>(tv.tv_usec);
}
static gint dupe_iterations(gint n)
}
/**
- * @brief
- * @param dw
- * @param status
- * @param value
- * @param force
- *
+ * @brief
+ * @param dw
+ * @param status
+ * @param value
+ * @param force
+ *
* If \a status is blank, clear status bar text and set progress to zero. \n
- * If \a force is not set, after 2 secs has elapsed, update time-to-go every 250 ms.
+ * If \a force is not set, after 2 secs has elapsed, update time-to-go every 250 ms.
*/
static void dupe_window_update_progress(DupeWindow *dw, const gchar *status, gdouble value, gboolean force)
{
d = dw->setup_count - dw->setup_n;
}
- rem = (t - d) ? ((gdouble)(dw->setup_time_count / 1000000) / (t - d)) * d : 0;
+ rem = (t - d) ? (static_cast<gdouble>(dw->setup_time_count / 1000000.0) / (t - d)) * d : 0;
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(dw->extra_label), value);
return;
}
- else if (force ||
+
+ if (force ||
value == 0.0 ||
dw->setup_count == 0 ||
dw->setup_time_count == 0 ||
}
else
{
- status_text = NULL;
+ status_text = nullptr;
}
}
else
static void widget_set_cursor(GtkWidget *widget, gint icon)
{
GdkCursor *cursor;
+ GdkDisplay *display;
if (!gtk_widget_get_window(widget)) return;
if (icon == -1)
{
- cursor = NULL;
+ cursor = nullptr;
}
else
{
- cursor = gdk_cursor_new(icon);
+ display = gdk_display_get_default();
+ cursor = gdk_cursor_new_for_display(display, static_cast<GdkCursorType>(icon));
}
gdk_window_set_cursor(gtk_widget_get_window(widget), cursor);
GtkTreeModel *store;
GtkTreeIter iter;
gboolean color_set = TRUE;
- DupeItem *parent = NULL;
+ DupeItem *parent = nullptr;
gboolean valid;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(dw->listview));
g_free(di);
}
-static void dupe_list_free(GList *list)
-{
- GList *work = list;
- while (work)
- {
- DupeItem *di = static_cast<DupeItem *>(work->data);
- work = work->next;
- dupe_item_free(di);
- }
- g_list_free(list);
-}
-
-/*
-static DupeItem *dupe_item_find_fd_by_list(FileData *fd, GList *work)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+static DupeItem *dupe_item_find_fd_by_list_unused(FileData *fd, GList *work)
{
while (work)
{
- DupeItem *di = static_cast<DupeItem *>(work->data);
+ auto *di = static_cast<DupeItem *>(work->data);
if (di->fd == fd) return di;
work = work->next;
}
- return NULL;
+ return nullptr;
}
-*/
-/*
-static DupeItem *dupe_item_find_fd(DupeWindow *dw, FileData *fd)
+static DupeItem *dupe_item_find_fd_unused(DupeWindow *dw, FileData *fd)
{
DupeItem *di;
- di = dupe_item_find_fd_by_list(fd, dw->list);
- if (!di && dw->second_set) di = dupe_item_find_fd_by_list(fd, dw->second_list);
+ di = dupe_item_find_fd_by_list_unused(fd, dw->list);
+ if (!di && dw->second_set) di = dupe_item_find_fd_by_list_unused(fd, dw->second_list);
return di;
}
-*/
-/*
-static DupeItem *dupe_item_find_path_by_list(const gchar *path, GList *work)
+static DupeItem *dupe_item_find_path_by_list_unused(const gchar *path, GList *work)
{
while (work)
{
- DupeItem *di = static_cast<DupeItem *>(work->data);
+ auto *di = static_cast<DupeItem *>(work->data);
if (strcmp(di->fd->path, path) == 0) return di;
work = work->next;
}
- return NULL;
+ return nullptr;
}
-*/
-/*
-static DupeItem *dupe_item_find_path(DupeWindow *dw, const gchar *path)
+static DupeItem *dupe_item_find_path_unused(DupeWindow *dw, const gchar *path)
{
DupeItem *di;
- di = dupe_item_find_path_by_list(path, dw->list);
- if (!di && dw->second_set) di = dupe_item_find_path_by_list(path, dw->second_list);
+ di = dupe_item_find_path_by_list_unused(path, dw->list);
+ if (!di && dw->second_set) di = dupe_item_find_path_by_list_unused(path, dw->second_list);
return di;
}
-*/
+#pragma GCC diagnostic pop
/*
* ------------------------------------------------------------------
if (!di->simd && cd->sim)
{
di->simd = cd->sim;
- cd->sim = NULL;
+ cd->sim = nullptr;
}
if (di->width == 0 && di->height == 0 && cd->dimensions)
{
CacheData *cd;
cd = cache_sim_data_new();
- cd->path = cache_get_location(CACHE_TYPE_SIM, di->fd->path, TRUE, NULL);
+ cd->path = cache_get_location(CACHE_TYPE_SIM, di->fd->path, TRUE, nullptr);
if (di->width != 0) cache_sim_data_set_dimensions(cd, di->width, di->height);
if (di->md5sum)
if (child->group)
{
dm = static_cast<DupeMatch *>(child->group->data);
- rank = (gint)floor(dm->rank);
+ rank = static_cast<gint>(floor(dm->rank));
}
else
{
text[DUPE_COLUMN_RANK] = g_strdup_printf("%d%s", rank, (di->second) ? " (2)" : "");
}
- text[DUPE_COLUMN_THUMB] = "";
- text[DUPE_COLUMN_NAME] = (gchar *)di->fd->name;
+ text[DUPE_COLUMN_THUMB] = nullptr;
+ text[DUPE_COLUMN_NAME] = const_cast<gchar *>(di->fd->name);
text[DUPE_COLUMN_SIZE] = text_from_size(di->fd->size);
- text[DUPE_COLUMN_DATE] = (gchar *)text_from_time(di->fd->date);
+ text[DUPE_COLUMN_DATE] = const_cast<gchar *>(text_from_time(di->fd->date));
if (di->width > 0 && di->height > 0)
{
text[DUPE_COLUMN_DIMENSIONS] = g_strdup_printf("%d x %d", di->width, di->height);
text[DUPE_COLUMN_DIMENSIONS] = g_strdup("");
}
text[DUPE_COLUMN_PATH] = di->fd->path;
- text[DUPE_COLUMN_COLOR] = NULL;
+ text[DUPE_COLUMN_COLOR] = nullptr;
gtk_list_store_insert(store, &iter, row);
gtk_list_store_set(store, &iter,
work = g_list_last(dw->dupes);
while (work)
{
- DupeItem *parent = static_cast<DupeItem *>(work->data);
+ auto parent = static_cast<DupeItem *>(work->data);
GList *temp;
- dupe_listview_add(dw, parent, NULL);
+ dupe_listview_add(dw, parent, nullptr);
temp = g_list_last(parent->group);
while (temp)
{
- DupeMatch *dm = static_cast<DupeMatch *>(temp->data);
+ auto dm = static_cast<DupeMatch *>(temp->data);
DupeItem *child;
child = dm->di;
tree_view_move_cursor_away(GTK_TREE_VIEW(dw->listview), &iter, TRUE);
gtk_list_store_remove(store, &iter);
- if (g_list_find(dw->dupes, di) != NULL)
+ if (g_list_find(dw->dupes, di) != nullptr)
{
if (!dw->color_frozen) dupe_listview_realign_colors(dw);
}
}
-static GList *dupe_listview_get_filelist(DupeWindow *UNUSED(dw), GtkWidget *listview)
+static GList *dupe_listview_get_filelist(DupeWindow *, GtkWidget *listview)
{
GtkTreeModel *store;
GtkTreeIter iter;
gboolean valid;
- GList *list = NULL;
+ GList *list = nullptr;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(listview));
valid = gtk_tree_model_get_iter_first(store, &iter);
}
-static GList *dupe_listview_get_selection(DupeWindow *UNUSED(dw), GtkWidget *listview)
+static GList *dupe_listview_get_selection(DupeWindow *, GtkWidget *listview)
{
GtkTreeModel *store;
GtkTreeSelection *selection;
GList *slist;
- GList *list = NULL;
+ GList *list = nullptr;
GList *work;
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview));
work = slist;
while (work)
{
- GtkTreePath *tpath = static_cast<GtkTreePath *>(work->data);
- DupeItem *di = NULL;
+ auto tpath = static_cast<GtkTreePath *>(work->data);
+ DupeItem *di = nullptr;
GtkTreeIter iter;
gtk_tree_model_get_iter(store, &iter, tpath);
}
work = work->next;
}
- g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
- g_list_free(slist);
+ g_list_free_full(slist, reinterpret_cast<GDestroyNotify>(gtk_tree_path_free));
return g_list_reverse(list);
}
-static gboolean dupe_listview_item_is_selected(DupeWindow *UNUSED(dw), DupeItem *di, GtkWidget *listview)
+static gboolean dupe_listview_item_is_selected(DupeWindow *, DupeItem *di, GtkWidget *listview)
{
GtkTreeModel *store;
GtkTreeSelection *selection;
work = slist;
while (!found && work)
{
- GtkTreePath *tpath = static_cast<GtkTreePath *>(work->data);
+ auto tpath = static_cast<GtkTreePath *>(work->data);
DupeItem *di_n;
GtkTreeIter iter;
if (di_n == di) found = TRUE;
work = work->next;
}
- g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
- g_list_free(slist);
+ g_list_free_full(slist, reinterpret_cast<GDestroyNotify>(gtk_tree_path_free));
return found;
}
/**
* @brief Search \a parent->group for \a child (#DupeItem)
- * @param child
- * @param parent
- * @returns
- *
+ * @param child
+ * @param parent
+ * @returns
+ *
*/
static DupeMatch *dupe_match_find_match(DupeItem *child, DupeItem *parent)
{
work = parent->group;
while (work)
{
- DupeMatch *dm = static_cast<DupeMatch *>(work->data);
+ auto dm = static_cast<DupeMatch *>(work->data);
if (dm->di == child) return dm;
work = work->next;
}
- return NULL;
+ return nullptr;
}
/**
* @brief Create #DupeMatch structure for \a child, and insert into \a parent->group list.
- * @param child
- * @param parent
- * @param rank
- *
+ * @param child
+ * @param parent
+ * @param rank
+ *
*/
static void dupe_match_link_child(DupeItem *child, DupeItem *parent, gdouble rank)
{
/**
* @brief Link \a a & \a b as both parent and child
- * @param a
- * @param b
- * @param rank
- *
+ * @param a
+ * @param b
+ * @param rank
+ *
* Link \a a as child of \a b, and \a b as child of \a a
*/
static void dupe_match_link(DupeItem *a, DupeItem *b, gdouble rank)
/**
* @brief Remove \a child #DupeMatch from \a parent->group list.
- * @param child
- * @param parent
- *
+ * @param child
+ * @param parent
+ *
*/
static void dupe_match_unlink_child(DupeItem *child, DupeItem *parent)
{
/**
* @brief Unlink \a a from \a b, and \a b from \a a
- * @param a
- * @param b
+ * @param a
+ * @param b
*
* Free the relevant #DupeMatch items from the #DupeItem group lists
*/
}
/**
- * @brief
- * @param parent
- * @param unlink_children
- *
+ * @brief
+ * @param parent
+ * @param unlink_children
+ *
* If \a unlink_children is set, unlink all entries in \a parent->group list. \n
* Free the \a parent->group list and set group_rank to zero;
*/
static void dupe_match_link_clear(DupeItem *parent, gboolean unlink_children)
{
- GList *work;
-
- work = parent->group;
- while (work)
+ if (unlink_children)
{
- DupeMatch *dm = static_cast<DupeMatch *>(work->data);
- work = work->next;
+ GList *work;
- if (unlink_children) dupe_match_unlink_child(parent, dm->di);
+ work = parent->group;
+ while (work)
+ {
+ auto dm = static_cast<DupeMatch *>(work->data);
+ work = work->next;
- g_free(dm);
+ dupe_match_unlink_child(parent, dm->di);
+ }
}
- g_list_free(parent->group);
- parent->group = NULL;
+ g_list_free_full(parent->group, g_free);
+ parent->group = nullptr;
parent->group_rank = 0.0;
}
/**
* @brief Search \a parent->group list for \a child
- * @param child
- * @param parent
+ * @param child
+ * @param parent
* @returns boolean TRUE/FALSE found/not found
- *
+ *
*/
static gint dupe_match_link_exists(DupeItem *child, DupeItem *parent)
{
- return (dupe_match_find_match(child, parent) != NULL);
+ return (dupe_match_find_match(child, parent) != nullptr);
}
/**
* @brief Search \a parent->group for \a child, and return \a child->rank
- * @param child
- * @param parent
+ * @param child
+ * @param parent
* @returns \a dm->di->rank
*
*/
/**
* @brief Find highest rank in \a child->group
- * @param child
- * @returns
- *
+ * @param child
+ * @returns
+ *
* Search the #DupeMatch entries in the \a child->group list.
* Return the #DupeItem with the highest rank. If more than one have
* the same rank, the first encountered is used.
DupeMatch *dr;
GList *work;
- dr = NULL;
+ dr = nullptr;
work = child->group;
while (work)
{
- DupeMatch *dm = static_cast<DupeMatch *>(work->data);
+ auto dm = static_cast<DupeMatch *>(work->data);
if (!dr || dm->rank > dr->rank)
{
dr = dm;
work = work->next;
}
- return (dr) ? dr->di : NULL;
+ return (dr) ? dr->di : nullptr;
}
-/**
+/**
* @brief Compute and store \a parent->group_rank
- * @param parent
- *
+ * @param parent
+ *
* Group_rank = (sum of all child ranks) / n
*/
static void dupe_match_rank_update(DupeItem *parent)
work = parent->group;
while (work)
{
- DupeMatch *dm = static_cast<DupeMatch *>(work->data);
+ auto dm = static_cast<DupeMatch *>(work->data);
work = work->next;
rank += dm->rank;
c++;
work = child->group;
while (work)
{
- DupeMatch *dm = static_cast<DupeMatch *>(work->data);
+ auto dm = static_cast<DupeMatch *>(work->data);
if (g_list_find(dw->dupes, dm->di)) return dm->di;
work = work->next;
}
- return NULL;
+ return nullptr;
}
/**
- * @brief
+ * @brief
* @param work (#DupeItem) dw->list or dw->second_list
- *
+ *
* Unlink all #DupeItem-s in \a work.
* Do not unlink children.
*/
{
while (work)
{
- DupeItem *di = static_cast<DupeItem *>(work->data);
+ auto di = static_cast<DupeItem *>(work->data);
work = work->next;
dupe_match_link_clear(di, FALSE);
work = old_parent->group;
while (work)
{
- DupeMatch *dm = static_cast<DupeMatch *>(work->data);
+ auto 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;
}
new_parent->group = old_parent->group;
- old_parent->group = NULL;
+ old_parent->group = nullptr;
work = g_list_find(dw->dupes, old_parent);
if (work) work->data = new_parent;
work = di->group;
while (work)
{
- DupeMatch *dm = static_cast<DupeMatch *>(work->data);
+ auto dm = static_cast<DupeMatch *>(work->data);
work = work->next;
log_printf(" %f %s\n", dm->rank, dm->di->fd->name);
work = list;
while (work)
{
- DupeItem *di = static_cast<DupeItem *>(work->data);
+ auto di = static_cast<DupeItem *>(work->data);
dupe_match_print_group(di);
work = work->next;
}
/* level 3, unlinking and orphan handling */
/**
- * @brief
- * @param child
+ * @brief
+ * @param child
* @param parent \a di from \a child->group
* @param[inout] list \a dw->list sorted by rank (#DupeItem)
- * @param dw
+ * @param dw
* @returns modified \a list
*
* Called for each entry in \a child->group (#DupeMatch) with \a parent set to \a dm->di. \n
* Find the highest rank #DupeItem of the \a parent's children. \n
* If that is == \a child OR
* highest rank #DupeItem of \a child == \a parent then FIXME:
- *
+ *
*/
static GList *dupe_match_unlink_by_rank(DupeItem *child, DupeItem *parent, GList *list, DupeWindow *dw)
{
- DupeItem *best = NULL;
+ DupeItem *best = nullptr;
best = dupe_match_highest_rank(parent); // highest rank in parent->group
if (best == child || dupe_match_highest_rank(child) == parent)
work = parent->group;
while (work)
{
- DupeMatch *dm = static_cast<DupeMatch *>(work->data);
+ auto dm = static_cast<DupeMatch *>(work->data);
DupeItem *orphan;
work = work->next;
/* level 2 */
/**
- * @brief
+ * @brief
* @param[inout] list \a dw->list sorted by rank (#DupeItem)
- * @param di
- * @param dw
+ * @param di
+ * @param dw
* @returns modified \a list
- *
+ *
* Called for each entry in \a list.
* Call unlink for each child in \a di->group
*/
work = g_list_last(di->group);
while (work)
{
- DupeMatch *dm = static_cast<DupeMatch *>(work->data);
+ auto dm = static_cast<DupeMatch *>(work->data);
work = work->prev;
list = dupe_match_unlink_by_rank(di, dm->di, list, dw);
}
/* level 1 (top) */
/**
- * @brief
+ * @brief
* @param[inout] list \a dw->list sorted by rank (#DupeItem)
- * @param dw
+ * @param dw
* @returns Filtered \a list
- *
+ *
* Called once.
* Call group filter for each \a di in \a list
*/
work = list;
while (work)
{
- DupeItem *di = static_cast<DupeItem *>(work->data);
+ auto 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);
static gint dupe_match_sort_groups_cb(gconstpointer a, gconstpointer b)
{
- DupeMatch *da = (DupeMatch *)a;
- DupeMatch *db = (DupeMatch *)b;
+ auto da = static_cast<const DupeMatch *>(a);
+ auto db = static_cast<const DupeMatch *>(b);
if (da->rank > db->rank) return -1;
if (da->rank < db->rank) return 1;
/**
* @brief Sorts the children of each #DupeItem in \a list
* @param list #DupeItem
- *
+ *
* Sorts the #DupeItem->group children on rank
*/
static void dupe_match_sort_groups(GList *list)
work = list;
while (work)
{
- DupeItem *di = static_cast<DupeItem *>(work->data);
+ auto di = static_cast<DupeItem *>(work->data);
di->group = g_list_sort(di->group, dupe_match_sort_groups_cb);
work = work->next;
}
static gint dupe_match_totals_sort_cb(gconstpointer a, gconstpointer b)
{
- DupeItem *da = (DupeItem *)a;
- DupeItem *db = (DupeItem *)b;
+ auto da = static_cast<const DupeItem *>(a);
+ auto db = static_cast<const DupeItem *>(b);
if (g_list_length(da->group) > g_list_length(db->group)) return -1;
if (g_list_length(da->group) < g_list_length(db->group)) return 1;
/**
* @brief Callback for group_rank sort
- * @param a
- * @param b
- * @returns
- *
- *
+ * @param a
+ * @param b
+ * @returns
+ *
+ *
*/
static gint dupe_match_rank_sort_cb(gconstpointer a, gconstpointer b)
{
- DupeItem *da = (DupeItem *)a;
- DupeItem *db = (DupeItem *)b;
+ auto da = static_cast<const DupeItem *>(a);
+ auto db = static_cast<const DupeItem *>(b);
if (da->group_rank > db->group_rank) return -1;
if (da->group_rank < db->group_rank) return 1;
/**
* @brief Sorts \a source_list by group-rank
* @param source_list #DupeItem
- * @returns
+ * @returns
*
* Computes group_rank for each #DupeItem. \n
* Items with no group list are ignored.
*/
static GList *dupe_match_rank_sort(GList *source_list)
{
- GList *list = NULL;
+ GList *list = nullptr;
GList *work;
work = source_list;
while (work)
{
- DupeItem *di = static_cast<DupeItem *>(work->data);
+ auto di = static_cast<DupeItem *>(work->data);
if (di->group)
{
/**
* @brief Returns allocated GList of dupes sorted by totals
- * @param source_list
- * @returns
- *
- *
+ * @param source_list
+ * @returns
+ *
+ *
*/
static GList *dupe_match_totals_sort(GList *source_list)
{
}
/**
- * @brief
- * @param dw
- *
+ * @brief
+ * @param dw
+ *
* Called once.
*/
static void dupe_match_rank(DupeWindow *dw)
*/
/**
- * @brief
- * @param[in] a
- * @param[in] b
- * @param[in] mask
- * @param[out] rank
- * @param[in] fast
- * @returns
- *
+ * @brief
+ * @param[in] a
+ * @param[in] b
+ * @param[in] mask
+ * @param[out] rank
+ * @param[in] fast
+ * @returns
+ *
* For similarity checks, compute rank - (similarity factor between a and b). \n
* If rank < user-set sim value, returns FALSE.
*/
{
return TRUE;
}
- else
- {
- return FALSE;
- }
- }
- else
- {
+
return FALSE;
}
+ return FALSE;
}
if (mask & DUPE_MATCH_NAME_CI_CONTENT)
{
{
return TRUE;
}
- else
- {
- return FALSE;
- }
- }
- else
- {
+
return FALSE;
}
+ return FALSE;
+
}
if (mask & DUPE_MATCH_SIZE)
{
if (mask & DUPE_MATCH_SIM_HIGH) m = 0.95;
else if (mask & DUPE_MATCH_SIM_MED) m = 0.90;
- else if (mask & DUPE_MATCH_SIM_CUSTOM) m = (gdouble)options->duplicates_similarity_threshold / 100.0;
+ else if (mask & DUPE_MATCH_SIM_CUSTOM) m = static_cast<gdouble>(options->duplicates_similarity_threshold) / 100.0;
else m = 0.85;
if (fast)
/**
* @brief Determine if there is a match
- * @param di1
- * @param di2
- * @param data
+ * @param di1
+ * @param di2
+ * @param data
* @returns DUPE_MATCH/DUPE_NO_MATCH/DUPE_NAME_MATCH
* DUPE_NAME_MATCH is used for name != contents searches:
* the name and content match i.e.
* no match, but keep searching
- *
+ *
* Called when stepping down the array looking for adjacent matches,
* and from the 2nd set search.
- *
+ *
* Is not used for similarity checks.
*/
static DUPE_CHECK_RESULT dupe_match_check(DupeItem *di1, DupeItem *di2, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
DupeMatchType mask = dw->match_mask;
if (mask & DUPE_MATCH_ALL)
/**
* @brief The callback for the binary search
- * @param a
- * @param b
+ * @param a
+ * @param b
* @param param_match_mask
* @returns negative/0/positive
- *
+ *
* Is not used for similarity checks.
*
* Used only when two file sets are used.
*/
static gint dupe_match_binary_search_cb(gconstpointer a, gconstpointer b)
{
- const DupeItem *di1 = *((DupeItem **) a);
- const DupeItem *di2 = b;
+ auto di1 = *(static_cast<const DupeItem *const *>(a));
+ auto di2 = static_cast<const DupeItem *>(b);
DupeMatchType mask = param_match_mask;
if (mask & DUPE_MATCH_ALL)
/**
* @brief The callback for the array sort
- * @param a
- * @param b
- * @param data
+ * @param a
+ * @param b
+ * @param data
* @returns negative/0/positive
- *
+ *
* Is not used for similarity checks.
*/
static gint dupe_match_sort_cb(gconstpointer a, gconstpointer b, gpointer data)
{
- const DupeItem *di1 = *((DupeItem **) a);
- const DupeItem *di2 = *((DupeItem **) b);
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto di1 = *(static_cast<const DupeItem *const *>(a));
+ auto di2 = *(static_cast<const DupeItem *const *>(b));
+ auto dw = static_cast<DupeWindow *>(data);
DupeMatchType mask = dw->match_mask;
if (mask & DUPE_MATCH_ALL)
{
return -1;
}
- else
- {
- return strcmp(di1->md5sum, di2->md5sum);
- }
+
+ return strcmp(di1->md5sum, di2->md5sum);
}
if (mask & DUPE_MATCH_DIM)
{
/**
* @brief Check for duplicate matches
- * @param dw
+ * @param dw
*
* Is not used for similarity checks.
*
* Loads the file sets into an array and sorts on the searched
* for parameter.
- *
+ *
* If one file set, steps down the array looking for adjacent equal values.
- *
+ *
* If two file sets, steps down the first set and for each value
* does a binary search for matches in the second set.
- */
+ */
static void dupe_array_check(DupeWindow *dw )
{
GArray *array_set1;
work = dw->list;
while (work)
{
- DupeItem *di = static_cast<DupeItem *>(work->data);
+ auto di = static_cast<DupeItem *>(work->data);
g_array_append_val(array_set1, di);
work = work->next;
}
}
g_array_sort_with_data(array_set2, dupe_match_sort_cb, dw);
- for (i_set1 = 0; i_set1 <= (gint)(array_set1->len) - 1; i_set1++)
+ for (i_set1 = 0; i_set1 <= static_cast<gint>(array_set1->len) - 1; i_set1++)
{
- DupeItem *di1 = g_array_index(array_set1, gpointer, i_set1);
- DupeItem *di2 = NULL;
+ auto di1 = static_cast<DupeItem *>(g_array_index(array_set1, gpointer, i_set1));
+ DupeItem *di2 = nullptr;
/* If multiple identical entries in set 1, use the last one */
- if (i_set1 < (gint)(array_set1->len) - 2)
+ if (i_set1 < static_cast<gint>(array_set1->len) - 2)
{
- di2 = g_array_index(array_set1, gpointer, i_set1 + 1);
+ di2 = static_cast<DupeItem *>(g_array_index(array_set1, gpointer, i_set1 + 1));
check_result = dupe_match_check(di1, di2, dw);
if (check_result == DUPE_MATCH || check_result == DUPE_NAME_MATCH)
{
match_found = FALSE;
for(i=0; i < array_set2->len; i++)
{
- di2 = g_array_index(array_set2, gpointer, i);
+ di2 = static_cast<DupeItem *>(g_array_index(array_set2, gpointer, i));
check_result = dupe_match_check(di1, di2, dw);
if (check_result == DUPE_MATCH)
{
if (match_found)
{
- di2 = g_array_index(array_set2, gpointer, out_match_index);
+ di2 = static_cast<DupeItem *>(g_array_index(array_set2, gpointer, out_match_index));
check_result = dupe_match_check(di1, di2, dw);
if (check_result == DUPE_MATCH || check_result == DUPE_NAME_MATCH)
}
i_set2 = out_match_index + 1;
- if (i_set2 > (gint)(array_set2->len) - 1)
+ if (i_set2 > static_cast<gint>(array_set2->len) - 1)
{
break;
}
/* Look for multiple matches in set 2 for item di1 */
- di2 = g_array_index(array_set2, gpointer, i_set2);
+ di2 = static_cast<DupeItem *>(g_array_index(array_set2, gpointer, i_set2));
check_result = dupe_match_check(di1, di2, dw);
while (check_result == DUPE_MATCH || check_result == DUPE_NAME_MATCH)
{
dupe_match_link(di2, di1, 0.0);
}
i_set2++;
- if (i_set2 > (gint)(array_set2->len) - 1)
+ if (i_set2 > static_cast<gint>(array_set2->len) - 1)
{
break;
}
- di2 = g_array_index(array_set2, gpointer, i_set2);
+ di2 = static_cast<DupeItem *>(g_array_index(array_set2, gpointer, i_set2));
check_result = dupe_match_check(di1, di2, dw);
}
}
{
/* File set 1 only */
g_list_free(dw->dupes);
- dw->dupes = NULL;
+ dw->dupes = nullptr;
- if ((gint)(array_set1->len) > 1)
+ if (static_cast<gint>(array_set1->len) > 1)
{
- for (i_set1 = 0; i_set1 <= (gint)(array_set1->len) - 2; i_set1++)
+ for (i_set1 = 0; i_set1 <= static_cast<gint>(array_set1->len) - 2; i_set1++)
{
- DupeItem *di1 = g_array_index(array_set1, gpointer, i_set1);
- DupeItem *di2 = g_array_index(array_set1, gpointer, i_set1 + 1);
+ auto di1 = static_cast<DupeItem *>(g_array_index(array_set1, gpointer, i_set1));
+ auto di2 = static_cast<DupeItem *>(g_array_index(array_set1, gpointer, i_set1 + 1));
check_result = dupe_match_check(di1, di2, dw);
if (check_result == DUPE_MATCH || check_result == DUPE_NAME_MATCH)
}
i_set1++;
- if ( i_set1 + 1 > (gint)(array_set1->len) - 1)
+ if ( i_set1 + 1 > static_cast<gint>(array_set1->len) - 1)
{
break;
}
/* Look for multiple matches for item di1 */
- di2 = g_array_index(array_set1, gpointer, i_set1 + 1);
+ di2 = static_cast<DupeItem *>(g_array_index(array_set1, gpointer, i_set1 + 1));
check_result = dupe_match_check(di1, di2, dw);
while (check_result == DUPE_MATCH || check_result == DUPE_NAME_MATCH)
{
}
i_set1++;
- if (i_set1 + 1 > (gint)(array_set1->len) - 1)
+ if (i_set1 + 1 > static_cast<gint>(array_set1->len) - 1)
{
break;
}
- di2 = g_array_index(array_set1, gpointer, i_set1 + 1);
+ di2 = static_cast<DupeItem *>(g_array_index(array_set1, gpointer, i_set1 + 1));
check_result = dupe_match_check(di1, di2, dw);
}
}
/**
* @brief Look for similarity match
- * @param dw
- * @param needle
- * @param start
- *
+ * @param dw
+ * @param needle
+ * @param start
+ *
* Only used for similarity checks.\n
* Called from dupe_check_cb.
* Called for each entry in the list.
dqi->dw = dw;
dqi->work = work;
dqi->index = dw->queue_count;
- g_thread_pool_push(dw->dupe_comparison_thread_pool, dqi, NULL);
+ g_thread_pool_push(dw->dupe_comparison_thread_pool, dqi, nullptr);
}
/*
if (di->pixbuf) g_object_unref(di->pixbuf);
di->pixbuf = thumb_loader_get_pixbuf(dw->thumb_loader);
- dupe_listview_set_thumb(dw, di, NULL);
+ dupe_listview_set_thumb(dw, di, nullptr);
}
-static void dupe_thumb_error_cb(ThumbLoader *UNUSED(tl), gpointer data)
+static void dupe_thumb_error_cb(ThumbLoader *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
dupe_thumb_do(dw);
dupe_thumb_step(dw);
}
-static void dupe_thumb_done_cb(ThumbLoader *UNUSED(tl), gpointer data)
+static void dupe_thumb_done_cb(ThumbLoader *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
dupe_thumb_do(dw);
dupe_thumb_step(dw);
{
GtkTreeModel *store;
GtkTreeIter iter;
- DupeItem *di = NULL;
+ DupeItem *di = nullptr;
gboolean valid;
gint row = 0;
gint length = 0;
{
if (!pixbuf) gtk_list_store_set(GTK_LIST_STORE(store), &iter, DUPE_COLUMN_THUMB, di->pixbuf, -1);
row++;
- di = NULL;
+ di = nullptr;
}
valid = gtk_tree_model_iter_next(store, &iter);
}
if (!di)
{
- dw->thumb_item = NULL;
+ dw->thumb_item = nullptr;
thumb_loader_free(dw->thumb_loader);
- dw->thumb_loader = NULL;
+ dw->thumb_loader = nullptr;
- dupe_window_update_progress(dw, NULL, 0.0, FALSE);
+ dupe_window_update_progress(dw, nullptr, 0.0, FALSE);
return;
}
dupe_window_update_progress(dw, _("Loading thumbs..."),
- length == 0 ? 0.0 : (gdouble)(row) / length, FALSE);
+ length == 0 ? 0.0 : static_cast<gdouble>(row) / length, FALSE);
dw->thumb_item = di;
thumb_loader_free(dw->thumb_loader);
thumb_loader_set_callbacks(dw->thumb_loader,
dupe_thumb_done_cb,
dupe_thumb_error_cb,
- NULL,
+ nullptr,
dw);
/* start it */
while (dw->thread_count < dw->queue_count) // Wait for the queue to empty
{
- dupe_window_update_progress(dw, NULL, 0.0, FALSE);
+ dupe_window_update_progress(dw, nullptr, 0.0, FALSE);
widget_set_cursor(dw->listview, -1);
}
g_list_free(dw->search_matches);
- dw->search_matches = NULL;
+ dw->search_matches = nullptr;
if (dw->idle_id || dw->img_loader || dw->thumb_loader)
{
g_source_remove(dw->idle_id);
dw->idle_id = 0;
}
- dupe_window_update_progress(dw, NULL, 0.0, FALSE);
+ dupe_window_update_progress(dw, nullptr, 0.0, FALSE);
widget_set_cursor(dw->listview, -1);
}
{
filelist_free(dw->add_files_queue);
}
- dw->add_files_queue = NULL;
- dupe_window_update_progress(dw, NULL, 0.0, FALSE);
+ dw->add_files_queue = nullptr;
+ dupe_window_update_progress(dw, nullptr, 0.0, FALSE);
widget_set_cursor(dw->listview, -1);
}
thumb_loader_free(dw->thumb_loader);
- dw->thumb_loader = NULL;
+ dw->thumb_loader = nullptr;
image_loader_free(dw->img_loader);
- dw->img_loader = NULL;
+ dw->img_loader = nullptr;
}
-static void dupe_check_stop_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void dupe_check_stop_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
dupe_check_stop(dw);
}
static void dupe_loader_done_cb(ImageLoader *il, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
GdkPixbuf *pixbuf;
pixbuf = image_loader_get_pixbuf(il);
if (dw->setup_point)
{
- DupeItem *di = static_cast<DupeItem *>(dw->setup_point->data);
+ auto di = static_cast<DupeItem *>(dw->setup_point->data);
if (!di->simd)
{
}
image_loader_free(dw->img_loader);
- dw->img_loader = NULL;
+ dw->img_loader = nullptr;
dw->idle_id = g_idle_add(dupe_check_cb, dw);
}
static void dupe_setup_reset(DupeWindow *dw)
{
- dw->setup_point = NULL;
+ dw->setup_point = nullptr;
dw->setup_n = 0;
dw->setup_time = msec_time();
dw->setup_time_count = 0;
static GList *dupe_setup_point_step(DupeWindow *dw, GList *p)
{
- if (!p) return NULL;
+ if (!p) return nullptr;
if (p->next) return p->next;
if (dw->second_set && g_list_first(p) == dw->list) return dw->second_list;
- return NULL;
+ return nullptr;
}
/**
* @brief Generates the sumcheck or dimensions
* @param list Set1 or set2
* @returns TRUE/FALSE = not completed/completed
- *
+ *
* Ensures that the DIs contain the MD5SUM or dimensions for all items in
* the list. One item at a time. Re-enters if not completed.
*/
while (dw->setup_point)
{
- DupeItem *di = static_cast<DupeItem *>(dw->setup_point->data);
+ auto di = static_cast<DupeItem *>(dw->setup_point->data);
dw->setup_point = dupe_setup_point_step(dw, dw->setup_point);
dw->setup_n++;
if (!di->md5sum)
{
dupe_window_update_progress(dw, _("Reading checksums..."),
- dw->setup_count == 0 ? 0.0 : (gdouble)(dw->setup_n - 1) / dw->setup_count, FALSE);
+ dw->setup_count == 0 ? 0.0 : static_cast<gdouble>(dw->setup_n - 1) / dw->setup_count, FALSE);
if (options->thumbnails.enable_caching)
{
while (dw->setup_point)
{
- DupeItem *di = static_cast<DupeItem *>(dw->setup_point->data);
+ auto di = static_cast<DupeItem *>(dw->setup_point->data);
dw->setup_point = dupe_setup_point_step(dw, dw->setup_point);
dw->setup_n++;
if (di->width == 0 && di->height == 0)
{
dupe_window_update_progress(dw, _("Reading dimensions..."),
- dw->setup_count == 0 ? 0.0 : (gdouble)(dw->setup_n - 1) / dw->setup_count, FALSE);
+ dw->setup_count == 0 ? 0.0 : static_cast<gdouble>(dw->setup_n - 1) / dw->setup_count, FALSE);
if (options->thumbnails.enable_caching)
{
* @brief Compare func. for sorting search matches
* @param a #DupeSearchMatch
* @param b #DupeSearchMatch
- * @returns
- *
+ * @returns
+ *
* Used only for similarity checks\n
* Sorts search matches on order they were inserted into the pool queue
*/
static gint sort_func(gconstpointer a, gconstpointer b)
{
- return (((DupeSearchMatch *)a)->index - ((DupeSearchMatch *)b)->index);
+ return static_cast<const DupeSearchMatch *>(a)->index - static_cast<const DupeSearchMatch *>(b)->index;
}
/**
* @brief Check set 1 (and set 2) for matches
* @param data DupeWindow
* @returns TRUE/FALSE = not completed/completed
- *
+ *
* Initiated from start, loader done and item remove
*
* On first entry generates di->MD5SUM, di->dimensions and sim data,
*/
static gboolean dupe_check_cb(gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
DupeSearchMatch *search_match_list_item;
+ gchar *progress_text;
if (!dw->idle_id)
{
- return FALSE;
+ return G_SOURCE_REMOVE;
}
if (!dw->setup_done) /* Clear on 1st entry */
{
if (create_checksums_dimensions(dw, dw->list))
{
- return TRUE;
+ return G_SOURCE_CONTINUE;
}
}
if (dw->second_list)
{
if (create_checksums_dimensions(dw, dw->second_list))
{
- return TRUE;
+ return G_SOURCE_CONTINUE;
}
}
if ((dw->match_mask & DUPE_MATCH_SIM_HIGH ||
while (dw->setup_point)
{
- DupeItem *di = static_cast<DupeItem *>(dw->setup_point->data);
+ auto di = static_cast<DupeItem *>(dw->setup_point->data);
if (!di->simd)
{
dupe_window_update_progress(dw, _("Reading similarity data..."),
- dw->setup_count == 0 ? 0.0 : (gdouble)dw->setup_n / dw->setup_count, FALSE);
+ dw->setup_count == 0 ? 0.0 : static_cast<gdouble>(dw->setup_n) / dw->setup_count, FALSE);
if (options->thumbnails.enable_caching)
{
if (cache_sim_data_filled(di->simd))
{
image_sim_alternate_processing(di->simd);
- return TRUE;
+ return G_SOURCE_CONTINUE;
}
}
image_sim_free(di->simd);
di->simd = image_sim_new();
image_loader_free(dw->img_loader);
- dw->img_loader = NULL;
- return TRUE;
+ dw->img_loader = nullptr;
+ return G_SOURCE_CONTINUE;
}
dw->idle_id = 0;
- return FALSE;
+ return G_SOURCE_REMOVE;
}
dw->setup_point = dupe_setup_point_step(dw, dw->setup_point);
dw->setup_n++;
}
- dw->setup_mask |= DUPE_MATCH_SIM_MED;
+ dw->setup_mask = static_cast<DupeMatchType>(dw->setup_mask | DUPE_MATCH_SIM_MED);
dupe_setup_reset(dw);
}
{
if( dw->thread_count < dw->queue_count)
{
- dupe_window_update_progress(dw, _("Comparing..."), 0.0, FALSE);
+ progress_text = g_strdup_printf("%s %d%s%d", _("Comparing"), dw->thread_count, "/", dw->queue_count);
- return TRUE;
+ dupe_window_update_progress(dw, progress_text, (gdouble)dw->thread_count / dw->queue_count, TRUE);
+
+ g_free(progress_text);
+
+ return G_SOURCE_CONTINUE;
}
- if (dw->search_matches_sorted == NULL)
+ if (dw->search_matches_sorted == nullptr)
{
dw->search_matches_sorted = g_list_sort(dw->search_matches, sort_func);
dupe_setup_reset(dw);
dw->search_matches_sorted = dw->search_matches_sorted->next;
- if (dw->search_matches_sorted != NULL)
+ if (dw->search_matches_sorted != nullptr)
{
- return TRUE;
+ return G_SOURCE_CONTINUE;
}
}
g_list_free(dw->search_matches);
- dw->search_matches = NULL;
+ dw->search_matches = nullptr;
g_list_free(dw->search_matches_sorted);
- dw->search_matches_sorted = NULL;
+ dw->search_matches_sorted = nullptr;
dw->setup_count = 0;
}
else
{
dw->setup_count = 0;
dupe_window_update_progress(dw, _("Sorting..."), 1.0, TRUE);
- return TRUE;
+ return G_SOURCE_CONTINUE;
}
}
dw->idle_id = 0;
- dupe_window_update_progress(dw, NULL, 0.0, FALSE);
+ dupe_window_update_progress(dw, nullptr, 0.0, FALSE);
dupe_match_rank(dw);
dupe_window_update_count(dw, FALSE);
widget_set_cursor(dw->listview, -1);
- return FALSE;
+ return G_SOURCE_REMOVE;
/* The end */
}
dw->match_mask == DUPE_MATCH_SIM_CUSTOM)
{
/* This is the similarity comparison */
- dupe_list_check_match(dw, (DupeItem *)dw->working->data, dw->working);
- dupe_window_update_progress(dw, _("Queuing..."), dw->setup_count == 0 ? 0.0 : (gdouble) dw->setup_n / dw->setup_count, FALSE);
+ dupe_list_check_match(dw, static_cast<DupeItem *>(dw->working->data), dw->working);
+ dupe_window_update_progress(dw, _("Queuing..."), dw->setup_count == 0 ? 0.0 : static_cast<gdouble>(dw->setup_n) / dw->setup_count, FALSE);
dw->setup_n++;
dw->queue_count++;
/* This is the comparison for all other parameters.
* dupe_array_check() processes the entire list in one go
*/
- dw->working = NULL;
+ dw->working = nullptr;
dupe_window_update_progress(dw, _("Comparing..."), 0.0, FALSE);
dupe_array_check(dw);
}
- return TRUE;
+ return G_SOURCE_CONTINUE;
}
static void dupe_check_start(DupeWindow *dw)
dw->setup_count = g_list_length(dw->list);
if (dw->second_set) dw->setup_count += g_list_length(dw->second_list);
- dw->setup_mask = 0;
+ dw->setup_mask = DUPE_MATCH_NONE;
dupe_setup_reset(dw);
dw->working = g_list_last(dw->list);
widget_set_cursor(dw->listview, GDK_WATCH);
dw->queue_count = 0;
dw->thread_count = 0;
- dw->search_matches_sorted = NULL;
+ dw->search_matches_sorted = nullptr;
dw->abort = FALSE;
if (dw->idle_id) return;
static gboolean dupe_check_start_cb(gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
dupe_check_start(dw);
if (dw->img_loader)
{
image_loader_free(dw->img_loader);
- dw->img_loader = NULL;
+ dw->img_loader = nullptr;
dw->idle_id = g_idle_add(dupe_check_cb, dw);
}
}
dupe_window_update_count(dw, FALSE);
}
-/*
-static gboolean dupe_item_remove_by_path(DupeWindow *dw, const gchar *path)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+static gboolean dupe_item_remove_by_path_unused(DupeWindow *dw, const gchar *path)
{
DupeItem *di;
- di = dupe_item_find_path(dw, path);
+ di = dupe_item_find_path_unused(dw, path);
if (!di) return FALSE;
dupe_item_remove(dw, di);
return TRUE;
}
-*/
+#pragma GCC diagnostic pop
static gboolean dupe_files_add_queue_cb(gpointer data)
{
- DupeItem *di = NULL;
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ DupeItem *di = nullptr;
+ auto dw = static_cast<DupeWindow *>(data);
FileData *fd;
GList *queue = dw->add_files_queue;
gtk_progress_bar_pulse(GTK_PROGRESS_BAR(dw->extra_label));
- if (queue == NULL)
+ if (queue == nullptr)
{
dw->add_files_queue_id = 0;
dupe_destroy_list_cache(dw);
}
else if (isdir(fd->path))
{
- GList *f, *d;
+ GList *f;
+ GList *d;
dw->add_files_queue = g_list_remove(dw->add_files_queue, g_list_first(dw->add_files_queue)->data);
if (filelist_read(fd, &f, &d))
dw->list = g_list_prepend(dw->list, di);
}
- if (dw->add_files_queue != NULL)
+ if (dw->add_files_queue != nullptr)
{
return TRUE;
}
- else
- {
- dw->add_files_queue_id = 0;
- dupe_destroy_list_cache(dw);
- g_idle_add(dupe_check_start_cb, dw);
- gtk_widget_set_sensitive(dw->controls_box, TRUE);
- return FALSE;
- }
+
+ dw->add_files_queue_id = 0;
+ dupe_destroy_list_cache(dw);
+ g_idle_add(dupe_check_start_cb, dw);
+ gtk_widget_set_sensitive(dw->controls_box, TRUE);
+ return FALSE;
}
-static void dupe_files_add(DupeWindow *dw, CollectionData *UNUSED(collection), CollectInfo *info,
+static void dupe_files_add(DupeWindow *dw, CollectionData *, CollectInfo *info,
FileData *fd, gboolean recurse)
{
- DupeItem *di = NULL;
+ DupeItem *di = nullptr;
if (info)
{
}
else if (isdir(fd->path) && recurse)
{
- GList *f, *d;
+ GList *f;
+ GList *d;
if (filelist_read(fd, &f, &d))
{
GList *work;
work = f;
while (work)
{
- dupe_files_add(dw, NULL, NULL, (FileData *)work->data, TRUE);
+ dupe_files_add(dw, nullptr, nullptr, static_cast<FileData *>(work->data), TRUE);
work = work->next;
}
filelist_free(f);
work = d;
while (work)
{
- dupe_files_add(dw, NULL, NULL, (FileData *)work->data, TRUE);
+ dupe_files_add(dw, nullptr, nullptr, static_cast<FileData *>(work->data), TRUE);
work = work->next;
}
filelist_free(d);
{
return;
}
- else
- {
- work = work->next;
- }
+
+ work = work->next;
}
if (dw->second_list)
{
return;
}
- else
- {
- work = work->next;
- }
+
+ work = work->next;
}
}
dw->list_cache = g_hash_table_new(g_direct_hash, g_direct_equal);
dw->second_list_cache = g_hash_table_new(g_direct_hash, g_direct_equal);
- for (GList *i = dw->list; i != NULL; i = i->next)
+ for (GList *i = dw->list; i != nullptr; i = i->next)
{
- DupeItem *di = static_cast<DupeItem *>(i->data);
+ auto di = static_cast<DupeItem *>(i->data);
g_hash_table_add(dw->list_cache, di->fd);
}
- for (GList *i = dw->second_list; i != NULL; i = i->next)
+ for (GList *i = dw->second_list; i != nullptr; i = i->next)
{
- DupeItem *di = static_cast<DupeItem *>(i->data);
+ auto di = static_cast<DupeItem *>(i->data);
g_hash_table_add(dw->second_list_cache, di->fd);
}
/**
* @brief Return true if the fd was not in the cache
- * @param dw
- * @param fd
- * @returns
- *
- *
+ * @param dw
+ * @param fd
+ * @returns
+ *
+ *
*/
static gboolean dupe_insert_in_list_cache(DupeWindow *dw, FileData *fd)
{
dw->second_drop ? dw->second_list_cache : dw->list_cache;
/* We do this as a lookup + add as we don't want to overwrite
items as that would leak the old value. */
- if (g_hash_table_lookup(table, fd) != NULL)
+ if (g_hash_table_lookup(table, fd) != nullptr)
return FALSE;
return g_hash_table_add(table, fd);
}
info = collection_get_first(collection);
while (info)
{
- dupe_files_add(dw, collection, info, NULL, FALSE);
+ dupe_files_add(dw, collection, info, nullptr, FALSE);
info = collection_next_by_info(collection, info);
}
work = list;
while (work)
{
- FileData *fd = static_cast<FileData *>(work->data);
+ auto fd = static_cast<FileData *>(work->data);
work = work->next;
if (isdir(fd->path) && !recurse)
{
- GList *f, *d;
+ GList *f;
+ GList *d;
if (filelist_read(fd, &f, &d))
{
{
while (work)
{
- DupeItem *di = static_cast<DupeItem *>(work->data);
+ auto di = static_cast<DupeItem *>(work->data);
if (di->fd == fd)
dupe_item_update(dw, di);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
label = gtk_label_new(description);
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
gtk_widget_show(label);
label = gtk_label_new(text);
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
gtk_widget_show(label);
- gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
return label;
if (!di) return;
- gd = file_util_gen_dlg("Image thumbprint debug info", "thumbprint",
+ gd = file_util_gen_dlg(_("Image thumbprint debug info"), "thumbprint",
dw->window, TRUE,
- NULL, NULL);
- generic_dialog_add_button(gd, GTK_STOCK_CLOSE, NULL, NULL, TRUE);
+ nullptr, nullptr);
+ generic_dialog_add_button(gd, GQ_ICON_CLOSE, _("Close"), nullptr, TRUE);
dupe_display_label(gd->vbox, "name:", di->fd->name);
buf = text_from_size(di->fd->size);
{
GtkWidget *image;
GdkPixbuf *pixbuf;
- gint x, y;
+ gint x;
+ gint y;
guchar *d_pix;
guchar *dp;
gint rs;
}
image = gtk_image_new_from_pixbuf(pixbuf);
- gtk_box_pack_start(GTK_BOX(gd->vbox), image, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(gd->vbox), image, FALSE, FALSE, 0);
gtk_widget_show(image);
g_object_unref(pixbuf);
gtk_list_store_clear(store);
g_list_free(dw->dupes);
- dw->dupes = NULL;
+ dw->dupes = nullptr;
dupe_match_reset_list(dw->list);
dupe_match_reset_list(dw->second_list);
}
else
{
- layout_image_set_collection(NULL, di->collection, di->info);
+ layout_image_set_collection(nullptr, di->collection, di->info);
}
}
else
}
else
{
- layout_set_fd(NULL, di->fd);
+ layout_set_fd(nullptr, di->fd);
}
}
}
GtkTreeModel *store;
GtkTreeIter iter;
GList *slist;
- GList *list = NULL;
+ GList *list = nullptr;
GList *work;
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(listview));
work = slist;
while (work)
{
- GtkTreePath *tpath = static_cast<GtkTreePath *>(work->data);
- DupeItem *di = NULL;
+ auto tpath = static_cast<GtkTreePath *>(work->data);
+ DupeItem *di = nullptr;
gtk_tree_model_get_iter(store, &iter, tpath);
gtk_tree_model_get(store, &iter, DUPE_COLUMN_POINTER, &di, -1);
if (di) list = g_list_prepend(list, di);
work = work->next;
}
- g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
- g_list_free(slist);
+ g_list_free_full(slist, reinterpret_cast<GDestroyNotify>(gtk_tree_path_free));
dw->color_frozen = TRUE;
work = list;
static void dupe_window_edit_selected(DupeWindow *dw, const gchar *key)
{
- file_util_start_editor_from_filelist(key, dupe_listview_get_selection(dw, dw->listview), NULL, dw->window);
+ file_util_start_editor_from_filelist(key, dupe_listview_get_selection(dw, dw->listview), nullptr, dw->window);
}
static void dupe_window_collection_from_selection(DupeWindow *dw)
GList *list;
list = dupe_listview_get_selection(dw, dw->listview);
- w = collection_window_new(NULL);
+ w = collection_window_new(nullptr);
collection_table_add_filelist(w->table, list);
filelist_free(list);
}
dw->second_drop = (dw->second_set && on_second);
- list = layout_list(NULL);
+ list = layout_list(nullptr);
dupe_window_add_files(dw, list, FALSE);
filelist_free(list);
}
*-------------------------------------------------------------------
*/
-static void dupe_menu_view_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void dupe_menu_view_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto 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)
+static void dupe_menu_viewnew_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto 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)
+static void dupe_menu_select_all_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
GtkTreeSelection *selection;
options->duplicates_select_type = DUPE_SELECT_NONE;
gtk_tree_selection_select_all(selection);
}
-static void dupe_menu_select_none_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void dupe_menu_select_none_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
GtkTreeSelection *selection;
options->duplicates_select_type = DUPE_SELECT_NONE;
gtk_tree_selection_unselect_all(selection);
}
-static void dupe_menu_select_dupes_set1_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void dupe_menu_select_dupes_set1_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
options->duplicates_select_type = DUPE_SELECT_GROUP1;
dupe_listview_select_dupes(dw, DUPE_SELECT_GROUP1);
}
-static void dupe_menu_select_dupes_set2_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void dupe_menu_select_dupes_set2_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
options->duplicates_select_type = DUPE_SELECT_GROUP2;
dupe_listview_select_dupes(dw, DUPE_SELECT_GROUP2);
static void dupe_menu_edit_cb(GtkWidget *widget, gpointer data)
{
DupeWindow *dw;
- const gchar *key = static_cast<const gchar *>(data);
+ auto key = static_cast<const gchar *>(data);
dw = static_cast<DupeWindow *>(submenu_item_get_data(widget));
if (!dw) return;
dupe_window_edit_selected(dw, key);
}
-static void dupe_menu_print_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void dupe_menu_print_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
FileData *fd;
- fd = (dw->click_item) ? dw->click_item->fd : NULL;
+ fd = (dw->click_item) ? dw->click_item->fd : nullptr;
print_window_new(fd,
dupe_listview_get_selection(dw, dw->listview),
dupe_listview_get_filelist(dw, dw->listview), dw->window);
}
-static void dupe_menu_copy_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void dupe_menu_copy_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
- file_util_copy(NULL, dupe_listview_get_selection(dw, dw->listview), NULL, dw->window);
+ file_util_copy(nullptr, dupe_listview_get_selection(dw, dw->listview), nullptr, dw->window);
}
-static void dupe_menu_move_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void dupe_menu_move_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
- file_util_move(NULL, dupe_listview_get_selection(dw, dw->listview), NULL, dw->window);
+ file_util_move(nullptr, dupe_listview_get_selection(dw, dw->listview), nullptr, dw->window);
}
-static void dupe_menu_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void dupe_menu_rename_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
- file_util_rename(NULL, dupe_listview_get_selection(dw, dw->listview), dw->window);
+ file_util_rename(nullptr, dupe_listview_get_selection(dw, dw->listview), dw->window);
}
-static void dupe_menu_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void dupe_menu_delete_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto 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);
+ file_util_delete_notify_done(nullptr, dupe_listview_get_selection(dw, dw->listview), dw->window, delete_finished_cb, dw);
}
-static void dupe_menu_move_to_trash_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void dupe_menu_move_to_trash_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto 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);
+ file_util_delete_notify_done(nullptr, dupe_listview_get_selection(dw, dw->listview), dw->window, delete_finished_cb, dw);
}
-static void dupe_menu_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void dupe_menu_copy_path_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto 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)
+static void dupe_menu_copy_path_unquoted_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto 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)
+static void dupe_menu_remove_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
dupe_window_remove_selection(dw, dw->listview);
}
-static void dupe_menu_clear_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void dupe_menu_clear_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
dupe_window_clear(dw);
}
-static void dupe_menu_close_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void dupe_menu_close_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
dupe_window_close(dw);
}
-static void dupe_menu_popup_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void dupe_menu_popup_destroy_cb(GtkWidget *, gpointer data)
{
- GList *editmenu_fd_list = static_cast<GList *>(data);
+ auto editmenu_fd_list = static_cast<GList *>(data);
filelist_free(editmenu_fd_list);
}
/**
* @brief Add file selection list to a collection
- * @param[in] widget
+ * @param[in] widget
* @param[in] data Index to the collection list menu item selected, or -1 for new collection
- *
- *
+ *
+ *
*/
static void dupe_pop_menu_collections_cb(GtkWidget *widget, gpointer data)
{
GList *editmenu_fd_list;
GtkAccelGroup *accel_group;
- on_row = (di != NULL);
+ on_row = (di != nullptr);
menu = popup_menu_short_lived();
menu_item_add_sensitive(menu, _("_View"), on_row,
G_CALLBACK(dupe_menu_view_cb), dw);
- menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, on_row,
+ menu_item_add_icon_sensitive(menu, _("View in _new window"), GQ_ICON_NEW, on_row,
G_CALLBACK(dupe_menu_viewnew_cb), dw);
menu_item_add_divider(menu);
- menu_item_add_sensitive(menu, _("Select all"), (dw->dupes != NULL),
+ menu_item_add_sensitive(menu, _("Select all"), (dw->dupes != nullptr),
G_CALLBACK(dupe_menu_select_all_cb), dw);
- menu_item_add_sensitive(menu, _("Select none"), (dw->dupes != NULL),
+ menu_item_add_sensitive(menu, _("Select none"), (dw->dupes != nullptr),
G_CALLBACK(dupe_menu_select_none_cb), dw);
- menu_item_add_sensitive(menu, _("Select group _1 duplicates"), (dw->dupes != NULL),
+ menu_item_add_sensitive(menu, _("Select group _1 duplicates"), (dw->dupes != nullptr),
G_CALLBACK(dupe_menu_select_dupes_set1_cb), dw);
- menu_item_add_sensitive(menu, _("Select group _2 duplicates"), (dw->dupes != NULL),
+ menu_item_add_sensitive(menu, _("Select group _2 duplicates"), (dw->dupes != nullptr),
G_CALLBACK(dupe_menu_select_dupes_set2_cb), dw);
menu_item_add_divider(menu);
G_CALLBACK(dupe_pop_menu_collections_cb), dw);
gtk_widget_set_sensitive(item, on_row);
- menu_item_add_stock_sensitive(menu, _("Print..."), GTK_STOCK_PRINT, on_row,
+ menu_item_add_icon_sensitive(menu, _("Print..."), GQ_ICON_PRINT, on_row,
G_CALLBACK(dupe_menu_print_cb), dw);
menu_item_add_divider(menu);
- menu_item_add_stock_sensitive(menu, _("_Copy..."), GTK_STOCK_COPY, on_row,
+ menu_item_add_icon_sensitive(menu, _("_Copy..."), GQ_ICON_COPY, on_row,
G_CALLBACK(dupe_menu_copy_cb), dw);
menu_item_add_sensitive(menu, _("_Move..."), on_row,
G_CALLBACK(dupe_menu_move_cb), dw);
G_CALLBACK(dupe_menu_copy_path_unquoted_cb), dw);
menu_item_add_divider(menu);
- menu_item_add_stock_sensitive(menu,
+ menu_item_add_icon_sensitive(menu,
options->file_ops.confirm_move_to_trash ? _("Move to Trash...") :
- _("Move to Trash"), PIXBUF_INLINE_ICON_TRASH, on_row,
+ _("Move to Trash"), GQ_ICON_DELETE, on_row,
G_CALLBACK(dupe_menu_move_to_trash_cb), dw);
- menu_item_add_stock_sensitive(menu,
+ menu_item_add_icon_sensitive(menu,
options->file_ops.confirm_delete ? _("_Delete...") :
- _("_Delete"), GTK_STOCK_DELETE, on_row,
+ _("_Delete"), GQ_ICON_DELETE_SHRED, on_row,
G_CALLBACK(dupe_menu_delete_cb), dw);
menu_item_add_divider(menu);
- menu_item_add_stock_sensitive(menu, _("Rem_ove"), GTK_STOCK_REMOVE, on_row,
+ menu_item_add_icon_sensitive(menu, _("Rem_ove"), GQ_ICON_REMOVE, on_row,
G_CALLBACK(dupe_menu_remove_cb), dw);
- menu_item_add_stock_sensitive(menu, _("C_lear"), GTK_STOCK_CLEAR, (dw->list != NULL),
+ menu_item_add_icon_sensitive(menu, _("C_lear"), GQ_ICON_CLEAR, (dw->list != nullptr),
G_CALLBACK(dupe_menu_clear_cb), dw);
menu_item_add_divider(menu);
- menu_item_add_stock(menu, _("Close _window"), GTK_STOCK_CLOSE,
+ menu_item_add_icon(menu, _("Close _window"), GQ_ICON_CLOSE,
G_CALLBACK(dupe_menu_close_cb), dw);
return menu;
static gboolean dupe_listview_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
GtkTreeModel *store;
GtkTreePath *tpath;
GtkTreeIter iter;
- DupeItem *di = NULL;
+ DupeItem *di = nullptr;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), bevent->x, bevent->y,
- &tpath, NULL, NULL, NULL))
+ &tpath, nullptr, nullptr, nullptr))
{
gtk_tree_model_get_iter(store, &iter, tpath);
gtk_tree_model_get(store, &iter, DUPE_COLUMN_POINTER, &di, -1);
{
menu = dupe_menu_popup_second(dw, di);
}
- gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
+ gtk_menu_popup_at_pointer(GTK_MENU(menu), nullptr);
}
if (!di) return FALSE;
gtk_tree_selection_select_iter(selection, &iter);
tpath = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
- gtk_tree_view_set_cursor(GTK_TREE_VIEW(widget), tpath, NULL, FALSE);
+ gtk_tree_view_set_cursor(GTK_TREE_VIEW(widget), tpath, nullptr, FALSE);
gtk_tree_path_free(tpath);
}
static gboolean dupe_listview_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
GtkTreeModel *store;
GtkTreePath *tpath;
GtkTreeIter iter;
- DupeItem *di = NULL;
+ DupeItem *di = nullptr;
if (bevent->button != MOUSE_BUTTON_LEFT && bevent->button != MOUSE_BUTTON_MIDDLE) return TRUE;
if ((bevent->x != 0 || bevent->y != 0) &&
gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), bevent->x, bevent->y,
- &tpath, NULL, NULL, NULL))
+ &tpath, nullptr, nullptr, nullptr))
{
gtk_tree_model_get_iter(store, &iter, tpath);
gtk_tree_model_get(store, &iter, DUPE_COLUMN_POINTER, &di, -1);
gtk_tree_selection_select_iter(selection, &iter);
tpath = gtk_tree_model_get_path(store, &iter);
- gtk_tree_view_set_cursor(GTK_TREE_VIEW(widget), tpath, NULL, FALSE);
+ gtk_tree_view_set_cursor(GTK_TREE_VIEW(widget), tpath, nullptr, FALSE);
gtk_tree_path_free(tpath);
return TRUE;
gtk_tree_view_columns_autosize(GTK_TREE_VIEW(dw->second_listview));
g_list_free(dw->dupes);
- dw->dupes = NULL;
+ dw->dupes = nullptr;
- dupe_list_free(dw->second_list);
- dw->second_list = NULL;
+ g_list_free_full(dw->second_list, reinterpret_cast<GDestroyNotify>(dupe_item_free));
+ dw->second_list = nullptr;
dupe_match_reset_list(dw->list);
dupe_second_update_status(dw);
}
-static void dupe_second_menu_view_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void dupe_second_menu_view_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto 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)
+static void dupe_second_menu_viewnew_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
if (dw->click_item) dupe_menu_view(dw, dw->click_item, dw->second_listview, TRUE);
}
-static void dupe_second_menu_select_all_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void dupe_second_menu_select_all_cb(GtkWidget *, gpointer data)
{
GtkTreeSelection *selection;
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dw->second_listview));
gtk_tree_selection_select_all(selection);
}
-static void dupe_second_menu_select_none_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void dupe_second_menu_select_none_cb(GtkWidget *, gpointer data)
{
GtkTreeSelection *selection;
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dw->second_listview));
gtk_tree_selection_unselect_all(selection);
}
-static void dupe_second_menu_remove_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void dupe_second_menu_remove_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto 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)
+static void dupe_second_menu_clear_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
dupe_second_clear(dw);
dupe_window_recompare(dw);
static GtkWidget *dupe_menu_popup_second(DupeWindow *dw, DupeItem *di)
{
GtkWidget *menu;
- gboolean notempty = (dw->second_list != NULL);
- gboolean on_row = (di != NULL);
+ gboolean notempty = (dw->second_list != nullptr);
+ gboolean on_row = (di != nullptr);
GtkAccelGroup *accel_group;
menu = popup_menu_short_lived();
menu_item_add_sensitive(menu, _("_View"), on_row,
G_CALLBACK(dupe_second_menu_view_cb), dw);
- menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, on_row,
+ menu_item_add_icon_sensitive(menu, _("View in _new window"), GQ_ICON_NEW, on_row,
G_CALLBACK(dupe_second_menu_viewnew_cb), dw);
menu_item_add_divider(menu);
menu_item_add_sensitive(menu, _("Select all"), notempty,
menu_item_add_sensitive(menu, _("Select none"), notempty,
G_CALLBACK(dupe_second_menu_select_none_cb), dw);
menu_item_add_divider(menu);
- menu_item_add_stock_sensitive(menu, _("Rem_ove"), GTK_STOCK_REMOVE, on_row,
+ menu_item_add_icon_sensitive(menu, _("Rem_ove"), GQ_ICON_REMOVE, on_row,
G_CALLBACK(dupe_second_menu_remove_cb), dw);
- menu_item_add_stock_sensitive(menu, _("C_lear"), GTK_STOCK_CLEAR, notempty,
+ menu_item_add_icon_sensitive(menu, _("C_lear"), GQ_ICON_CLEAR, notempty,
G_CALLBACK(dupe_second_menu_clear_cb), dw);
menu_item_add_divider(menu);
- menu_item_add_stock(menu, _("Close _window"), GTK_STOCK_CLOSE,
+ menu_item_add_icon(menu, _("Close _window"), GQ_ICON_CLOSE,
G_CALLBACK(dupe_menu_close_cb), dw);
return menu;
static void dupe_second_set_toggle_cb(GtkWidget *widget, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
dw->second_set = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
if (dw->second_set)
{
dupe_second_update_status(dw);
- gtk_table_set_col_spacings(GTK_TABLE(dw->table), PREF_PAD_GAP);
+ gtk_grid_set_column_spacing(GTK_GRID(dw->table), PREF_PAD_GAP);
gtk_widget_show(dw->second_vbox);
}
else
{
- gtk_table_set_col_spacings(GTK_TABLE(dw->table), 0);
+ gtk_grid_set_column_spacing(GTK_GRID(dw->table), 0);
gtk_widget_hide(dw->second_vbox);
dupe_second_clear(dw);
}
static void dupe_sort_totals_toggle_cb(GtkWidget *widget, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
options->sort_totals = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
dupe_window_recompare(dw);
static void dupe_menu_type_cb(GtkWidget *combo, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
GtkTreeModel *store;
GtkTreeIter iter;
*-------------------------------------------------------------------
*/
-/* this overrides the low default of a GtkCellRenderer from 100 to CELL_HEIGHT_OVERRIDE, something sane for our purposes */
-
-#define CELL_HEIGHT_OVERRIDE 512
-
-void cell_renderer_height_override(GtkCellRenderer *renderer)
-{
- GParamSpec *spec;
-
- spec = g_object_class_find_property(G_OBJECT_GET_CLASS(G_OBJECT(renderer)), "height");
- if (spec && G_IS_PARAM_SPEC_INT(spec))
- {
- GParamSpecInt *spec_int;
-
- spec_int = G_PARAM_SPEC_INT(spec);
- if (spec_int->maximum < CELL_HEIGHT_OVERRIDE) spec_int->maximum = CELL_HEIGHT_OVERRIDE;
- }
-}
-
-static GdkColor *dupe_listview_color_shifted(GtkWidget *widget)
+static GdkRGBA *dupe_listview_color_shifted(GtkWidget *widget)
{
- static GdkColor color;
- static GtkWidget *done = NULL;
+ static GdkRGBA color;
+ static GtkWidget *done = nullptr;
if (done != widget)
{
GtkStyle *style;
style = gtk_widget_get_style(widget);
- memcpy(&color, &style->base[GTK_STATE_NORMAL], sizeof(color));
+ convert_gdkcolor_to_gdkrgba(&style->base[GTK_STATE_NORMAL], &color);
+
shift_color(&color, -1, 0);
done = widget;
}
return &color;
}
-static void dupe_listview_color_cb(GtkTreeViewColumn *UNUSED(tree_column), GtkCellRenderer *cell,
+static void dupe_listview_color_cb(GtkTreeViewColumn *, GtkCellRenderer *cell,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
gboolean set;
gtk_tree_model_get(tree_model, iter, DUPE_COLUMN_COLOR, &set, -1);
g_object_set(G_OBJECT(cell),
- "cell-background-gdk", dupe_listview_color_shifted(dw->listview),
+ "cell-background-rgba", dupe_listview_color_shifted(dw->listview),
"cell-background-set", set, NULL);
}
if (listview == dw->listview)
{
/* sets background before rendering */
- gtk_tree_view_column_set_cell_data_func(column, renderer, dupe_listview_color_cb, dw, NULL);
+ gtk_tree_view_column_set_cell_data_func(column, renderer, dupe_listview_color_cb, dw, nullptr);
}
gtk_tree_view_append_column(GTK_TREE_VIEW(listview), column);
static void dupe_window_show_thumb_cb(GtkWidget *widget, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
dw->show_thumbs = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
options->duplicates_thumbnails = dw->show_thumbs;
gboolean valid;
thumb_loader_free(dw->thumb_loader);
- dw->thumb_loader = NULL;
+ dw->thumb_loader = nullptr;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(dw->listview));
valid = gtk_tree_model_get_iter_first(store, &iter);
gtk_list_store_set(GTK_LIST_STORE(store), &iter, DUPE_COLUMN_THUMB, NULL, -1);
valid = gtk_tree_model_iter_next(store, &iter);
}
- dupe_window_update_progress(dw, NULL, 0.0, FALSE);
+ dupe_window_update_progress(dw, nullptr, 0.0, FALSE);
}
dupe_listview_set_height(dw->listview, dw->show_thumbs);
static void dupe_window_rotation_invariant_cb(GtkWidget *widget, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
options->rot_invariant_sim = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
dupe_window_recompare(dw);
static void dupe_window_custom_threshold_cb(GtkWidget *widget, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
DupeMatchType match_type;
GtkTreeModel *store;
gboolean valid;
static gboolean dupe_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
gboolean stop_signal = FALSE;
gboolean on_second;
GtkWidget *listview;
GtkTreeModel *store;
GtkTreeSelection *selection;
GList *slist;
- DupeItem *di = NULL;
+ DupeItem *di = nullptr;
on_second = gtk_widget_has_focus(dw->second_listview);
gtk_tree_model_get_iter(store, &iter, tpath);
gtk_tree_model_get(store, &iter, DUPE_COLUMN_POINTER, &di, -1);
}
- g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
- g_list_free(slist);
+ g_list_free_full(slist, reinterpret_cast<GDestroyNotify>(gtk_tree_path_free));
if (event->state & GDK_CONTROL_MASK)
{
case '0':
break;
case 'C': case 'c':
- file_util_copy(NULL, dupe_listview_get_selection(dw, listview),
- NULL, dw->window);
+ file_util_copy(nullptr, dupe_listview_get_selection(dw, listview),
+ nullptr, dw->window);
break;
case 'M': case 'm':
- file_util_move(NULL, dupe_listview_get_selection(dw, listview),
- NULL, dw->window);
+ file_util_move(nullptr, dupe_listview_get_selection(dw, listview),
+ nullptr, dw->window);
break;
case 'R': case 'r':
- file_util_rename(NULL, dupe_listview_get_selection(dw, listview), dw->window);
+ file_util_rename(nullptr, dupe_listview_get_selection(dw, listview), dw->window);
break;
case 'D': case 'd':
options->file_ops.safe_delete_enable = TRUE;
- file_util_delete(NULL, dupe_listview_get_selection(dw, listview), dw->window);
+ file_util_delete(nullptr, dupe_listview_get_selection(dw, listview), dw->window);
break;
default:
stop_signal = FALSE;
}
}
}
+ else if (event->state & GDK_SHIFT_MASK)
+ {
+ stop_signal = TRUE;
+ switch (event->keyval)
+ {
+ case GDK_KEY_Delete:
+ case GDK_KEY_KP_Delete:
+ options->file_ops.safe_delete_enable = FALSE;
+ file_util_delete_notify_done(nullptr, dupe_listview_get_selection(dw, dw->listview), dw->window, delete_finished_cb, dw);
+ break;
+ default:
+ stop_signal = FALSE;
+ break;
+ }
+ }
else
{
stop_signal = TRUE;
GtkWidget *menu;
menu = dupe_menu_popup_main(dw, di);
- gtk_menu_popup_at_widget(GTK_MENU(menu), widget, GDK_GRAVITY_CENTER, GDK_GRAVITY_CENTER, NULL);
+ gtk_menu_popup_at_widget(GTK_MENU(menu), widget, GDK_GRAVITY_CENTER, GDK_GRAVITY_CENTER, nullptr);
}
else
{
GtkWidget *menu;
menu = dupe_menu_popup_second(dw, di);
- gtk_menu_popup_at_widget(GTK_MENU(menu), widget, GDK_GRAVITY_CENTER, GDK_GRAVITY_CENTER, NULL);
+ gtk_menu_popup_at_widget(GTK_MENU(menu), widget, GDK_GRAVITY_CENTER, GDK_GRAVITY_CENTER, nullptr);
}
break;
default:
gtk_tree_view_columns_autosize(GTK_TREE_VIEW(dw->listview));
g_list_free(dw->dupes);
- dw->dupes = NULL;
+ dw->dupes = nullptr;
- dupe_list_free(dw->list);
- dw->list = NULL;
+ g_list_free_full(dw->list, reinterpret_cast<GDestroyNotify>(dupe_item_free));
+ dw->list = nullptr;
dw->set_count = 0;
dupe_match_reset_list(dw->second_list);
dupe_window_update_count(dw, FALSE);
- dupe_window_update_progress(dw, NULL, 0.0, FALSE);
+ dupe_window_update_progress(dw, nullptr, 0.0, FALSE);
}
static void dupe_window_get_geometry(DupeWindow *dw)
{
GdkWindow *window;
- LayoutWindow *lw = NULL;
+ LayoutWindow *lw = nullptr;
layout_valid(&lw);
dupe_window_get_geometry(dw);
dupe_window_list = g_list_remove(dupe_window_list, dw);
- gtk_widget_destroy(dw->window);
+ gq_gtk_widget_destroy(dw->window);
g_list_free(dw->dupes);
- dupe_list_free(dw->list);
+ g_list_free_full(dw->list, reinterpret_cast<GDestroyNotify>(dupe_item_free));
- dupe_list_free(dw->second_list);
+ g_list_free_full(dw->second_list, reinterpret_cast<GDestroyNotify>(dupe_item_free));
file_data_unregister_notify_func(dupe_notify_cb, dw);
g_free(dw);
}
-static gint dupe_window_close_cb(GtkWidget *UNUSED(widget), gpointer data)
+static gint dupe_window_close_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
dupe_window_close(dw);
return TRUE;
}
-static gint dupe_window_delete(GtkWidget *UNUSED(widget), GdkEvent *UNUSED(event), gpointer data)
+static gint dupe_window_delete(GtkWidget *, GdkEvent *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
dupe_window_close(dw);
return TRUE;
}
-static void dupe_help_cb(GtkAction *UNUSED(action), gpointer UNUSED(data))
+static void dupe_help_cb(GtkAction *, gpointer)
{
help_window_show("GuideImageSearchFindingDuplicates.html");
}
-static gint default_sort_cb(GtkTreeModel *UNUSED(model), GtkTreeIter *UNUSED(a), GtkTreeIter *UNUSED(b), gpointer UNUSED(data))
+static gint default_sort_cb(GtkTreeModel *, GtkTreeIter *, GtkTreeIter *, gpointer)
{
return 0;
}
static gint column_sort_cb(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer data)
{
- GtkTreeSortable *sortable = static_cast<GtkTreeSortable *>(data);
+ auto sortable = static_cast<GtkTreeSortable *>(data);
gint ret = 0;
- gchar *rank_str_a, *rank_str_b;
+ gchar *rank_str_a;
+ gchar *rank_str_b;
gint rank_int_a;
gint rank_int_b;
gint group_a;
return ret;
}
-static void column_clicked_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void column_clicked_cb(GtkWidget *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
options->duplicates_match = DUPE_SELECT_NONE;
dupe_listview_select_dupes(dw, DUPE_SELECT_NONE);
GtkListStore *store;
GtkTreeSelection *selection;
GdkGeometry geometry;
- LayoutWindow *lw = NULL;
+ LayoutWindow *lw = nullptr;
layout_valid(&lw);
dw = g_new0(DupeWindow, 1);
- dw->add_files_queue = NULL;
+ dw->add_files_queue = nullptr;
dw->add_files_queue_id = 0;
dw->match_mask = DUPE_MATCH_NAME;
if (options->duplicates_match == DUPE_MATCH_NAME_CI_CONTENT) dw->match_mask = DUPE_MATCH_NAME_CI_CONTENT;
if (options->duplicates_match == DUPE_MATCH_ALL) dw->match_mask = DUPE_MATCH_ALL;
- dw->window = window_new(GTK_WINDOW_TOPLEVEL, "dupe", NULL, NULL, _("Find duplicates"));
+ dw->window = window_new("dupe", nullptr, nullptr, _("Find duplicates"));
DEBUG_NAME(dw->window);
geometry.min_width = DEFAULT_MINIMAL_WINDOW_SIZE;
geometry.min_height = DEFAULT_MINIMAL_WINDOW_SIZE;
geometry.base_width = DUPE_DEF_WIDTH;
geometry.base_height = DUPE_DEF_HEIGHT;
- gtk_window_set_geometry_hints(GTK_WINDOW(dw->window), NULL, &geometry,
- GDK_HINT_MIN_SIZE | GDK_HINT_BASE_SIZE);
+ gtk_window_set_geometry_hints(GTK_WINDOW(dw->window), nullptr, &geometry,
+ static_cast<GdkWindowHints>(GDK_HINT_MIN_SIZE | GDK_HINT_BASE_SIZE));
if (lw && options->save_window_positions)
{
gtk_window_set_default_size(GTK_WINDOW(dw->window), lw->options.dupe_window.w, lw->options.dupe_window.h);
- gtk_window_move(GTK_WINDOW(dw->window), lw->options.dupe_window.x, lw->options.dupe_window.y);
+ gq_gtk_window_move(GTK_WINDOW(dw->window), lw->options.dupe_window.x, lw->options.dupe_window.y);
}
else
{
G_CALLBACK(dupe_window_keypress_cb), dw);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
- gtk_container_add(GTK_CONTAINER(dw->window), vbox);
+ gq_gtk_container_add(GTK_WIDGET(dw->window), vbox);
gtk_widget_show(vbox);
- dw->table = gtk_table_new(1, 3, FALSE);
- gtk_box_pack_start(GTK_BOX(vbox), dw->table, TRUE, TRUE, 0);
+ dw->table = gtk_grid_new();
+ gq_gtk_box_pack_start(GTK_BOX(vbox), dw->table, TRUE, TRUE, 0);
+ gtk_grid_set_row_homogeneous(GTK_GRID(dw->table), TRUE);
+ gtk_grid_set_column_homogeneous(GTK_GRID(dw->table), TRUE);
gtk_widget_show(dw->table);
- scrolled = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+ scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
+ gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_table_attach_defaults(GTK_TABLE(dw->table), scrolled, 0, 2, 0, 1);
+ gtk_grid_attach(GTK_GRID(dw->table), scrolled, 0, 0, 2, 1);
gtk_widget_show(scrolled);
store = gtk_list_store_new(DUPE_COLUMN_COUNT, G_TYPE_POINTER, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INT, G_TYPE_INT);
dw->sortable = GTK_TREE_SORTABLE(store);
- gtk_tree_sortable_set_sort_func(dw->sortable, DUPE_COLUMN_RANK, column_sort_cb, dw->sortable, NULL);
- gtk_tree_sortable_set_sort_func(dw->sortable, DUPE_COLUMN_SET, default_sort_cb, dw->sortable, NULL);
- gtk_tree_sortable_set_sort_func(dw->sortable, DUPE_COLUMN_THUMB, default_sort_cb, dw->sortable, NULL);
- gtk_tree_sortable_set_sort_func(dw->sortable, DUPE_COLUMN_NAME, column_sort_cb, dw->sortable, NULL);
- gtk_tree_sortable_set_sort_func(dw->sortable, DUPE_COLUMN_SIZE, column_sort_cb, dw->sortable, NULL);
- gtk_tree_sortable_set_sort_func(dw->sortable, DUPE_COLUMN_DATE, column_sort_cb, dw->sortable, NULL);
- gtk_tree_sortable_set_sort_func(dw->sortable, DUPE_COLUMN_DIMENSIONS, column_sort_cb, dw->sortable, NULL);
- gtk_tree_sortable_set_sort_func(dw->sortable, DUPE_COLUMN_PATH, column_sort_cb, dw->sortable, NULL);
+ gtk_tree_sortable_set_sort_func(dw->sortable, DUPE_COLUMN_RANK, column_sort_cb, dw->sortable, nullptr);
+ gtk_tree_sortable_set_sort_func(dw->sortable, DUPE_COLUMN_SET, default_sort_cb, dw->sortable, nullptr);
+ gtk_tree_sortable_set_sort_func(dw->sortable, DUPE_COLUMN_THUMB, default_sort_cb, dw->sortable, nullptr);
+ gtk_tree_sortable_set_sort_func(dw->sortable, DUPE_COLUMN_NAME, column_sort_cb, dw->sortable, nullptr);
+ gtk_tree_sortable_set_sort_func(dw->sortable, DUPE_COLUMN_SIZE, column_sort_cb, dw->sortable, nullptr);
+ gtk_tree_sortable_set_sort_func(dw->sortable, DUPE_COLUMN_DATE, column_sort_cb, dw->sortable, nullptr);
+ gtk_tree_sortable_set_sort_func(dw->sortable, DUPE_COLUMN_DIMENSIONS, column_sort_cb, dw->sortable, nullptr);
+ gtk_tree_sortable_set_sort_func(dw->sortable, DUPE_COLUMN_PATH, column_sort_cb, dw->sortable, nullptr);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(dw->listview));
gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_MULTIPLE);
g_signal_connect(gtk_tree_view_get_column(GTK_TREE_VIEW(dw->listview), DUPE_COLUMN_DIMENSIONS - 1), "clicked", (GCallback)column_clicked_cb, dw);
g_signal_connect(gtk_tree_view_get_column(GTK_TREE_VIEW(dw->listview), DUPE_COLUMN_PATH - 1), "clicked", (GCallback)column_clicked_cb, dw);
- gtk_container_add(GTK_CONTAINER(scrolled), dw->listview);
+ gq_gtk_container_add(GTK_WIDGET(scrolled), dw->listview);
gtk_widget_show(dw->listview);
dw->second_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
- gtk_table_attach_defaults(GTK_TABLE(dw->table), dw->second_vbox, 2, 3, 0, 1);
+ gtk_grid_attach(GTK_GRID(dw->table), dw->second_vbox, 2, 0, 3, 1);
if (dw->second_set)
{
- gtk_table_set_col_spacings(GTK_TABLE(dw->table), PREF_PAD_GAP);
+ gtk_grid_set_column_spacing(GTK_GRID(dw->table), PREF_PAD_GAP);
gtk_widget_show(dw->second_vbox);
}
else
{
- gtk_table_set_col_spacings(GTK_TABLE(dw->table), 0);
+ gtk_grid_set_column_spacing(GTK_GRID(dw->table), 0);
}
- scrolled = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+ scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
+ gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start(GTK_BOX(dw->second_vbox), scrolled, TRUE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(dw->second_vbox), scrolled, TRUE, TRUE, 0);
gtk_widget_show(scrolled);
store = gtk_list_store_new(2, G_TYPE_POINTER, G_TYPE_STRING);
dupe_listview_add_column(dw, dw->second_listview, 1, _("Compare to:"), FALSE, FALSE);
- gtk_container_add(GTK_CONTAINER(scrolled), dw->second_listview);
+ gq_gtk_container_add(GTK_WIDGET(scrolled), dw->second_listview);
gtk_widget_show(dw->second_listview);
dw->second_status_label = gtk_label_new("");
- gtk_box_pack_start(GTK_BOX(dw->second_vbox), dw->second_status_label, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(dw->second_vbox), dw->second_status_label, FALSE, FALSE, 0);
gtk_widget_show(dw->second_status_label);
pref_line(dw->second_vbox, GTK_ORIENTATION_HORIZONTAL);
status_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start(GTK_BOX(vbox), status_box, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(vbox), status_box, FALSE, FALSE, 0);
gtk_widget_show(status_box);
- frame = gtk_frame_new(NULL);
+ frame = gtk_frame_new(nullptr);
DEBUG_NAME(frame);
- gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
- gtk_box_pack_start(GTK_BOX(status_box), frame, TRUE, TRUE, 0);
+ gq_gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+ gq_gtk_box_pack_start(GTK_BOX(status_box), frame, TRUE, TRUE, 0);
gtk_widget_show(frame);
dw->status_label = gtk_label_new("");
- gtk_container_add(GTK_CONTAINER(frame), dw->status_label);
+ gq_gtk_container_add(GTK_WIDGET(frame), dw->status_label);
gtk_widget_show(dw->status_label);
dw->extra_label = gtk_progress_bar_new();
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(dw->extra_label), 0.0);
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(dw->extra_label), "");
gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(dw->extra_label), TRUE);
- gtk_box_pack_start(GTK_BOX(status_box), dw->extra_label, FALSE, FALSE, PREF_PAD_SPACE);
+ gq_gtk_box_pack_start(GTK_BOX(status_box), dw->extra_label, FALSE, FALSE, PREF_PAD_SPACE);
gtk_widget_show(dw->extra_label);
controls_box = pref_box_new(vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, 0);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dw->button_thumbs), dw->show_thumbs);
g_signal_connect(G_OBJECT(dw->button_thumbs), "toggled",
G_CALLBACK(dupe_window_show_thumb_cb), dw);
- gtk_box_pack_start(GTK_BOX(controls_box), dw->button_thumbs, FALSE, FALSE, PREF_PAD_SPACE);
+ gq_gtk_box_pack_start(GTK_BOX(controls_box), dw->button_thumbs, FALSE, FALSE, PREF_PAD_SPACE);
gtk_widget_show(dw->button_thumbs);
label = gtk_label_new(_("Compare by:"));
- gtk_box_pack_start(GTK_BOX(controls_box), label, FALSE, FALSE, PREF_PAD_SPACE);
+ gq_gtk_box_pack_start(GTK_BOX(controls_box), label, FALSE, FALSE, PREF_PAD_SPACE);
gtk_widget_show(label);
dupe_menu_setup(dw);
- gtk_box_pack_start(GTK_BOX(controls_box), dw->combo, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(controls_box), dw->combo, FALSE, FALSE, 0);
gtk_widget_show(dw->combo);
label = gtk_label_new(_("Custom Threshold"));
- gtk_box_pack_start(GTK_BOX(controls_box), label, FALSE, FALSE, PREF_PAD_SPACE);
+ gq_gtk_box_pack_start(GTK_BOX(controls_box), label, FALSE, FALSE, PREF_PAD_SPACE);
gtk_widget_show(label);
dw->custom_threshold = gtk_spin_button_new_with_range(1, 100, 1);
gtk_widget_set_tooltip_text(GTK_WIDGET(dw->custom_threshold), "Custom similarity threshold\n(Use tab key to set value)");
gtk_spin_button_set_value(GTK_SPIN_BUTTON(dw->custom_threshold), options->duplicates_similarity_threshold);
g_signal_connect(G_OBJECT(dw->custom_threshold), "value_changed", G_CALLBACK(dupe_window_custom_threshold_cb), dw);
- gtk_box_pack_start(GTK_BOX(controls_box), dw->custom_threshold, FALSE, FALSE, PREF_PAD_SPACE);
+ gq_gtk_box_pack_start(GTK_BOX(controls_box), dw->custom_threshold, FALSE, FALSE, PREF_PAD_SPACE);
gtk_widget_show(dw->custom_threshold);
button = gtk_check_button_new_with_label(_("Sort"));
- gtk_widget_set_tooltip_text(GTK_WIDGET(button), "Sort by group totals");
+ gtk_widget_set_tooltip_text(GTK_WIDGET(button), _("Sort by group totals"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), options->sort_totals);
g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(dupe_sort_totals_toggle_cb), dw);
- gtk_box_pack_start(GTK_BOX(controls_box), button, FALSE, FALSE, PREF_PAD_SPACE);
+ gq_gtk_box_pack_start(GTK_BOX(controls_box), button, FALSE, FALSE, PREF_PAD_SPACE);
gtk_widget_show(button);
dw->button_rotation_invariant = gtk_check_button_new_with_label(_("Ignore Orientation"));
- gtk_widget_set_tooltip_text(GTK_WIDGET(dw->button_rotation_invariant), "Ignore image orientation");
+ gtk_widget_set_tooltip_text(GTK_WIDGET(dw->button_rotation_invariant), _("Ignore image orientation"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dw->button_rotation_invariant), options->rot_invariant_sim);
g_signal_connect(G_OBJECT(dw->button_rotation_invariant), "toggled",
G_CALLBACK(dupe_window_rotation_invariant_cb), dw);
- gtk_box_pack_start(GTK_BOX(controls_box), dw->button_rotation_invariant, FALSE, FALSE, PREF_PAD_SPACE);
+ gq_gtk_box_pack_start(GTK_BOX(controls_box), dw->button_rotation_invariant, FALSE, FALSE, PREF_PAD_SPACE);
gtk_widget_show(dw->button_rotation_invariant);
button = gtk_check_button_new_with_label(_("Compare two file sets"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), dw->second_set);
g_signal_connect(G_OBJECT(button), "toggled",
G_CALLBACK(dupe_second_set_toggle_cb), dw);
- gtk_box_pack_start(GTK_BOX(controls_box), button, FALSE, FALSE, PREF_PAD_SPACE);
+ gq_gtk_box_pack_start(GTK_BOX(controls_box), button, FALSE, FALSE, PREF_PAD_SPACE);
gtk_widget_show(button);
button_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start(GTK_BOX(vbox), button_box, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(vbox), button_box, FALSE, FALSE, 0);
gtk_widget_show(button_box);
- hbox = gtk_hbutton_box_new();
+ hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
gtk_box_set_spacing(GTK_BOX(hbox), PREF_PAD_SPACE);
- gtk_box_pack_end(GTK_BOX(button_box), hbox, FALSE, FALSE, 0);
+ gq_gtk_box_pack_end(GTK_BOX(button_box), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
- button = pref_button_new(NULL, GTK_STOCK_HELP, NULL, FALSE, G_CALLBACK(dupe_help_cb), NULL);
+ button = pref_button_new(nullptr, GQ_ICON_HELP, _("Help"), G_CALLBACK(dupe_help_cb), nullptr);
gtk_widget_set_tooltip_text(GTK_WIDGET(button), "F1");
- gtk_container_add(GTK_CONTAINER(hbox), button);
+ gq_gtk_container_add(GTK_WIDGET(hbox), button);
gtk_widget_set_can_default(button, TRUE);
gtk_widget_show(button);
- button = pref_button_new(NULL, GTK_STOCK_STOP, NULL, FALSE, G_CALLBACK(dupe_check_stop_cb), dw);
- gtk_container_add(GTK_CONTAINER(hbox), button);
+ button = pref_button_new(nullptr, GQ_ICON_STOP, _("Stop"), G_CALLBACK(dupe_check_stop_cb), dw);
+ gq_gtk_container_add(GTK_WIDGET(hbox), button);
gtk_widget_set_can_default(button, TRUE);
gtk_widget_show(button);
- button = pref_button_new(NULL, GTK_STOCK_CLOSE, NULL, FALSE, G_CALLBACK(dupe_window_close_cb), dw);
+ button = pref_button_new(nullptr, GQ_ICON_CLOSE, _("Close"), G_CALLBACK(dupe_window_close_cb), dw);
gtk_widget_set_tooltip_text(GTK_WIDGET(button), "Ctrl-W");
- gtk_container_add(GTK_CONTAINER(hbox), button);
+ gq_gtk_container_add(GTK_WIDGET(hbox), button);
gtk_widget_set_can_default(button, TRUE);
gtk_widget_grab_default(button);
gtk_widget_show(button);
g_signal_emit_by_name(G_OBJECT(dw->combo), "changed");
dupe_window_update_count(dw, TRUE);
- dupe_window_update_progress(dw, NULL, 0.0, FALSE);
+ dupe_window_update_progress(dw, nullptr, 0.0, FALSE);
dupe_window_list = g_list_append(dupe_window_list, dw);
g_mutex_init(&dw->thread_count_mutex);
g_mutex_init(&dw->search_matches_mutex);
- dw->dupe_comparison_thread_pool = g_thread_pool_new(dupe_comparison_func, dw, options->threads.duplicates, FALSE, NULL);
+ dw->dupe_comparison_thread_pool = g_thread_pool_new(dupe_comparison_func, dw, options->threads.duplicates, FALSE, nullptr);
return dw;
}
*-------------------------------------------------------------------
*/
-typedef struct {
+struct CDupeConfirmD {
DupeWindow *dw;
GList *list;
-} CDupeConfirmD;
+};
-static void confirm_dir_list_cancel(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
+static void confirm_dir_list_cancel(GtkWidget *, gpointer)
{
/* do nothing */
}
-static void confirm_dir_list_add(GtkWidget *UNUSED(widget), gpointer data)
+static void confirm_dir_list_add(GtkWidget *, gpointer data)
{
- CDupeConfirmD *d = static_cast<CDupeConfirmD *>(data);
+ auto d = static_cast<CDupeConfirmD *>(data);
GList *work;
dupe_window_add_files(d->dw, d->list, FALSE);
work = d->list;
while (work)
{
- FileData *fd = static_cast<FileData *>(work->data);
+ auto fd = static_cast<FileData *>(work->data);
work = work->next;
if (isdir(fd->path))
{
GList *list;
- filelist_read(fd, &list, NULL);
+ filelist_read(fd, &list, nullptr);
list = filelist_filter(list, FALSE);
if (list)
{
}
}
-static void confirm_dir_list_recurse(GtkWidget *UNUSED(widget), gpointer data)
+static void confirm_dir_list_recurse(GtkWidget *, gpointer data)
{
- CDupeConfirmD *d = static_cast<CDupeConfirmD *>(data);
+ auto 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)
+static void confirm_dir_list_skip(GtkWidget *, gpointer data)
{
- CDupeConfirmD *d = static_cast<CDupeConfirmD *>(data);
+ auto 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)
+static void confirm_dir_list_destroy(GtkWidget *, gpointer data)
{
- CDupeConfirmD *d = static_cast<CDupeConfirmD *>(data);
+ auto d = static_cast<CDupeConfirmD *>(data);
filelist_free(d->list);
g_free(d);
}
g_signal_connect(G_OBJECT(menu), "destroy",
G_CALLBACK(confirm_dir_list_destroy), d);
- menu_item_add_stock(menu, _("Dropped list includes folders."), GTK_STOCK_DND_MULTIPLE, NULL, NULL);
+ menu_item_add_stock(menu, _("Dropped list includes folders."), GQ_ICON_DND, nullptr, nullptr);
menu_item_add_divider(menu);
- menu_item_add_stock(menu, _("_Add contents"), GTK_STOCK_OK, G_CALLBACK(confirm_dir_list_add), d);
- menu_item_add_stock(menu, _("Add contents _recursive"), GTK_STOCK_ADD, G_CALLBACK(confirm_dir_list_recurse), d);
- menu_item_add_stock(menu, _("_Skip folders"), GTK_STOCK_REMOVE, G_CALLBACK(confirm_dir_list_skip), d);
+ menu_item_add_icon(menu, _("_Add contents"), GQ_ICON_OK, G_CALLBACK(confirm_dir_list_add), d);
+ menu_item_add_icon(menu, _("Add contents _recursive"), GQ_ICON_ADD, G_CALLBACK(confirm_dir_list_recurse), d);
+ menu_item_add_icon(menu, _("_Skip folders"), GQ_ICON_REMOVE, G_CALLBACK(confirm_dir_list_skip), d);
menu_item_add_divider(menu);
- menu_item_add_stock(menu, _("Cancel"), GTK_STOCK_CANCEL, G_CALLBACK(confirm_dir_list_cancel), d);
+ menu_item_add_icon(menu, _("Cancel"), GQ_ICON_CANCEL, G_CALLBACK(confirm_dir_list_cancel), d);
return menu;
}
*/
static GtkTargetEntry dupe_drag_types[] = {
- { "text/uri-list", 0, TARGET_URI_LIST },
- { "text/plain", 0, TARGET_TEXT_PLAIN }
+ { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST },
+ { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
};
static gint n_dupe_drag_types = 2;
static GtkTargetEntry dupe_drop_types[] = {
- { TARGET_APP_COLLECTION_MEMBER_STRING, 0, TARGET_APP_COLLECTION_MEMBER },
- { "text/uri-list", 0, TARGET_URI_LIST }
+ { const_cast<gchar *>(TARGET_APP_COLLECTION_MEMBER_STRING), 0, TARGET_APP_COLLECTION_MEMBER },
+ { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST }
};
static gint n_dupe_drop_types = 2;
-static void dupe_dnd_data_set(GtkWidget *widget, GdkDragContext *UNUSED(context),
+static void dupe_dnd_data_set(GtkWidget *widget, GdkDragContext *,
GtkSelectionData *selection_data, guint info,
- guint UNUSED(time), gpointer data)
+ guint, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
GList *list;
switch (info)
}
static void dupe_dnd_data_get(GtkWidget *widget, GdkDragContext *context,
- gint UNUSED(x), gint UNUSED(y),
+ gint, gint,
GtkSelectionData *selection_data, guint info,
- guint UNUSED(time), gpointer data)
+ guint, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
GtkWidget *source;
- GList *list = NULL;
+ GList *list = nullptr;
GList *work;
if (dw->add_files_queue_id > 0)
{
- warning_dialog(_("Find duplicates"), _("Please wait for the current file selection to be loaded."), GTK_STOCK_DIALOG_INFO, dw->window);
+ warning_dialog(_("Find duplicates"), _("Please wait for the current file selection to be loaded."), GQ_ICON_DIALOG_INFO, dw->window);
return;
}
switch (info)
{
case TARGET_APP_COLLECTION_MEMBER:
- collection_from_dnd_data((gchar *)gtk_selection_data_get_data(selection_data), &list, NULL);
+ collection_from_dnd_data(reinterpret_cast<const gchar *>(gtk_selection_data_get_data(selection_data)), &list, nullptr);
break;
case TARGET_URI_LIST:
list = uri_filelist_from_gtk_selection_data(selection_data);
work = list;
while (work)
{
- FileData *fd = static_cast<FileData *>(work->data);
+ auto fd = static_cast<FileData *>(work->data);
if (isdir(fd->path))
{
GtkWidget *menu;
menu = dupe_confirm_dir_list(dw, list);
- gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
+ gtk_menu_popup_at_pointer(GTK_MENU(menu), nullptr);
return;
}
work = work->next;
}
break;
default:
- list = NULL;
+ list = nullptr;
break;
}
if (enable)
{
gtk_drag_dest_set(widget,
- GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP,
+ static_cast<GtkDestDefaults>(GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP),
dupe_drop_types, n_dupe_drop_types,
- GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_ASK);
+ static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_ASK));
}
else
static void dupe_dnd_begin(GtkWidget *widget, GdkDragContext *context, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
dupe_dest_set(dw->listview, FALSE);
dupe_dest_set(dw->second_listview, FALSE);
gtk_tree_selection_select_iter(selection, &iter);
tpath = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
- gtk_tree_view_set_cursor(GTK_TREE_VIEW(widget), tpath, NULL, FALSE);
+ gtk_tree_view_set_cursor(GTK_TREE_VIEW(widget), tpath, nullptr, FALSE);
gtk_tree_path_free(tpath);
}
}
}
}
-static void dupe_dnd_end(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context), gpointer data)
+static void dupe_dnd_end(GtkWidget *, GdkDragContext *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
dupe_dest_set(dw->listview, TRUE);
dupe_dest_set(dw->second_listview, TRUE);
}
static void dupe_dnd_init(DupeWindow *dw)
{
- gtk_drag_source_set(dw->listview, GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
+ gtk_drag_source_set(dw->listview, static_cast<GdkModifierType>(GDK_BUTTON1_MASK | GDK_BUTTON2_MASK),
dupe_drag_types, n_dupe_drag_types,
- GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
+ static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK));
g_signal_connect(G_OBJECT(dw->listview), "drag_data_get",
G_CALLBACK(dupe_dnd_data_set), dw);
g_signal_connect(G_OBJECT(dw->listview), "drag_begin",
g_signal_connect(G_OBJECT(dw->listview), "drag_data_received",
G_CALLBACK(dupe_dnd_data_get), dw);
- gtk_drag_source_set(dw->second_listview, GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
+ gtk_drag_source_set(dw->second_listview, static_cast<GdkModifierType>(GDK_BUTTON1_MASK | GDK_BUTTON2_MASK),
dupe_drag_types, n_dupe_drag_types,
- GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
+ static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK));
g_signal_connect(G_OBJECT(dw->second_listview), "drag_data_get",
G_CALLBACK(dupe_dnd_data_set), dw);
g_signal_connect(G_OBJECT(dw->second_listview), "drag_begin",
static void dupe_notify_cb(FileData *fd, NotifyType type, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
if (!(type & NOTIFY_CHANGE) || !fd->change) return;
* @param success (ud->phase != UTILITY_PHASE_CANCEL) #file_util_dialog_run
* @param dest_path Not used
* @param data #DupeWindow
- *
+ *
* If the window is refreshed after each file of a large set is deleted,
* the UI slows to an unacceptable level. The #FileUtilDoneFunc is used
* to call this function once, when the entire delete operation is completed.
*/
-static void delete_finished_cb(gboolean success, const gchar *UNUSED(dest_path), gpointer data)
+static void delete_finished_cb(gboolean success, const gchar *, gpointer data)
{
- DupeWindow *dw = static_cast<DupeWindow *>(data);
+ auto dw = static_cast<DupeWindow *>(data);
if (!success)
{
*-------------------------------------------------------------------
*/
- typedef enum {
+enum SeparatorType {
EXPORT_CSV = 0,
EXPORT_TSV
-} SeparatorType;
+};
-typedef struct _ExportDupesData ExportDupesData;
-struct _ExportDupesData
+struct ExportDupesData
{
FileDialog *dialog;
SeparatorType separator;
static void export_duplicates_close(ExportDupesData *edd)
{
if (edd->dialog) file_dialog_close(edd->dialog);
- edd->dialog = NULL;
+ edd->dialog = nullptr;
}
-static void export_duplicates_data_cancel_cb(FileDialog *UNUSED(fdlg), gpointer data)
+static void export_duplicates_data_cancel_cb(FileDialog *, gpointer data)
{
- ExportDupesData *edd = static_cast<ExportDupesData *>(data);
+ auto edd = static_cast<ExportDupesData *>(data);
export_duplicates_close(edd);
}
static void export_duplicates_data_save_cb(FileDialog *fdlg, gpointer data)
{
- ExportDupesData *edd = static_cast<ExportDupesData *>(data);
- GError *error = NULL;
+ auto edd = static_cast<ExportDupesData *>(data);
+ GError *error = nullptr;
GtkTreeModel *store;
GtkTreeIter iter;
DupeItem *di;
GFileOutputStream *gfstream;
GFile *out_file;
GString *output_string;
- gchar *sep;
gchar* rank;
GList *work;
GtkTreeSelection *selection;
out_file = g_file_new_for_path(fdlg->dest_path);
- gfstream = g_file_replace(out_file, NULL, TRUE, G_FILE_CREATE_NONE, NULL, &error);
+ gfstream = g_file_replace(out_file, nullptr, TRUE, G_FILE_CREATE_NONE, nullptr, &error);
if (error)
{
log_printf(_("Error creating Export duplicates data file: Error: %s\n"), error->message);
return;
}
- sep = g_strdup((edd->separator == EXPORT_CSV) ? "," : "\t");
+ const gchar *sep = (edd->separator == EXPORT_CSV) ? "," : "\t";
output_string = g_string_new(g_strjoin(sep, _("Match"), _("Group"), _("Similarity"), _("Set"), _("Thumbnail"), _("Name"), _("Size"), _("Date"), _("Width"), _("Height"), _("Path\n"), NULL));
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(edd->dupewindow->listview));
match_count++;
}
color_old = color_new;
- output_string = g_string_append(output_string, g_strdup_printf("%d", match_count));
+ g_string_append_printf(output_string, "%d", match_count);
output_string = g_string_append(output_string, sep);
if ((dupe_match_find_parent(edd->dupewindow, di) == di))
gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, DUPE_COLUMN_RANK, &rank, -1);
rank_split = g_strsplit_set(rank, " [(", -1);
- if (rank_split[0] == NULL)
+ if (rank_split[0] == nullptr)
{
output_string = g_string_append(output_string, "");
}
else
{
- output_string = g_string_append(output_string, g_strdup_printf("%s", rank_split[0]));
+ output_string = g_string_append(output_string, rank_split[0]);
}
output_string = g_string_append(output_string, sep);
g_free(rank);
g_strfreev(rank_split);
- output_string = g_string_append(output_string, g_strdup_printf("%d", (di->second + 1)));
+ g_string_append_printf(output_string, "%d", di->second + 1);
output_string = g_string_append(output_string, sep);
thumb_cache = cache_find_location(CACHE_TYPE_THUMB, di->fd->path);
output_string = g_string_append(output_string, sep);
g_free(name);
- output_string = g_string_append(output_string, g_strdup_printf("%"PRIu64, di->fd->size));
+ g_string_append_printf(output_string, "%" PRIu64, di->fd->size);
output_string = g_string_append(output_string, sep);
output_string = g_string_append(output_string, text_from_time(di->fd->date));
output_string = g_string_append(output_string, sep);
- output_string = g_string_append(output_string, g_strdup_printf("%d", (di->width ? di->width : 0)));
+ g_string_append_printf(output_string, "%d", di->width);
output_string = g_string_append(output_string, sep);
- output_string = g_string_append(output_string, g_strdup_printf("%d", (di->height ? di->height : 0)));
+ g_string_append_printf(output_string, "%d", di->height);
output_string = g_string_append(output_string, sep);
output_string = g_string_append(output_string, di->fd->path);
output_string = g_string_append_c(output_string, '\n');
work = work->next;
}
- g_output_stream_write(G_OUTPUT_STREAM(gfstream), output_string->str, strlen(output_string->str), NULL, &error);
+ g_output_stream_write(G_OUTPUT_STREAM(gfstream), output_string->str, output_string->len, nullptr, &error);
- g_free(sep);
g_string_free(output_string, TRUE);
g_object_unref(gfstream);
g_object_unref(out_file);
export_duplicates_close(edd);
}
-static void pop_menu_export(GList *UNUSED(selection_list), gpointer dupe_window, gpointer data)
+static void pop_menu_export(GList *, gpointer dupe_window, gpointer data)
{
const gint index = GPOINTER_TO_INT(data);
- DupeWindow *dw = static_cast<DupeWindow *>(dupe_window);
- gchar *title = "Export duplicates data";
- gchar *default_path = "/tmp/";
+ auto dw = static_cast<DupeWindow *>(dupe_window);
+ const gchar *title = _("Export duplicates data");
+ const gchar *default_path = "/tmp/";
gchar *file_extension;
- const gchar *stock_id;
ExportDupesData *edd;
const gchar *previous_path;
edd = g_new0(ExportDupesData, 1);
- edd->dialog = file_util_file_dlg(title, "export_duplicates", NULL, export_duplicates_data_cancel_cb, edd);
+ edd->dialog = file_util_file_dlg(title, "export_duplicates", nullptr, export_duplicates_data_cancel_cb, edd);
switch (index)
{
return;
}
- stock_id = GTK_STOCK_SAVE;
-
- generic_dialog_add_message(GENERIC_DIALOG(edd->dialog), NULL, title, NULL, FALSE);
- file_dialog_add_button(edd->dialog, stock_id, NULL, export_duplicates_data_save_cb, TRUE);
+ generic_dialog_add_message(GENERIC_DIALOG(edd->dialog), nullptr, title, nullptr, FALSE);
+ file_dialog_add_button(edd->dialog, GQ_ICON_SAVE, _("Save"), export_duplicates_data_save_cb, TRUE);
previous_path = history_list_find_last_path_by_key("export_duplicates");
GtkWidget *item;
GtkWidget *submenu;
- item = menu_item_add(menu, _("_Export"), NULL, NULL);
+ item = menu_item_add(menu, _("_Export"), nullptr, nullptr);
submenu = gtk_menu_new();
g_object_set_data(G_OBJECT(submenu), "submenu_data", data);
- menu_item_add_stock_sensitive(submenu, _("Export to csv"),
- GTK_STOCK_INDEX, TRUE, G_CALLBACK(func), GINT_TO_POINTER(0));
- menu_item_add_stock_sensitive(submenu, _("Export to tab-delimited"),
- GTK_STOCK_INDEX, TRUE, G_CALLBACK(func), GINT_TO_POINTER(1));
+ menu_item_add_icon_sensitive(submenu, _("Export to csv"),
+ GQ_ICON_EXPORT, TRUE, G_CALLBACK(func), GINT_TO_POINTER(0));
+ menu_item_add_icon_sensitive(submenu, _("Export to tab-delimited"),
+ GQ_ICON_EXPORT, TRUE, G_CALLBACK(func), GINT_TO_POINTER(1));
gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
if (menu_item) *menu_item = item;
projects / geeqie.git / blobdiff