Sort headers using clang-tidy

[geeqie.git] / src / misc.cc

diff --git a/src/misc.cc b/src/misc.cc
index cb1dddf..3d80891 100644 (file)
--- a/src/misc.cc
+++ b/src/misc.cc
@@ -18,16 +18,23 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "misc.h"
+
 #include <clocale>
 #include <memory>
 
-#include "main.h"
-#include "misc.h"
+#include <config.h>
 
+#include "debug.h"
 #include "filedata.h"
+#include "intl.h"
+#include "main-defines.h"
+#include "main.h"
+#include "options.h"
 #include "ui-fileops.h"
 
 #include <langinfo.h>
+#include <pwd.h>
 
 gdouble get_zoom_increment()
 {
@@ -49,8 +56,10 @@ gchar *utf8_validate_or_convert(const gchar *text)
 
 gint utf8_compare(const gchar *s1, const gchar *s2, gboolean case_sensitive)
 {
-       gchar *s1_key, *s2_key;
-       gchar *s1_t, *s2_t;
+       gchar *s1_key;
+       gchar *s2_key;
+       gchar *s1_t;
+       gchar *s2_t;
        gint ret;
 
        g_assert(g_utf8_validate(s1, -1, nullptr));
@@ -126,8 +135,8 @@ gchar *expand_tilde(const gchar *filename)
 
        if (slash)
                return g_build_filename(home, G_DIR_SEPARATOR_S, slash + 1, NULL);
-       else
-               return g_build_filename(home, G_DIR_SEPARATOR_S, NULL);
+
+       return g_build_filename(home, G_DIR_SEPARATOR_S, NULL);
 #endif
 }
 
@@ -135,7 +144,9 @@ gchar *expand_tilde(const gchar *filename)
  */
 
 #define GEOCODE_NAME "geocode-parameters.awk"
-#define BUFSIZE 128
+enum {
+       BUFSIZE = 128
+};
 
 gchar *decode_geo_script(const gchar *path_dir, const gchar *input_text)
 {