Sort headers using clang-tidy

[geeqie.git] / src / ui-fileops.cc

diff --git a/src/ui-fileops.cc b/src/ui-fileops.cc
index 7e52832..4ddfcad 100644 (file)
--- a/src/ui-fileops.cc
+++ b/src/ui-fileops.cc
@@ -19,6 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "ui-fileops.h"
+
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
@@ -27,14 +29,17 @@
 #include <unistd.h>
 #include <utime.h>
 
-#include "main.h"
-#include "ui-fileops.h"
+#include <config.h>
 
-#include "md5-util.h"
+#include "compat.h"
+#include "debug.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"
 
 /*
  *-----------------------------------------------------------------------------
@@ -484,7 +489,8 @@ gboolean rmdir_utf8(const gchar *s)
 gboolean copy_file_attributes(const gchar *s, const gchar *t, gint perms, gint mtime)
 {
        struct stat st;
-       gchar *sl, *tl;
+       gchar *sl;
+       gchar *tl;
        gboolean ret = FALSE;
 
        if (!s || !t) return FALSE;
@@ -669,7 +675,8 @@ gboolean copy_file(const gchar *s, const gchar *t)
 
 gboolean move_file(const gchar *s, const gchar *t)
 {
-       gchar *sl, *tl;
+       gchar *sl;
+       gchar *tl;
        gboolean ret = TRUE;
 
        if (!s || !t) return FALSE;
@@ -701,7 +708,8 @@ gboolean move_file(const gchar *s, const gchar *t)
 
 gboolean rename_file(const gchar *s, const gchar *t)
 {
-       gchar *sl, *tl;
+       gchar *sl;
+       gchar *tl;
        gboolean ret;
 
        if (!s || !t) return FALSE;
@@ -868,7 +876,8 @@ gchar *remove_extension_from_path(const gchar *path)
 
 void parse_out_relatives(gchar *path)
 {
-       gint s, t;
+       gint s;
+       gint t;
 
        if (!path) return;
 
@@ -887,7 +896,8 @@ void parse_out_relatives(gchar *path)
                                s = p;
                                continue;
                                }
-                       else if (path[p] == '.' && (path[p+1] == G_DIR_SEPARATOR || path[p+1] == '\0'))
+
+                       if (path[p] == '.' && (path[p+1] == G_DIR_SEPARATOR || path[p+1] == '\0'))
                                {
                                /* /../ or /.., remove previous part, ie. /a/b/../ becomes /a/ */
                                s = p + 1;
@@ -911,7 +921,8 @@ gboolean file_in_path(const gchar *name)
 {
        gchar *path;
        gchar *namel;
-       gint p, l;
+       gint p;
+       gint l;
        gboolean ret = FALSE;
 
        if (!name) return FALSE;