Sort headers using clang-tidy

[geeqie.git] / src / main.cc

diff --git a/src/main.cc b/src/main.cc
index 7e0857e..89328fc 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -19,49 +19,60 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <csignal>
+#include "main.h"
+
 #include <sys/mman.h>
 
+#include <clocale>
+#include <csignal>
+
+#include <config.h>
+
+#ifdef HAVE_CLUTTER
+#include <clutter-gtk/clutter-gtk.h>
+#endif
+
+#ifdef HAVE_EXECINFO_H
+#include <execinfo.h>
+#endif
+
 #ifdef G_OS_UNIX
 #include <pwd.h>
 #endif
-#include <clocale>
 
-#include "main.h"
+#ifdef HAVE_DEVELOPER
+#include "backward.h"
+#endif
 
+#include "cache-maint.h"
 #include "cache.h"
-#include "collect.h"
 #include "collect-io.h"
+#include "collect.h"
+#include "compat.h"
+#include "debug.h"
+#include "exif.h"
 #include "filedata.h"
 #include "filefilter.h"
+#include "glua.h"
+#include "histogram.h"
 #include "history-list.h"
 #include "image.h"
 #include "img-view.h"
+#include "intl.h"
 #include "layout-image.h"
 #include "layout-util.h"
+#include "main-defines.h"
+#include "metadata.h"
 #include "misc.h"
+#include "pixbuf-util.h"
 #include "rcfile.h"
 #include "remote.h"
 #include "secure-save.h"
+#include "thumb.h"
 #include "ui-fileops.h"
 #include "ui-utildlg.h"
-#include "cache-maint.h"
-#include "thumb.h"
-#include "metadata.h"
-#include "exif.h"
-#include "histogram.h"
-#include "pixbuf-util.h"
-#include "glua.h"
 #include "whereami.h"
 
-#ifdef HAVE_CLUTTER
-#include <clutter-gtk/clutter-gtk.h>
-#endif
-
-#ifdef HAVE_EXECINFO_H
-#include <execinfo.h>
-#endif
-
 gboolean thumb_format_changed = FALSE;
 static RemoteConnection *remote_connection = nullptr;
 
@@ -516,7 +527,7 @@ static void parse_command_line(gint argc, gchar *argv[])
                                print_term(FALSE, _("      --geometry=WxH+XOFF+YOFF     set main window location\n"));
                                print_term(FALSE, _("  -h, --help                       show this message\n"));
                                print_term(FALSE, _("  -l, --list [files] [collections] open collection window for command line\n"));
-                               print_term(FALSE, _("  -n, --new-instance               open a new instance of Geeqie\n"));
+                               print_term(FALSE, _("  -n, --new-instance               open a new instance of Geeqie *\n"));
                                print_term(FALSE, _("  -o:, --log-file:<file>           save log data to file\n"));
                                print_term(FALSE, _("  -r, --remote                     send following commands to open window\n"));
                                print_term(FALSE, _("  -rh, --remote-help               print remote command list\n"));
@@ -531,6 +542,7 @@ static void parse_command_line(gint argc, gchar *argv[])
 #endif
 
                                print_term(FALSE, "\n");
+                               print_term(FALSE, "* Normally a single set of configuration files is used for all instances.\nHowever, the environment variables XDG_CONFIG_HOME, XDG_CACHE_HOME, XDG_DATA_HOME\ncan be used to modify this behavior on an individual basis e.g.\n\nXDG_CONFIG_HOME=/tmp/a XDG_CACHE_HOME=/tmp/b geeqie\n\n");
 
                                remote_help();
 
@@ -888,7 +900,8 @@ static void gq_accel_map_print(
 {
        GString *gstring = g_string_new(changed ? nullptr : "; ");
        auto ssi = static_cast<SecureSaveInfo *>(data);
-       gchar *tmp, *name;
+       gchar *tmp;
+       gchar *name;
 
        g_string_append(gstring, "(gtk_accel_path \"");
 
@@ -1099,7 +1112,7 @@ static gint exit_confirm_dlg()
        g_free(msg);
        msg = g_strdup_printf(_("Quit %s"), GQ_APPNAME);
 
-       message = g_string_new(NULL);
+       message = g_string_new(nullptr);
 
        if (collection_window_modified_exists())
                {
@@ -1173,7 +1186,7 @@ static void sigbus_handler_cb_unused(int, siginfo_t *info, void *)
 }
 #endif
 
-static void setup_sigbus_handler_unused(void)
+static void setup_sigbus_handler_unused()
 {
 #if defined(SIGBUS) && defined(SA_SIGINFO)
        struct sigaction sigbus_action;
@@ -1181,7 +1194,7 @@ static void setup_sigbus_handler_unused(void)
        sigbus_action.sa_sigaction = sigbus_handler_cb_unused;
        sigbus_action.sa_flags = SA_SIGINFO;
 
-       sigaction(SIGBUS, &sigbus_action, NULL);
+       sigaction(SIGBUS, &sigbus_action, nullptr);
 #endif
 }
 #pragma GCC diagnostic pop
@@ -1270,7 +1283,7 @@ static void create_application_paths()
        gq_htmldir = g_build_filename(gq_prefix, GQ_HTMLDIR, NULL);
        gq_appdir = g_build_filename(gq_prefix, GQ_APPDIR, NULL);
        gq_bindir = g_build_filename(gq_prefix, GQ_BINDIR, NULL);
-       desktop_file_template = g_build_filename(gq_appdir, "template.desktop", NULL);
+       desktop_file_template = g_build_filename(gq_appdir, "org.geeqie.template.desktop", NULL);
 
        g_free(dirname);
        g_free(path);