Sort headers using clang-tidy

[geeqie.git] / src / remote.cc

diff --git a/src/remote.cc b/src/remote.cc
index 451b5be..4ece932 100644 (file)
--- a/src/remote.cc
+++ b/src/remote.cc
@@ -19,26 +19,32 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "main.h"
 #include "remote.h"
 
+#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"
 #include "filedata.h"
 #include "filefilter.h"
 #include "image.h"
 #include "img-view.h"
+#include "intl.h"
 #include "layout-image.h"
 #include "layout-util.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>
@@ -47,9 +53,13 @@
 
 #include "glua.h"
 
-#define SERVER_MAX_CLIENTS 8
+enum {
+       SERVER_MAX_CLIENTS = 8
+};
 
-#define REMOTE_SERVER_BACKLOG 4
+enum {
+       REMOTE_SERVER_BACKLOG = 4
+};
 
 
 #ifndef UNIX_PATH_MAX
@@ -345,7 +355,8 @@ static void sighandler_sigpipe(gint)
 
 static gboolean remote_client_send(RemoteConnection *rc, const gchar *text)
 {
-       struct sigaction new_action, old_action;
+       struct sigaction new_action;
+       struct sigaction old_action;
        gboolean ret = FALSE;
        GError *error = nullptr;
        GIOChannel *channel;
@@ -614,7 +625,10 @@ static void gr_slideshow_stop(const gchar *, GIOChannel *, gpointer)
 
 static void gr_slideshow_delay(const gchar *text, GIOChannel *, gpointer)
 {
-       gdouble t1, t2, t3, n;
+       gdouble t1;
+       gdouble t2;
+       gdouble t3;
+       gdouble n;
        gint res;
 
        res = sscanf(text, "%lf:%lf:%lf", &t1, &t2, &t3);
@@ -741,9 +755,13 @@ static void gr_file_load(const gchar *text, GIOChannel *channel, gpointer data)
 static void gr_pixel_info(const gchar *, GIOChannel *channel, gpointer)
 {
        gchar *pixel_info;
-       gint x_pixel, y_pixel;
-       gint width, height;
-       gint r_mouse, g_mouse, b_mouse;
+       gint x_pixel;
+       gint y_pixel;
+       gint width;
+       gint height;
+       gint r_mouse;
+       gint g_mouse;
+       gint b_mouse;
        PixbufRenderer *pr;
 
        if (!layout_valid(&lw_id)) return;
@@ -786,7 +804,10 @@ static void gr_rectangle(const gchar *, GIOChannel *channel, gpointer)
 {
        gchar *rectangle_info;
        PixbufRenderer *pr;
-       gint x1, y1, x2, y2;
+       gint x1;
+       gint y1;
+       gint x2;
+       gint y2;
 
        if (!options->draw_rectangle) return;
        if (!layout_valid(&lw_id)) return;