Sort headers using clang-tidy

[geeqie.git] / src / image-overlay.cc

diff --git a/src/image-overlay.cc b/src/image-overlay.cc
index abe1381..7dfd5a7 100644 (file)
--- a/src/image-overlay.cc
+++ b/src/image-overlay.cc
@@ -19,16 +19,20 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "main.h"
 #include "image-overlay.h"
 
+#include <config.h>
+
 #include "collect.h"
+#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"
+#include "main-defines.h"
 #include "osd.h"
 #include "pixbuf-renderer.h"
 #include "pixbuf-util.h"
@@ -228,7 +232,8 @@ void image_osd_toggle(ImageWindow *imd)
 static GdkPixbuf *image_osd_info_render(OverlayStateData *osd)
 {
        GdkPixbuf *pixbuf = nullptr;
-       gint width, height;
+       gint width;
+       gint height;
        PangoLayout *layout;
        const gchar *name;
        gchar *text;
@@ -243,7 +248,8 @@ static GdkPixbuf *image_osd_info_render(OverlayStateData *osd)
        name = image_get_name(imd);
        if (name)
                {
-               gint n, t;
+               gint n;
+               gint t;
                CollectionData *cd;
                CollectInfo *info;
                GHashTable *vars;
@@ -310,7 +316,8 @@ static GdkPixbuf *image_osd_info_render(OverlayStateData *osd)
 
                if (!imd->unknown)
                        {
-                       gint w, h;
+                       gint w;
+                       gint h;
                        GdkPixbuf *load_pixbuf = image_loader_get_pixbuf(imd->il);
 
                        if (imd->delay_flip &&
@@ -868,7 +875,8 @@ Histogram *image_osd_get_histogram(ImageWindow *imd)
 
 void image_osd_copy_status(ImageWindow *src, ImageWindow *dest)
 {
-       Histogram *h_src, *h_dest;
+       Histogram *h_src;
+       Histogram *h_dest;
        image_osd_set(dest, image_osd_get(src));
 
        h_src = image_osd_get_histogram(src);