Sort headers using clang-tidy

Add include order rule to CODING.md.

diff --git a/.clang-tidy b/.clang-tidy
index a50ef4c..c87a7f4 100644 (file)
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -21,6 +21,7 @@
 Checks: >
   -*,
   bugprone-*,
+  llvm-*,
   misc-*,
   modernize-*,
   performance-*,
@@ -35,6 +36,9 @@ Checks: >
   -bugprone-reserved-identifier,
   -bugprone-sizeof-expression,
   -bugprone-suspicious-missing-comma,
+  -llvm-header-guard,
+  -llvm-namespace-comment,
+  -llvm-qualified-auto,
   -misc-const-correctness,
   -misc-no-recursion,
   -misc-non-private-member-variables-in-classes,
@@ -52,6 +56,5 @@ Checks: >
   -readability-qualified-auto,
   -readability-simplify-boolean-expr,
 
-
 ExtraArgs: [-Wno-unknown-warning-option, -Wno-unused-lambda-capture, -Wno-unused-but-set-variable]
 WarningsAsErrors: "*"

diff --git a/CODING.md b/CODING.md
index 7613a81..4f4d492 100644 (file)
--- a/CODING.md
+++ b/CODING.md
@@ -203,6 +203,8 @@ Headers:
 #ifndef _FILENAME_H
 ```
 
+Use [Names and Order of Includes](https://google.github.io/styleguide/cppguide.html#Names_and_Order_of_Includes) for headers include order.
+
 Use spaces around every operator (except `.`, `->`, `++` and `--`).  
 Unary operator `*` and `&` are missing the space from right, (and also unary `-`).
 

diff --git a/scripts/clang-tidy-check.sh b/scripts/clang-tidy-check.sh
index 237e62d..e5c49e8 100755 (executable)
--- a/scripts/clang-tidy-check.sh
+++ b/scripts/clang-tidy-check.sh
@@ -20,34 +20,107 @@
 #**********************************************************************
 
 ## @file
-## @brief Run clang-tidy on all source files.
+## @brief Run clang-tidy on source files.
 ##
 
+show_help()
+{
+       printf "Run clang-tidy on source files.
+
+-a --all  Process all source files - default is changed files only
+-f --fix  Fix errors where possible
+-h --help Display this message
+\n\n"
+}
+
+process_file()
+{
+       if [ -z "$file" ]
+       then
+               return
+       fi
+
+       i=$((i + 1))
+       printf '%d/%d %s\n' "$i" "$total_files" "$file"
+       clang-tidy ${fix+"--fix-errors"} --config-file ./.clang-tidy -p ./build "$file" 2> /dev/null
+
+       secs_now=$(cut --delimiter='.' --fields=1 < /proc/uptime)
+
+       elapsed_time=$((secs_now - secs_start))
+       remaining_files=$((total_files - i))
+       average_time=$((elapsed_time / i))
+       estimated_time=$((average_time * remaining_files))
+
+       printf 'Remaining: %dm:%ds\n' $((estimated_time % 3600 / 60)) $((estimated_time % 60))
+}
+
 if [ ! -d ".git" ] || [ ! -d "src" ] || [ ! -f "geeqie.1" ]
 then
        printf '%s\n' "This is not a Geeqie project folder"
        exit 1
 fi
 
-i=0
-
-secs_start=$(cut --delimiter='.' --fields=1 < /proc/uptime)
-total=$(find src -name "*.cc" | wc --lines)
+# if variable fix is defined in this way, clang-tidy gives errors.
+# fix=""
+process_all=0
 
-while read -r file
+while :
 do
-       i=$((i + 1))
-       printf '%d/%d %s\n' "$i" "$total" "$file"
-       clang-tidy --config-file ./.clang-tidy -p ./build "$file" 2>/dev/null
+       case $1 in
+               -h | -\? | --help)
+                       show_help
 
-       secs_now=$(cut --delimiter='.' --fields=1 < /proc/uptime)
+                       exit 0
+                       ;;
+               -a | --all)
+                       process_all=1
+                       ;;
+               -f | --fix)
+                       fix="--fix-errors"
+                       ;;
+               --) # End of all options.
+                       shift
+                       break
+                       ;;
+               ?*)
+                       printf 'Unknown option %s\n' "$1" >&2
+
+                       exit 1
+                       ;;
+               *)
+                       break
+                       ;;
+       esac
 
-       elapsed_time=$(( secs_now - secs_start ))
-       remaining_files=$(( total - i ))
-       average_time=$(( elapsed_time / i ))
-       estimated=$(( average_time * remaining_files ))
+       shift
+done
 
-       printf 'Remaining: %dm:%ds\n' $((estimated%3600/60)) $((estimated%60))
-done << EOF
+if [ ! -d "build" ]
+then
+       meson setup build
+fi
+ninja -C build
+
+i=0
+secs_start=$(cut --delimiter='.' --fields=1 < /proc/uptime)
+
+if [ "$process_all" -eq 1 ]
+then
+       total_files=$(find src -name "*.cc" | wc --lines)
+
+       while read -r file
+       do
+               process_file
+       done << EOF
 $(find src -name "*.cc" | sort)
 EOF
+else
+       total_files=$(git diff --name-only ./src/*.cc | wc --lines)
+
+       while read -r file
+       do
+               process_file
+       done << EOF
+$(git diff --name-only ./src/*.cc | sort)
+EOF
+fi

diff --git a/src/bar-comment.cc b/src/bar-comment.cc
index 730adba..28c9a54 100644 (file)
--- a/src/bar-comment.cc
+++ b/src/bar-comment.cc
@@ -26,14 +26,14 @@
 #include "bar.h"
 #include "compat.h"
 #include "debug.h"
+#include "filedata.h"
 #include "intl.h"
+#include "layout.h"
 #include "main-defines.h"
 #include "metadata.h"
-#include "filedata.h"
+#include "rcfile.h"
 #include "ui-menu.h"
 #include "ui-misc.h"
-#include "rcfile.h"
-#include "layout.h"
 
 #ifdef HAVE_SPELL
 #include <gspell/gspell.h>

diff --git a/src/bar-gps.cc b/src/bar-gps.cc
index 1daf4c3..b17e006 100644 (file)
--- a/src/bar-gps.cc
+++ b/src/bar-gps.cc
@@ -32,19 +32,19 @@
 #include "filedata.h"
 #include "intl.h"
 #include "layout.h"
-#include "metadata.h"
 #include "main-defines.h"
 #include "menu.h"
+#include "metadata.h"
 #include "misc.h"
 #include "rcfile.h"
 #include "thumb.h"
 #include "ui-menu.h"
-#include "uri-utils.h"
 #include "ui-utildlg.h"
+#include "uri-utils.h"
 
-#include <clutter-gtk/clutter-gtk.h>
-#include <champlain/champlain.h>
 #include <champlain-gtk/champlain-gtk.h>
+#include <champlain/champlain.h>
+#include <clutter-gtk/clutter-gtk.h>
 
 #define MARKER_COLOUR 0x00, 0x00, 0xff, 0xff
 #define TEXT_COLOUR 0x00, 0x00, 0x00, 0xff

diff --git a/src/bar-sort.cc b/src/bar-sort.cc
index 462c293..730f382 100644 (file)
--- a/src/bar-sort.cc
+++ b/src/bar-sort.cc
@@ -23,16 +23,16 @@
 
 #include <config.h>
 
-#include "collect.h"
 #include "collect-io.h"
+#include "collect.h"
 #include "compat.h"
 #include "debug.h"
 #include "editors.h"
 #include "filedata.h"
 #include "history-list.h"
 #include "intl.h"
-#include "layout.h"
 #include "layout-image.h"
+#include "layout.h"
 #include "main-defines.h"
 #include "misc.h"
 #include "rcfile.h"

diff --git a/src/cache-maint.cc b/src/cache-maint.cc
index c8ae56c..642bae5 100644 (file)
--- a/src/cache-maint.cc
+++ b/src/cache-maint.cc
@@ -29,12 +29,12 @@
 #include "filedata.h"
 #include "intl.h"
 #include "layout.h"
-#include "main.h"
 #include "main-defines.h"
+#include "main.h"
 #include "misc.h"
 #include "pixbuf-util.h"
-#include "thumb.h"
 #include "thumb-standard.h"
+#include "thumb.h"
 #include "ui-fileops.h"
 #include "ui-misc.h"
 #include "ui-tabcomp.h"

diff --git a/src/collect-dlg.cc b/src/collect-dlg.cc
index 0b1e4a3..9871ead 100644 (file)
--- a/src/collect-dlg.cc
+++ b/src/collect-dlg.cc
@@ -25,8 +25,8 @@
 
 #include <config.h>
 
-#include "collect.h"
 #include "collect-io.h"
+#include "collect.h"
 #include "compat.h"
 #include "intl.h"
 #include "main-defines.h"

diff --git a/src/collect-table.cc b/src/collect-table.cc
index 8c911d8..12f38f5 100644 (file)
--- a/src/collect-table.cc
+++ b/src/collect-table.cc
@@ -33,19 +33,19 @@
 #include "filedata.h"
 #include "img-view.h"
 #include "intl.h"
-#include "layout.h"
 #include "layout-image.h"
+#include "layout.h"
 #include "main-defines.h"
 #include "menu.h"
 #include "metadata.h"
 #include "misc.h"
 #include "pixbuf-util.h"
 #include "print.h"
-#include "utilops.h"
 #include "ui-fileops.h"
 #include "ui-menu.h"
 #include "ui-tree-edit.h"
 #include "uri-utils.h"
+#include "utilops.h"
 #include "view-file.h"
 
 /* between these, the icon width is increased by thumb_max_width / 2 */

diff --git a/src/debug.cc b/src/debug.cc
index f09a640..3e4fe55 100644 (file)
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -25,8 +25,8 @@
 #include "filedata.h"
 #include "intl.h"
 #include "logwindow.h"
-#include "main.h"
 #include "main-defines.h"
+#include "main.h"
 #include "misc.h"
 #include "options.h"
 #include "ui-fileops.h"

diff --git a/src/desktop-file.cc b/src/desktop-file.cc
index c2dd7c7..911428d 100644 (file)
--- a/src/desktop-file.cc
+++ b/src/desktop-file.cc
@@ -28,8 +28,8 @@
 #include "editors.h"
 #include "intl.h"
 #include "layout-util.h"
-#include "main.h"
 #include "main-defines.h"
+#include "main.h"
 #include "misc.h"
 #include "pixbuf-util.h"
 #include "ui-fileops.h"

diff --git a/src/editors.cc b/src/editors.cc
index f64ab14..a074d56 100644 (file)
--- a/src/editors.cc
+++ b/src/editors.cc
@@ -28,8 +28,8 @@
 #include "filedata.h"
 #include "filefilter.h"
 #include "intl.h"
-#include "main.h"
 #include "main-defines.h"
+#include "main.h"
 #include "options.h"
 #include "pixbuf-util.h"
 #include "ui-fileops.h"

diff --git a/src/exif-common.cc b/src/exif-common.cc
index b03c759..edb7a47 100644 (file)
--- a/src/exif-common.cc
+++ b/src/exif-common.cc
@@ -37,16 +37,16 @@
 #endif
 #endif
 
+#include "cache.h"
 #include "debug.h"
 #include "exif.h"
 #include "filecache.h"
 #include "glua.h"
 #include "intl.h"
-#include "main-defines.h"
-#include "ui-fileops.h"
-#include "cache.h"
 #include "jpeg-parser.h"
+#include "main-defines.h"
 #include "misc.h"
+#include "ui-fileops.h"
 #include "zonedetect.h"
 
 

diff --git a/src/exiv2.cc b/src/exiv2.cc
index b527fd2..6b9194d 100644 (file)
--- a/src/exiv2.cc
+++ b/src/exiv2.cc
@@ -42,11 +42,11 @@
 #define HAVE_EXIV2_ERROR_CODE
 #endif
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #if EXIV2_TEST_VERSION(0,27,0)
 #define EXV_PACKAGE "exiv2"

diff --git a/src/filedata.cc b/src/filedata.cc
index f5b62bb..14e7d34 100644 (file)
--- a/src/filedata.cc
+++ b/src/filedata.cc
@@ -23,19 +23,19 @@
 
 #include <config.h>
 
-#include "filefilter.h"
 #include "cache.h"
 #include "debug.h"
+#include "filefilter.h"
+#include "histogram.h"
 #include "intl.h"
-#include "main.h"
 #include "main-defines.h"
+#include "main.h"
+#include "metadata.h"
 #include "options.h"
+#include "secure-save.h"
 #include "thumb-standard.h"
-#include "ui-fileops.h"
-#include "metadata.h"
 #include "trash.h"
-#include "histogram.h"
-#include "secure-save.h"
+#include "ui-fileops.h"
 
 #include "exif.h"
 #include "misc.h"

diff --git a/src/filefilter.cc b/src/filefilter.cc
index 3ccd931..8c5448a 100644 (file)
--- a/src/filefilter.cc
+++ b/src/filefilter.cc
@@ -26,8 +26,8 @@
 #include "cache.h"
 #include "debug.h"
 #include "main-defines.h"
-#include "ui-fileops.h"
 #include "rcfile.h"
+#include "ui-fileops.h"
 
 /*
  *-----------------------------------------------------------------------------

diff --git a/src/fullscreen.cc b/src/fullscreen.cc
index cd72fea..5caed5a 100644 (file)
--- a/src/fullscreen.cc
+++ b/src/fullscreen.cc
@@ -29,8 +29,8 @@
 
 #include "compat.h"
 #include "debug.h"
-#include "image.h"
 #include "image-load.h"
+#include "image.h"
 #include "intl.h"
 #include "misc.h"
 #include "options.h"

diff --git a/src/image-load-djvu.cc b/src/image-load-djvu.cc
index bd00128..5f67826 100644 (file)
--- a/src/image-load-djvu.cc
+++ b/src/image-load-djvu.cc
@@ -24,9 +24,9 @@
 
 #ifdef HAVE_DJVU
 
+#include <cairo.h>
 #include <libdjvu/ddjvuapi.h>
 #include <libdjvu/miniexp.h>
-#include <cairo.h>
 
 #include "image-load.h"
 

diff --git a/src/image-load-libraw.cc b/src/image-load-libraw.cc
index 175fc23..d144e61 100644 (file)
--- a/src/image-load-libraw.cc
+++ b/src/image-load-libraw.cc
@@ -29,17 +29,19 @@
 
 #include <config.h>
 
-#include "debug.h"
-#include "filedata.h"
-#include "filefilter.h"
 #include "image-load.h"
 
 #ifdef HAVE_RAW
 
-#include <libraw/libraw.h>
+#include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
-#include <fcntl.h>
+
+#include <libraw/libraw.h>
+
+#include "debug.h"
+#include "filedata.h"
+#include "filefilter.h"
 
 struct UnmapData
 {

diff --git a/src/image-overlay.cc b/src/image-overlay.cc
index c57b832..7dfd5a7 100644 (file)
--- a/src/image-overlay.cc
+++ b/src/image-overlay.cc
@@ -27,8 +27,8 @@
 #include "debug.h"
 #include "filedata.h"
 #include "histogram.h"
-#include "image.h"
 #include "image-load.h"
+#include "image.h"
 #include "img-view.h"
 #include "intl.h"
 #include "layout.h"

diff --git a/src/image.cc b/src/image.cc
index dd67185..5cd517b 100644 (file)
--- a/src/image.cc
+++ b/src/image.cc
@@ -32,8 +32,8 @@
 #include "history-list.h"
 #include "image-load.h"
 #include "intl.h"
-#include "layout.h"
 #include "layout-image.h"
+#include "layout.h"
 #include "metadata.h"
 #include "pixbuf-renderer.h"
 #include "pixbuf-util.h"

diff --git a/src/img-view.cc b/src/img-view.cc
index b6b7ff7..9a00b94 100644 (file)
--- a/src/img-view.cc
+++ b/src/img-view.cc
@@ -23,21 +23,21 @@
 
 #include <config.h>
 
-#include "collect.h"
 #include "collect-io.h"
+#include "collect.h"
 #include "compat.h"
 #include "debug.h"
 #include "dnd.h"
 #include "editors.h"
 #include "filedata.h"
 #include "fullscreen.h"
-#include "image.h"
 #include "image-load.h"
 #include "image-overlay.h"
+#include "image.h"
 #include "intl.h"
 #include "layout-util.h"
-#include "main.h"
 #include "main-defines.h"
+#include "main.h"
 #include "menu.h"
 #include "misc.h"
 #include "pixbuf-util.h"

diff --git a/src/layout-image.cc b/src/layout-image.cc
index e39c554..228fff0 100644 (file)
--- a/src/layout-image.cc
+++ b/src/layout-image.cc
@@ -31,8 +31,8 @@
 #include "filedata.h"
 #include "fullscreen.h"
 #include "history-list.h"
-#include "image.h"
 #include "image-overlay.h"
+#include "image.h"
 #include "img-view.h"
 #include "intl.h"
 #include "layout-util.h"
@@ -40,8 +40,8 @@
 #include "menu.h"
 #include "metadata.h"
 #include "misc.h"
-#include "pixbuf-util.h"
 #include "pixbuf-renderer.h"
+#include "pixbuf-util.h"
 #include "slideshow.h"
 #include "ui-fileops.h"
 #include "ui-menu.h"

diff --git a/src/layout-util.cc b/src/layout-util.cc
index daebc06..ee9f68f 100644 (file)
--- a/src/layout-util.cc
+++ b/src/layout-util.cc
@@ -21,16 +21,18 @@
 
 #include "layout-util.h"
 
+#include <sys/wait.h>
+
 #include <config.h>
 
 #include "advanced-exif.h"
+#include "bar-keywords.h"
 #include "bar-sort.h"
 #include "bar.h"
-#include "bar-keywords.h"
 #include "cache-maint.h"
-#include "collect.h"
 #include "collect-dlg.h"
 #include "collect-io.h"
+#include "collect.h"
 #include "color-man.h"
 #include "compat.h"
 #include "debug.h"
@@ -41,14 +43,15 @@
 #include "fullscreen.h"
 #include "histogram.h"
 #include "history-list.h"
-#include "image.h"
 #include "image-overlay.h"
+#include "image.h"
 #include "img-view.h"
 #include "intl.h"
+#include "keymap-template.h"
 #include "layout-image.h"
 #include "logwindow.h"
-#include "main.h"
 #include "main-defines.h"
+#include "main.h"
 #include "metadata.h"
 #include "misc.h"
 #include "pan-view.h"
@@ -56,8 +59,8 @@
 #include "preferences.h"
 #include "print.h"
 #include "rcfile.h"
-#include "search.h"
 #include "search-and-run.h"
+#include "search.h"
 #include "slideshow.h"
 #include "ui-fileops.h"
 #include "ui-menu.h"
@@ -67,9 +70,6 @@
 #include "view-file.h"
 #include "window.h"
 
-#include <sys/wait.h>
-#include "keymap-template.h"
-
 enum {
        MENU_EDIT_ACTION_OFFSET = 16,
        FILE_COLUMN_POINTER = 0

diff --git a/src/layout.cc b/src/layout.cc
index e838b49..bcf828f 100644 (file)
--- a/src/layout.cc
+++ b/src/layout.cc
@@ -23,22 +23,22 @@
 
 #include <config.h>
 
-#include "bar.h"
 #include "bar-sort.h"
+#include "bar.h"
 #include "compat.h"
 #include "debug.h"
 #include "filedata.h"
 #include "histogram.h"
 #include "history-list.h"
-#include "image.h"
 #include "image-overlay.h"
+#include "image.h"
 #include "intl.h"
 #include "layout-config.h"
 #include "layout-image.h"
 #include "layout-util.h"
 #include "logwindow.h"
-#include "main.h"
 #include "main-defines.h"
+#include "main.h"
 #include "menu.h"
 #include "metadata.h"
 #include "misc.h"

diff --git a/src/lua.cc b/src/lua.cc
index 5515369..8319147 100644 (file)
--- a/src/lua.cc
+++ b/src/lua.cc
@@ -24,6 +24,8 @@
 
 #define _XOPEN_SOURCE
 
+#include "glua.h"
+
 #include <cstdio>
 #include <cstring>
 #include <ctime>
@@ -32,12 +34,11 @@
 #include <glib.h>
 #include <lua.hpp>
 
-#include "glua.h"
 #include "debug.h"
 #include "exif.h"
 #include "filedata.h"
-#include "main.h"
 #include "main-defines.h"
+#include "main.h"
 #include "ui-fileops.h"
 
 /**

diff --git a/src/main.cc b/src/main.cc
index 94d9747..89328fc 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -21,27 +21,40 @@
 
 #include "main.h"
 
-#include <csignal>
 #include <sys/mman.h>
 
-#ifdef G_OS_UNIX
-#include <pwd.h>
-#endif
 #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
+
 #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"
@@ -49,29 +62,17 @@
 #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;
 

diff --git a/src/metadata.cc b/src/metadata.cc
index 9b09c56..4bb6731 100644 (file)
--- a/src/metadata.cc
+++ b/src/metadata.cc
@@ -30,13 +30,13 @@
 #include "exif.h"
 #include "filedata.h"
 #include "intl.h"
+#include "layout-util.h"
 #include "main-defines.h"
 #include "misc.h"
+#include "rcfile.h"
 #include "secure-save.h"
 #include "ui-fileops.h"
 #include "utilops.h"
-#include "layout-util.h"
-#include "rcfile.h"
 
 enum MetadataKey {
        MK_NONE,

diff --git a/src/misc.cc b/src/misc.cc
index 03638c6..3d80891 100644 (file)
--- a/src/misc.cc
+++ b/src/misc.cc
@@ -28,8 +28,8 @@
 #include "debug.h"
 #include "filedata.h"
 #include "intl.h"
-#include "main.h"
 #include "main-defines.h"
+#include "main.h"
 #include "options.h"
 #include "ui-fileops.h"
 

diff --git a/src/options.cc b/src/options.cc
index 6d62959..8e64145 100644 (file)
--- a/src/options.cc
+++ b/src/options.cc
@@ -25,8 +25,8 @@
 #include "histogram.h" /* HCHAN_RGB */
 #include "image-overlay.h" /* OSD_SHOW_NOTHING */
 #include "intl.h"
-#include "layout.h"
 #include "layout-image.h"
+#include "layout.h"
 #include "main-defines.h"
 #include "misc.h"
 #include "rcfile.h"

diff --git a/src/pan-view/pan-calendar.cc b/src/pan-view/pan-calendar.cc
index b76aef6..1b209ec 100644 (file)
--- a/src/pan-view/pan-calendar.cc
+++ b/src/pan-view/pan-calendar.cc
@@ -27,8 +27,8 @@
 #include "misc.h"
 #include "pan-item.h"
 #include "pan-util.h"
-#include "pan-view.h"
 #include "pan-view-filter.h"
+#include "pan-view.h"
 #include "pixbuf-util.h"
 
 #define PAN_CAL_POPUP_COLOR 220, 220, 220

diff --git a/src/pan-view/pan-timeline.cc b/src/pan-view/pan-timeline.cc
index 2d87e90..8d9540e 100644 (file)
--- a/src/pan-view/pan-timeline.cc
+++ b/src/pan-view/pan-timeline.cc
@@ -23,8 +23,8 @@
 
 #include "pan-item.h"
 #include "pan-util.h"
-#include "pan-view.h"
 #include "pan-view-filter.h"
+#include "pan-view.h"
 
 void pan_timeline_compute(PanWindow *pw, FileData *dir_fd, gint *width, gint *height)
 {

diff --git a/src/pan-view/pan-view.cc b/src/pan-view/pan-view.cc
index 93d4ff1..8db42c2 100644 (file)
--- a/src/pan-view/pan-view.cc
+++ b/src/pan-view/pan-view.cc
@@ -34,8 +34,8 @@
 #include "img-view.h"
 #include "intl.h"
 #include "layout-util.h"
-#include "main.h"
 #include "main-defines.h"
+#include "main.h"
 #include "menu.h"
 #include "metadata.h"
 #include "misc.h"

diff --git a/src/pixbuf-renderer.cc b/src/pixbuf-renderer.cc
index 3d14a03..d0a9440 100644 (file)
--- a/src/pixbuf-renderer.cc
+++ b/src/pixbuf-renderer.cc
@@ -39,8 +39,8 @@
 #define GQ_BUILD 1
 
 #ifdef GQ_BUILD
-#include "pixbuf-util.h"
 #include "exif.h"
+#include "pixbuf-util.h"
 #else
 enum ExifOrientationType {
        EXIF_ORIENTATION_UNKNOWN        = 0,

diff --git a/src/preferences.cc b/src/preferences.cc
index edb3304..8b73b6c 100644 (file)
--- a/src/preferences.cc
+++ b/src/preferences.cc
@@ -32,13 +32,13 @@
 #include "filedata.h"
 #include "filefilter.h"
 #include "fullscreen.h"
-#include "image.h"
 #include "image-overlay.h"
+#include "image.h"
 #include "img-view.h"
 #include "intl.h"
 #include "layout-util.h"
-#include "main.h"
 #include "main-defines.h"
+#include "main.h"
 #include "metadata.h"
 #include "misc.h"
 #include "osd.h"
@@ -47,10 +47,10 @@
 #include "slideshow.h"
 #include "toolbar.h"
 #include "trash.h"
-#include "utilops.h"
 #include "ui-fileops.h"
 #include "ui-misc.h"
 #include "ui-tabcomp.h"
+#include "utilops.h"
 #include "window.h"
 #include "zonedetect.h"
 

diff --git a/src/print.cc b/src/print.cc
index 1c71df6..75d284d 100644 (file)
--- a/src/print.cc
+++ b/src/print.cc
@@ -32,8 +32,8 @@
 #include "options.h"
 #include "osd.h"
 #include "pixbuf-util.h"
-#include "ui-misc.h"
 #include "ui-fileops.h"
+#include "ui-misc.h"
 
 #define PRINT_SETTINGS "print_settings" // filename save printer settings
 #define PAGE_SETUP "page_setup" // filename save page setup

diff --git a/src/rcfile.cc b/src/rcfile.cc
index 5f02883..b507877 100644 (file)
--- a/src/rcfile.cc
+++ b/src/rcfile.cc
@@ -23,26 +23,26 @@
 
 #include <config.h>
 
-#include "bar.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 "metadata.h"
-#include "bar-gps.h"
-#include "dupe.h"
 #include "ui-utildlg.h"
 
 /*

diff --git a/src/remote.cc b/src/remote.cc
index 5382693..4ece932 100644 (file)
--- a/src/remote.cc
+++ b/src/remote.cc
@@ -24,8 +24,8 @@
 #include <config.h>
 
 #include "cache-maint.h"
-#include "collect.h"
 #include "collect-io.h"
+#include "collect.h"
 #include "compat.h"
 #include "debug.h"
 #include "exif.h"
@@ -36,15 +36,15 @@
 #include "intl.h"
 #include "layout-image.h"
 #include "layout-util.h"
-#include "main.h"
 #include "main-defines.h"
+#include "main.h"
 #include "misc.h"
 #include "pixbuf-renderer.h"
+#include "rcfile.h"
 #include "slideshow.h"
 #include "ui-fileops.h"
 #include "ui-misc.h"
 #include "utilops.h"
-#include "rcfile.h"
 #include "view-file.h"
 
 #include <csignal>

diff --git a/src/renderer-tiles.cc b/src/renderer-tiles.cc
index 0a7c1c9..404d1ce 100644 (file)
--- a/src/renderer-tiles.cc
+++ b/src/renderer-tiles.cc
@@ -37,8 +37,8 @@
 #define GQ_BUILD 1
 
 #ifdef GQ_BUILD
-#include "pixbuf-util.h"
 #include "exif.h"
+#include "pixbuf-util.h"
 #else
 enum ExifOrientationType {
        EXIF_ORIENTATION_UNKNOWN        = 0,

diff --git a/src/shortcuts.cc b/src/shortcuts.cc
index c7327c2..35c635b 100644 (file)
--- a/src/shortcuts.cc
+++ b/src/shortcuts.cc
@@ -28,10 +28,10 @@
 #include "intl.h"
 #include "layout.h"
 #include "main-defines.h"
-#include "utilops.h"
 #include "ui-bookmark.h"
 #include "ui-fileops.h"
 #include "ui-misc.h"
+#include "utilops.h"
 
 struct ShortcutsData
 {

diff --git a/src/slideshow.cc b/src/slideshow.cc
index 2327439..ba29f27 100644 (file)
--- a/src/slideshow.cc
+++ b/src/slideshow.cc
@@ -24,10 +24,10 @@
 #include <config.h>
 
 #include "collect.h"
-#include "image.h"
 #include "filedata.h"
-#include "layout.h"
+#include "image.h"
 #include "layout-image.h"
+#include "layout.h"
 
 static void slideshow_timer_stop(SlideShowData *ss);
 

diff --git a/src/toolbar.cc b/src/toolbar.cc
index 95cc691..df4a4e5 100644 (file)
--- a/src/toolbar.cc
+++ b/src/toolbar.cc
@@ -24,14 +24,14 @@
 #include <config.h>
 
 #include "compat.h"
+#include "editors.h"
 #include "intl.h"
 #include "layout-util.h"
 #include "main-defines.h"
-#include "ui-fileops.h"
-#include "ui-misc.h"
 #include "pixbuf-util.h"
+#include "ui-fileops.h"
 #include "ui-menu.h"
-#include "editors.h"
+#include "ui-misc.h"
 
 /** Implements the user-definable toolbar function
  * Called from the Preferences/toolbar tab

diff --git a/src/ui-fileops.cc b/src/ui-fileops.cc
index 8ce9e80..4ddfcad 100644 (file)
--- a/src/ui-fileops.cc
+++ b/src/ui-fileops.cc
@@ -33,13 +33,13 @@
 
 #include "compat.h"
 #include "debug.h"
-#include "main-defines.h"
-#include "md5-util.h"
 #include "filefilter.h"
 #include "intl.h"
 #include "layout.h"
-#include "utilops.h"
+#include "main-defines.h"
+#include "md5-util.h"
 #include "secure-save.h"
+#include "utilops.h"
 
 /*
  *-----------------------------------------------------------------------------

diff --git a/src/ui-pathsel.cc b/src/ui-pathsel.cc
index 3bbbc91..a0c4ffb 100644 (file)
--- a/src/ui-pathsel.cc
+++ b/src/ui-pathsel.cc
@@ -24,8 +24,8 @@
 #include <cstring>
 
 #include <dirent.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 
 #include <config.h>
 

diff --git a/src/view-dir.cc b/src/view-dir.cc
index fb1ba7b..43eb793 100644 (file)
--- a/src/view-dir.cc
+++ b/src/view-dir.cc
@@ -29,16 +29,16 @@
 #include "editors.h"
 #include "filedata.h"
 #include "intl.h"
-#include "layout.h"
 #include "layout-image.h"
+#include "layout.h"
 #include "main-defines.h"
 #include "menu.h"
 #include "ui-fileops.h"
-#include "ui-tree-edit.h"
 #include "ui-menu.h"
 #include "ui-misc.h"
-#include "utilops.h"
+#include "ui-tree-edit.h"
 #include "uri-utils.h"
+#include "utilops.h"
 #include "view-dir-list.h"
 #include "view-dir-tree.h"
 

diff --git a/src/view-file/view-file-icon.cc b/src/view-file/view-file-icon.cc
index 21064f1..ae27a33 100644 (file)
--- a/src/view-file/view-file-icon.cc
+++ b/src/view-file/view-file-icon.cc
@@ -35,11 +35,11 @@
 #include "metadata.h"
 #include "misc.h"
 #include "options.h"
-#include "utilops.h"
 #include "ui-fileops.h"
 #include "ui-misc.h"
 #include "ui-tree-edit.h"
 #include "uri-utils.h"
+#include "utilops.h"
 #include "view-file.h"
 
 /* between these, the icon width is increased by thumb_max_width / 2 */

diff --git a/src/view-file/view-file-list.cc b/src/view-file/view-file-list.cc
index a1bc995..bcd1145 100644 (file)
--- a/src/view-file/view-file-list.cc
+++ b/src/view-file/view-file-list.cc
@@ -28,16 +28,16 @@
 #include "dnd.h"
 #include "img-view.h"
 #include "intl.h"
-#include "layout.h"
 #include "layout-image.h"
+#include "layout.h"
 #include "main-defines.h"
 #include "metadata.h"
 #include "misc.h"
-#include "utilops.h"
 #include "ui-fileops.h"
 #include "ui-misc.h"
 #include "ui-tree-edit.h"
 #include "uri-utils.h"
+#include "utilops.h"
 #include "view-file.h"
 
 #include <vector>

diff --git a/src/view-file/view-file.cc b/src/view-file/view-file.cc
index 7384edf..89b712c 100644 (file)
--- a/src/view-file/view-file.cc
+++ b/src/view-file/view-file.cc
@@ -28,18 +28,18 @@
 #include "history-list.h"
 #include "intl.h"
 #include "layout.h"
-#include "main.h"
 #include "main-defines.h"
+#include "main.h"
 #include "menu.h"
 #include "misc.h"
 #include "pixbuf-util.h"
 #include "thumb.h"
-#include "ui-menu.h"
 #include "ui-fileops.h"
+#include "ui-menu.h"
 #include "ui-misc.h"
 #include "utilops.h"
-#include "view-file/view-file-list.h"
 #include "view-file/view-file-icon.h"
+#include "view-file/view-file-list.h"
 #include "window.h"
 
 /*

diff --git a/src/window.cc b/src/window.cc
index e73423d..62bc2ee 100644 (file)
--- a/src/window.cc
+++ b/src/window.cc
@@ -24,8 +24,8 @@
 
 #include "debug.h"
 #include "intl.h"
-#include "main.h"
 #include "main-defines.h"
+#include "main.h"
 #include "misc.h"
 #include "options.h"
 #include "pixbuf-util.h"