Sort headers using clang-tidy

[geeqie.git] / src / rcfile.cc

diff --git a/src/rcfile.cc b/src/rcfile.cc
index f1cf6d1..b507877 100644 (file)
--- a/src/rcfile.cc
+++ b/src/rcfile.cc
@@ -19,27 +19,30 @@
  * 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"
 
 /*
@@ -251,7 +254,8 @@ gboolean read_int_option_clamp(const gchar *option, const gchar *label, const gc
 
 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)
                {
@@ -269,8 +273,10 @@ void write_int_unit_option(GString *str, gint, const gchar *label, gint n, gint
 
 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;
@@ -367,6 +373,7 @@ static void write_global_attributes(GString *outstr, gint indent)
        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);
@@ -559,6 +566,11 @@ static void write_global_attributes(GString *outstr, gint indent)
        /* 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)
@@ -867,6 +879,7 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
                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;
@@ -1050,6 +1063,10 @@ static gboolean load_global_params(const gchar **attribute_names, const gchar **
                /* 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;