* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "main.h"
#include "rcfile.h"
-#include "bar.h"
+#include <config.h>
+
#include "bar-comment.h"
#include "bar-exif.h"
+#include "bar-gps.h"
#include "bar-histogram.h"
#include "bar-keywords.h"
#include "bar-rating.h"
#include "bar-sort.h"
+#include "bar.h"
+#include "debug.h"
+#include "dupe.h"
#include "editors.h"
#include "filefilter.h"
+#include "intl.h"
+#include "layout-util.h"
+#include "main-defines.h"
+#include "metadata.h"
#include "pixbuf-renderer.h"
#include "secure-save.h"
#include "slideshow.h"
#include "ui-fileops.h"
-#include "layout-util.h"
-#include "bar.h"
-#include "metadata.h"
-#include "bar-gps.h"
-#include "dupe.h"
#include "ui-utildlg.h"
/*
g_string_append_printf(str, "\n%*s", indent * 4, "");
}
-void write_char_option(GString *str, gint UNUSED(indent), const gchar *label, const gchar *text)
+void write_char_option(GString *str, gint, const gchar *label, const gchar *text)
{
/* this is needed for overlay string, because g_markup_escape_text does not handle \n and such,
ideas for improvement are welcome
return TRUE;
}
-/* Since gdk_color_to_string() is only available since gtk 2.12
- * here is an equivalent stub function. */
-static gchar *color_to_string(GdkColor *color)
-{
- return g_strdup_printf("#%04X%04X%04X", color->red, color->green, color->blue);
-}
-
-void write_color_option(GString *str, gint indent, const gchar *label, GdkColor *color)
+void write_color_option(GString *str, gint indent, const gchar *label, GdkRGBA *color)
{
if (color)
{
- gchar *colorstring = color_to_string(color);
+ gchar *colorstring = gdk_rgba_to_string(color);
write_char_option(str, indent, label, colorstring);
g_free(colorstring);
write_char_option(str, indent, label, "");
}
-gboolean read_color_option(const gchar *option, const gchar *label, const gchar *value, GdkColor *color)
+/**
+ * @brief Read color option
+ * @param option
+ * @param label
+ * @param value
+ * @param color Returned RGBA value
+ * @returns
+ *
+ * The change from GdkColor to GdkRGBA requires a color format change.
+ * If the value string starts with #, it is a value stored as GdkColor,
+ * which is "#666666666666".
+ * The GdkRGBA style is "rgba(192,97,203,0)"
+ */
+gboolean read_color_option(const gchar *option, const gchar *label, const gchar *value, GdkRGBA *color)
{
+ guint64 color_from_hex_string;
+
if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
if (!color) return FALSE;
if (!*value) return FALSE;
- gdk_color_parse(value, color);
+
+ /* Convert from GTK3 compatible GdkColor to GTK4 compatible GdkRGBA */
+ if (g_str_has_prefix(value, "#"))
+ {
+ color_from_hex_string = g_ascii_strtoll(value + 1, nullptr, 16);
+ color->red = (gdouble)((color_from_hex_string & 0xffff00000000) >> 32) / 65535;
+ color->green = (gdouble)((color_from_hex_string & 0x0000ffff0000) >> 16) / 65535;
+ color->blue = (gdouble)(color_from_hex_string & 0x00000000ffff) / 65535;
+ }
+ else
+ {
+ gdk_rgba_parse(color, value);
+ }
+
return TRUE;
}
-void write_int_option(GString *str, gint UNUSED(indent), const gchar *label, gint n)
+void write_int_option(GString *str, gint, const gchar *label, gint n)
{
g_string_append_printf(str, "%s = \"%d\" ", label, n);
}
if (g_ascii_isdigit(value[0]) || (value[0] == '-' && g_ascii_isdigit(value[1])))
{
- *n = strtol(value, NULL, 10);
+ *n = strtol(value, nullptr, 10);
}
else
{
return TRUE;
}
-//void write_ushort_option(GString *str, gint UNUSED(indent), const gchar *label, guint16 n)
-//{
- //g_string_append_printf(str, "%s = \"%uh\" ", label, n);
-//}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+void write_ushort_option_unused(GString *str, gint, const gchar *label, guint16 n)
+{
+ g_string_append_printf(str, "%s = \"%uh\" ", label, n);
+}
+#pragma GCC diagnostic pop
gboolean read_ushort_option(const gchar *option, const gchar *label, const gchar *value, guint16 *n)
{
if (g_ascii_isdigit(value[0]))
{
- *n = strtoul(value, NULL, 10);
+ *n = strtoul(value, nullptr, 10);
}
else
{
return TRUE;
}
-void write_uint_option(GString *str, gint UNUSED(indent), const gchar *label, guint n)
+void write_uint_option(GString *str, gint, const gchar *label, guint n)
{
g_string_append_printf(str, "%s = \"%u\" ", label, n);
}
if (g_ascii_isdigit(value[0]))
{
- *n = strtoul(value, NULL, 10);
+ *n = strtoul(value, nullptr, 10);
}
else
{
return ret;
}
-void write_int_unit_option(GString *str, gint UNUSED(indent), const gchar *label, gint n, gint subunits)
+void write_int_unit_option(GString *str, gint, const gchar *label, gint n, gint subunits)
{
- gint l, r;
+ gint l;
+ gint r;
if (subunits > 0)
{
gboolean read_int_unit_option(const gchar *option, const gchar *label, const gchar *value, gint *n, gint subunits)
{
- gint l, r;
- gchar *ptr, *buf;
+ gint l;
+ gint r;
+ gchar *ptr;
+ gchar *buf;
if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
if (!n) return FALSE;
if (*ptr == '.')
{
*ptr = '\0';
- l = strtol(value, NULL, 10);
+ l = strtol(value, nullptr, 10);
*ptr = '.';
ptr++;
- r = strtol(ptr, NULL, 10);
+ r = strtol(ptr, nullptr, 10);
}
else
{
- l = strtol(value, NULL, 10);
+ l = strtol(value, nullptr, 10);
r = 0;
}
return TRUE;
}
-void write_bool_option(GString *str, gint UNUSED(indent), const gchar *label, gint n)
+void write_bool_option(GString *str, gint, const gchar *label, gint n)
{
g_string_append_printf(str, "%s = \"%s\" ", label, n ? "true" : "false");
}
WRITE_NL(); WRITE_BOOL(*options, save_dialog_window_positions);
WRITE_NL(); WRITE_BOOL(*options, show_window_ids);
WRITE_NL(); WRITE_BOOL(*options, expand_menu_toolbar);
+ WRITE_NL(); WRITE_BOOL(*options, hamburger_menu);
WRITE_NL(); WRITE_UINT(*options, log_window_lines);
WRITE_NL(); WRITE_BOOL(*options, log_window.timer_data);
WRITE_NL(); WRITE_CHAR(*options, external_preview.extract);
WRITE_NL(); WRITE_BOOL(*options, with_rename);
+ WRITE_NL(); WRITE_BOOL(*options, collections_duplicates);
WRITE_NL(); WRITE_BOOL(*options, collections_on_top);
WRITE_NL(); WRITE_BOOL(*options, hide_window_in_fullscreen);
+ WRITE_NL(); WRITE_BOOL(*options, selectable_bars.menu_bar);
+ WRITE_NL(); WRITE_BOOL(*options, selectable_bars.status_bar);
+ WRITE_NL(); WRITE_BOOL(*options, selectable_bars.tool_bar);
+
/* File operations Options */
WRITE_NL(); WRITE_BOOL(*options, file_ops.enable_in_place_rename);
WRITE_NL(); WRITE_BOOL(*options, file_ops.confirm_delete);
WRITE_NL(); WRITE_COLOR(*options, image.border_color);
WRITE_NL(); WRITE_COLOR(*options, image.alpha_color_1);
WRITE_NL(); WRITE_COLOR(*options, image.alpha_color_2);
- //~ WRITE_NL(); WRITE_BOOL(*options, image.use_clutter_renderer);
WRITE_NL(); WRITE_INT(*options, image.tile_size);
/* Thumbnails Options */
WRITE_NL(); WRITE_BOOL(*options, thumbnails.use_color_management);
WRITE_NL(); WRITE_BOOL(*options, thumbnails.use_ft_metadata);
WRITE_NL(); WRITE_INT(*options, thumbnails.collection_preview);
-// WRITE_NL(); WRITE_BOOL(*options, thumbnails.use_ft_metadata_small);
/* File sorting Options */
- WRITE_NL(); WRITE_INT(*options, file_sort.method);
- WRITE_NL(); WRITE_BOOL(*options, file_sort.ascending);
WRITE_NL(); WRITE_BOOL(*options, file_sort.case_sensitive);
- WRITE_NL(); WRITE_BOOL(*options, file_sort.natural);
/* Fullscreen Options */
WRITE_NL(); WRITE_INT(*options, fullscreen.screen);
/* GPU - see main.cc */
WRITE_NL(); WRITE_BOOL(*options, override_disable_gpu);
WRITE_SEPARATOR();
+
+ /* Alternate similarity algorithm */
+ WRITE_NL(); WRITE_BOOL(*options, alternate_similarity_algorithm.enabled);
+ WRITE_NL(); WRITE_BOOL(*options, alternate_similarity_algorithm.grayscale);
+ WRITE_SEPARATOR();
}
static void write_color_profile(GString *outstr, gint indent)
return FALSE;
}
- outstr = g_string_new("");
- g_string_append_printf(outstr, "<!--\n");
- g_string_append_printf(outstr, "######################################################################\n");
+ outstr = g_string_new("<!--\n");
+ g_string_append(outstr, "######################################################################\n");
g_string_append_printf(outstr, "# %30s config file version %-10s #\n", GQ_APPNAME, VERSION);
- g_string_append_printf(outstr, "######################################################################\n");
+ g_string_append(outstr, "######################################################################\n");
WRITE_SEPARATOR();
WRITE_STRING("# Note: This file is autogenerated. Options can be changed here,\n");
return TRUE;
}
-gboolean save_default_layout_options_to_file(const gchar *utf8_path, ConfOptions *UNUSED(options), LayoutWindow *lw)
+gboolean save_default_layout_options_to_file(const gchar *utf8_path, ConfOptions *, LayoutWindow *lw)
{
SecureSaveInfo *ssi;
gchar *rc_pathl;
return FALSE;
}
- outstr = g_string_new("");
- g_string_append_printf(outstr, "<!--\n");
- g_string_append_printf(outstr, "######################################################################\n");
+ outstr = g_string_new("<!--\n");
+ g_string_append(outstr, "######################################################################\n");
g_string_append_printf(outstr, "# %8s default layout file version %-10s #\n", GQ_APPNAME, VERSION);
- g_string_append_printf(outstr, "######################################################################\n");
+ g_string_append(outstr, "######################################################################\n");
WRITE_SEPARATOR();
WRITE_STRING("# Note: This file is autogenerated. Options can be changed here,\n");
if (READ_BOOL(*options, save_dialog_window_positions)) continue;
if (READ_BOOL(*options, show_window_ids)) continue;
if (READ_BOOL(*options, expand_menu_toolbar)) continue;
+ if (READ_BOOL(*options, hamburger_menu)) continue;
if (READ_INT(*options, log_window_lines)) continue;
if (READ_BOOL(*options, log_window.timer_data)) continue;
if (READ_CHAR(*options, external_preview.select)) continue;
if (READ_CHAR(*options, external_preview.extract)) continue;
+ if (READ_BOOL(*options, collections_duplicates)) continue;
if (READ_BOOL(*options, collections_on_top)) continue;
if (READ_BOOL(*options, hide_window_in_fullscreen)) continue;
+ if (READ_BOOL(*options, selectable_bars.menu_bar)) continue;
+ if (READ_BOOL(*options, selectable_bars.status_bar)) continue;
+ if (READ_BOOL(*options, selectable_bars.tool_bar)) continue;
+
/* Properties dialog options */
if (READ_CHAR(*options, properties.tabs_order)) continue;
if (READ_COLOR(*options, image.border_color)) continue;
if (READ_COLOR(*options, image.alpha_color_1)) continue;
if (READ_COLOR(*options, image.alpha_color_2)) continue;
- //~ if (READ_BOOL(*options, image.use_clutter_renderer)) continue;
if (READ_INT(*options, image.tile_size)) continue;
/* Thumbnails options */
if (READ_BOOL(*options, thumbnails.use_color_management)) continue;
if (READ_INT(*options, thumbnails.collection_preview)) continue;
if (READ_BOOL(*options, thumbnails.use_ft_metadata)) continue;
-// if (READ_BOOL(*options, thumbnails.use_ft_metadata_small)) continue;
/* File sorting options */
- if (READ_UINT_ENUM(*options, file_sort.method)) continue;
- if (READ_BOOL(*options, file_sort.ascending)) continue;
if (READ_BOOL(*options, file_sort.case_sensitive)) continue;
- if (READ_BOOL(*options, file_sort.natural)) continue;
/* File operations *options */
if (READ_BOOL(*options, file_ops.enable_in_place_rename)) continue;
/* GPU - see main.cc */
if (READ_BOOL(*options, override_disable_gpu)) continue;
+ /* Alternative similarity algorithm */
+ if (READ_BOOL(*options, alternate_similarity_algorithm.enabled)) continue;
+ if (READ_BOOL(*options, alternate_similarity_algorithm.grayscale)) continue;
+
/* Dummy options */
if (READ_DUMMY(*options, image.dither_quality, "deprecated since 2012-08-13")) continue;
return TRUE;
}
-static void options_load_color_profiles(GQParserData *UNUSED(parser_data), GMarkupParseContext *UNUSED(context), const gchar *UNUSED(element_name), const gchar **attribute_names, const gchar **attribute_values, gpointer UNUSED(data), GError **UNUSED(error))
+static void options_load_color_profiles(GQParserData *, GMarkupParseContext *, const gchar *, const gchar **attribute_names, const gchar **attribute_values, gpointer, GError **)
{
while (*attribute_names)
{
}
-static void options_load_profile(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *UNUSED(element_name), const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
+static void options_load_profile(GQParserData *parser_data, GMarkupParseContext *, const gchar *, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **)
{
gint i = GPOINTER_TO_INT(data);
if (i < 0 || i >= COLOR_PROFILE_INPUTS) return;
}
-static void options_load_marks_tooltips(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *UNUSED(element_name), const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
+static void options_load_marks_tooltips(GQParserData *parser_data, GMarkupParseContext *, const gchar *, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **)
{
gint i = GPOINTER_TO_INT(data);
if (i < 0 || i >= FILEDATA_MARKS_SIZE) return;
}
-static void options_load_disabled_plugins(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *UNUSED(element_name), const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
+static void options_load_disabled_plugins(GQParserData *parser_data, GMarkupParseContext *, const gchar *, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **)
{
gint i = GPOINTER_TO_INT(data);
struct {
{
const gchar *option = *attribute_names++;
const gchar *value = *attribute_values++;
- tmp.path = NULL;
+ tmp.path = nullptr;
if (READ_CHAR_FULL("path", tmp.path))
{
options->disabled_plugins = g_list_append(options->disabled_plugins, g_strdup(tmp.path));
* xml file structure (private)
*-----------------------------------------------------------------------------
*/
-struct _GQParserData
+struct GQParserData
{
GList *parse_func_stack;
gboolean startup; /* reading config for the first time - add commandline and defaults */
if (strcmp(option, "id") == 0) return value;
}
- return NULL;
+ return nullptr;
}
-void options_parse_leaf(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **UNUSED(attribute_names), const gchar **UNUSED(attribute_values), gpointer UNUSED(data), GError **UNUSED(error))
+void options_parse_leaf(GQParserData *parser_data, GMarkupParseContext *, const gchar *element_name, const gchar **, const gchar **, gpointer, GError **)
{
log_printf("unexpected: %s\n", element_name);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
static void options_parse_color_profiles(GQParserData *parser_data, GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **error)
if (g_ascii_strcasecmp(element_name, "profile") == 0)
{
options_load_profile(parser_data, context, element_name, attribute_names, attribute_values, data, error);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
else
{
log_printf("unexpected in <profile>: <%s>\n", element_name);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
}
if (g_ascii_strcasecmp(element_name, "tooltip") == 0)
{
options_load_marks_tooltips(parser_data, context, element_name, attribute_names, attribute_values, data, error);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
else
{
log_printf("unexpected in <profile>: <%s>\n", element_name);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
}
// attribute_names will be {"enabled", "filter"} and attribute_values
// will be {"true", "RAW Image"}.
- const gchar *enabled_name = NULL;
- const gchar *enabled_value = NULL;
+ const gchar *enabled_name = nullptr;
+ const gchar *enabled_value = nullptr;
int format_class_index = -1;
// In this loop, we iterate through matching attribute/value pairs in
log_printf("unknown attribute %s = %s\n", option, value);
}
- if (enabled_name == NULL || enabled_value == NULL || format_class_index < 0)
+ if (enabled_name == nullptr || enabled_value == nullptr || format_class_index < 0)
{
log_printf("Failed to parse <filter_type> config element\n");
return;
}
}
-static void options_parse_class_filter(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer UNUSED(data), GError **UNUSED(error))
+static void options_parse_class_filter(GQParserData *parser_data, GMarkupParseContext *, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer, GError **)
{
if (g_ascii_strcasecmp(element_name, "filter_type") == 0)
{
class_filter_load_filter_type(attribute_names, attribute_values);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
else
{
log_printf("unexpected in <profile>: <%s>\n", element_name);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
}
if (g_ascii_strcasecmp(element_name, "plugin") == 0)
{
options_load_disabled_plugins(parser_data, context, element_name, attribute_names, attribute_values, data, error);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
else
{
log_printf("unexpected in <profile>: <%s>\n", element_name);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
}
-static void options_parse_filter(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer UNUSED(data), GError **UNUSED(error))
+static void options_parse_filter(GQParserData *parser_data, GMarkupParseContext *, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer, GError **)
{
if (g_ascii_strcasecmp(element_name, "file_type") == 0)
{
filter_load_file_type(attribute_names, attribute_values);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
else
{
log_printf("unexpected in <filter>: <%s>\n", element_name);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
}
-static void options_parse_filter_end(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *UNUSED(element_name), gpointer UNUSED(data), GError **UNUSED(error))
+static void options_parse_filter_end(GQParserData *parser_data, GMarkupParseContext *, const gchar *, gpointer, GError **)
{
if (parser_data->startup) filter_add_defaults();
filter_rebuild();
}
-static void options_parse_keyword_end(GQParserData *UNUSED(parser_data), GMarkupParseContext *UNUSED(context), const gchar *UNUSED(element_name), gpointer data, GError **UNUSED(error))
+static void options_parse_keyword_end(GQParserData *, GMarkupParseContext *, const gchar *, gpointer data, GError **)
{
auto iter_ptr = static_cast<GtkTreeIter *>(data);
gtk_tree_iter_free(iter_ptr);
}
-static void options_parse_keyword(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
+static void options_parse_keyword(GQParserData *parser_data, GMarkupParseContext *, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **)
{
auto iter_ptr = static_cast<GtkTreeIter *>(data);
if (g_ascii_strcasecmp(element_name, "keyword") == 0)
else
{
log_printf("unexpected in <keyword>: <%s>\n", element_name);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
}
-static void options_parse_keyword_tree(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer UNUSED(data), GError **UNUSED(error))
+static void options_parse_keyword_tree(GQParserData *parser_data, GMarkupParseContext *, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer, GError **)
{
if (g_ascii_strcasecmp(element_name, "keyword") == 0)
{
- GtkTreeIter *iter_ptr = keyword_add_from_config(keyword_tree, NULL, attribute_names, attribute_values);
+ GtkTreeIter *iter_ptr = keyword_add_from_config(keyword_tree, nullptr, attribute_names, attribute_values);
options_parse_func_push(parser_data, options_parse_keyword, options_parse_keyword_end, iter_ptr);
}
else
{
log_printf("unexpected in <keyword_tree>: <%s>\n", element_name);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
}
if (g_ascii_strcasecmp(element_name, "color_profiles") == 0)
{
options_load_color_profiles(parser_data, context, element_name, attribute_names, attribute_values, data, error);
- options_parse_func_push(parser_data, options_parse_color_profiles, NULL, GINT_TO_POINTER(0));
+ options_parse_func_push(parser_data, options_parse_color_profiles, nullptr, GINT_TO_POINTER(0));
}
else if (g_ascii_strcasecmp(element_name, "filter") == 0)
{
- options_parse_func_push(parser_data, options_parse_filter, options_parse_filter_end, NULL);
+ options_parse_func_push(parser_data, options_parse_filter, options_parse_filter_end, nullptr);
}
else if (g_ascii_strcasecmp(element_name, "marks_tooltips") == 0)
{
options_load_marks_tooltips(parser_data, context, element_name, attribute_names, attribute_values, data, error);
- options_parse_func_push(parser_data, options_parse_marks_tooltips, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_marks_tooltips, nullptr, nullptr);
}
else if (g_ascii_strcasecmp(element_name, "class_filter") == 0)
{
- options_parse_func_push(parser_data, options_parse_class_filter, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_class_filter, nullptr, nullptr);
}
else if (g_ascii_strcasecmp(element_name, "keyword_tree") == 0)
{
if (!keyword_tree) keyword_tree_new();
- options_parse_func_push(parser_data, options_parse_keyword_tree, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_keyword_tree, nullptr, nullptr);
}
else if (g_ascii_strcasecmp(element_name, "disabled_plugins") == 0)
{
options_load_disabled_plugins(parser_data, context, element_name, attribute_names, attribute_values, data, error);
- options_parse_func_push(parser_data, options_parse_disabled_plugins, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_disabled_plugins, nullptr, nullptr);
}
else
{
log_printf("unexpected in <global>: <%s>\n", element_name);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
}
-static void options_parse_global_end(GQParserData *UNUSED(parser_data), GMarkupParseContext *UNUSED(context), const gchar *UNUSED(element_name), gpointer UNUSED(data), GError **UNUSED(error))
+static void options_parse_global_end(GQParserData *, GMarkupParseContext *, const gchar *, gpointer, GError **)
{
#ifndef HAVE_EXIV2
/* some options do not work without exiv2 */
#endif
}
-static void options_parse_pane_exif(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
+static void options_parse_pane_exif(GQParserData *parser_data, GMarkupParseContext *, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **)
{
auto pane = static_cast<GtkWidget *>(data);
if (g_ascii_strcasecmp(element_name, "entry") == 0)
{
bar_pane_exif_entry_add_from_config(pane, attribute_names, attribute_values);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
else
{
log_printf("unexpected in <pane_exif>: <%s>\n", element_name);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
}
-static void options_parse_pane_keywords(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
+static void options_parse_pane_keywords(GQParserData *parser_data, GMarkupParseContext *, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **)
{
auto pane = static_cast<GtkWidget *>(data);
if (g_ascii_strcasecmp(element_name, "expanded") == 0)
{
bar_pane_keywords_entry_add_from_config(pane, attribute_names, attribute_values);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
else
{
log_printf("unexpected in <pane_keywords>: <%s>\n", element_name);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
}
-static void options_parse_bar(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
+static void options_parse_bar(GQParserData *parser_data, GMarkupParseContext *, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **)
{
auto bar = static_cast<GtkWidget *>(data);
if (g_ascii_strcasecmp(element_name, "pane_comment") == 0)
pane = bar_pane_comment_new_from_config(attribute_names, attribute_values);
bar_add(bar, pane);
}
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
#ifdef HAVE_LIBCHAMPLAIN
#ifdef HAVE_LIBCHAMPLAIN_GTK
pane = bar_pane_gps_new_from_config(attribute_names, attribute_values);
bar_add(bar, pane);
}
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
}
#endif
pane = bar_pane_exif_new_from_config(attribute_names, attribute_values);
bar_add(bar, pane);
}
- options_parse_func_push(parser_data, options_parse_pane_exif, NULL, pane);
+ options_parse_func_push(parser_data, options_parse_pane_exif, nullptr, pane);
}
else if (g_ascii_strcasecmp(element_name, "pane_histogram") == 0)
{
pane = bar_pane_histogram_new_from_config(attribute_names, attribute_values);
bar_add(bar, pane);
}
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
else if (g_ascii_strcasecmp(element_name, "pane_rating") == 0)
{
pane = bar_pane_rating_new_from_config(attribute_names, attribute_values);
bar_add(bar, pane);
}
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
else if (g_ascii_strcasecmp(element_name, "pane_keywords") == 0)
{
pane = bar_pane_keywords_new_from_config(attribute_names, attribute_values);
bar_add(bar, pane);
}
- options_parse_func_push(parser_data, options_parse_pane_keywords, NULL, pane);
+ options_parse_func_push(parser_data, options_parse_pane_keywords, nullptr, pane);
}
else if (g_ascii_strcasecmp(element_name, "clear") == 0)
{
bar_clear(bar);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
else
{
log_printf("unexpected in <bar>: <%s>\n", element_name);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
}
-static void options_parse_toolbar(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
+static void options_parse_toolbar(GQParserData *parser_data, GMarkupParseContext *, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **)
{
auto lw = static_cast<LayoutWindow *>(data);
if (g_ascii_strcasecmp(element_name, "toolitem") == 0)
{
layout_toolbar_add_from_config(lw, TOOLBAR_MAIN, attribute_names, attribute_values);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
else if (g_ascii_strcasecmp(element_name, "clear") == 0)
{
layout_toolbar_clear(lw, TOOLBAR_MAIN);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
else
{
log_printf("unexpected in <toolbar>: <%s>\n", element_name);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
}
-static void options_parse_statusbar(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
+static void options_parse_statusbar(GQParserData *parser_data, GMarkupParseContext *, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **)
{
auto lw = static_cast<LayoutWindow *>(data);
if (g_ascii_strcasecmp(element_name, "toolitem") == 0)
{
layout_toolbar_add_from_config(lw, TOOLBAR_STATUS, attribute_names, attribute_values);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
else if (g_ascii_strcasecmp(element_name, "clear") == 0)
{
layout_toolbar_clear(lw, TOOLBAR_STATUS);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
else
{
log_printf("unexpected in <statusbar>: <%s>\n", element_name);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
}
-static void options_parse_dialogs(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer UNUSED(data), GError **UNUSED(error))
+static void options_parse_dialogs(GQParserData *parser_data, GMarkupParseContext *, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer, GError **)
{
if (g_ascii_strcasecmp(element_name, "window") == 0)
{
generic_dialog_windows_load_config(attribute_names, attribute_values);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
else
{
log_printf("unexpected in <dialogs>: <%s>\n", element_name);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
}
-static void options_parse_layout(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **UNUSED(error))
+static void options_parse_layout(GQParserData *parser_data, GMarkupParseContext *, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer data, GError **)
{
auto lw = static_cast<LayoutWindow *>(data);
if (g_ascii_strcasecmp(element_name, "bar") == 0)
bar_update_from_config(lw->bar, attribute_names, attribute_values, lw, FALSE);
}
- options_parse_func_push(parser_data, options_parse_bar, NULL, lw->bar);
+ options_parse_func_push(parser_data, options_parse_bar, nullptr, lw->bar);
}
else if (g_ascii_strcasecmp(element_name, "bar_sort") == 0)
{
bar_sort_cold_start(lw, attribute_names, attribute_values);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
else if (g_ascii_strcasecmp(element_name, "toolbar") == 0)
{
- options_parse_func_push(parser_data, options_parse_toolbar, NULL, lw);
+ options_parse_func_push(parser_data, options_parse_toolbar, nullptr, lw);
}
else if (g_ascii_strcasecmp(element_name, "statusbar") == 0)
{
- options_parse_func_push(parser_data, options_parse_statusbar, NULL, lw);
+ options_parse_func_push(parser_data, options_parse_statusbar, nullptr, lw);
}
else if (g_ascii_strcasecmp(element_name, "dialogs") == 0)
{
- options_parse_func_push(parser_data, options_parse_dialogs, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_dialogs, nullptr, nullptr);
}
else
{
log_printf("unexpected in <layout>: <%s>\n", element_name);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
}
-static void options_parse_layout_end(GQParserData *UNUSED(parser_data), GMarkupParseContext *UNUSED(context), const gchar *UNUSED(element_name), gpointer data, GError **UNUSED(error))
+static void options_parse_layout_end(GQParserData *, GMarkupParseContext *, const gchar *, gpointer data, GError **)
{
auto lw = static_cast<LayoutWindow *>(data);
- //~ LayoutWindow *lw = (LayoutWindow *)data;
- //~ LayoutWindow *lw = data;
layout_util_sync(lw);
}
-static void options_parse_toplevel(GQParserData *parser_data, GMarkupParseContext *UNUSED(context), const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer UNUSED(data), GError **UNUSED(error))
+static void options_parse_toplevel(GQParserData *parser_data, GMarkupParseContext *, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, gpointer, GError **)
{
if (g_ascii_strcasecmp(element_name, "gq") == 0)
{
/* optional top-level node */
- options_parse_func_push(parser_data, options_parse_toplevel, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_toplevel, nullptr, nullptr);
return;
}
if (g_ascii_strcasecmp(element_name, "global") == 0)
{
load_global_params(attribute_names, attribute_values);
- options_parse_func_push(parser_data, options_parse_global, options_parse_global_end, NULL);
+ options_parse_func_push(parser_data, options_parse_global, options_parse_global_end, nullptr);
return;
}
else
{
log_printf("unexpected in <toplevel>: <%s>\n", element_name);
- options_parse_func_push(parser_data, options_parse_leaf, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_leaf, nullptr, nullptr);
}
}
*/
-struct _GQParserFuncData
+struct GQParserFuncData
{
GQParserStartFunc start_func;
GQParserEndFunc end_func;
static GMarkupParser parser = {
start_element,
end_element,
- NULL,
- NULL,
- NULL
+ nullptr,
+ nullptr,
+ nullptr
};
/*
{
GMarkupParseContext *context;
gboolean ret = TRUE;
- GQParserData *parser_data;
- parser_data = g_new0(GQParserData, 1);
+ auto parser_data = g_new0(GQParserData, 1);
parser_data->startup = startup;
- options_parse_func_push(parser_data, options_parse_toplevel, NULL, NULL);
+ options_parse_func_push(parser_data, options_parse_toplevel, nullptr, nullptr);
- context = g_markup_parse_context_new(&parser, GMarkupParseFlags(0), parser_data, NULL);
+ context = g_markup_parse_context_new(&parser, static_cast<GMarkupParseFlags>(0), parser_data, nullptr);
- if (g_markup_parse_context_parse(context, buf, size, NULL) == FALSE)
+ if (g_markup_parse_context_parse(context, buf, size, nullptr) == FALSE)
{
ret = FALSE;
DEBUG_1("Parse failed");
gchar *buf;
gboolean ret = TRUE;
- if (g_file_get_contents(utf8_path, &buf, &size, NULL) == FALSE)
+ if (g_file_get_contents(utf8_path, &buf, &size, nullptr) == FALSE)
{
return FALSE;
}
projects / geeqie.git / blobdiff