Sort headers using clang-tidy

[geeqie.git] / src / img-view.cc

diff --git a/src/img-view.cc b/src/img-view.cc
index 663926f..9a00b94 100644 (file)
--- a/src/img-view.cc
+++ b/src/img-view.cc
@@ -19,19 +19,25 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "main.h"
 #include "img-view.h"
 
-#include "collect.h"
+#include <config.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-defines.h"
+#include "main.h"
 #include "menu.h"
 #include "misc.h"
 #include "pixbuf-util.h"
@@ -657,7 +663,7 @@ static void button_cb(ImageWindow *imd, GdkEventButton *event, gpointer data)
        switch (event->button)
                {
                case MOUSE_BUTTON_LEFT:
-                       if (options->image_l_click_archive && imd->image_fd->format_class == FORMAT_CLASS_ARCHIVE)
+                       if (options->image_l_click_archive && imd->image_fd->format_class == FORMAT_CLASS_ARCHIVE)
                                {
                                dest_dir = open_archive(imd->image_fd);
                                if (dest_dir)
@@ -671,7 +677,7 @@ static void button_cb(ImageWindow *imd, GdkEventButton *event, gpointer data)
                                        warning_dialog(_("Cannot open archive file"), _("See the Log Window"), GQ_ICON_DIALOG_WARNING, nullptr);
                                        }
                                }
-                       else if (options->image_l_click_video && options->image_l_click_video_editor && imd->image_fd->format_class == FORMAT_CLASS_VIDEO)
+                       else if (options->image_l_click_video && options->image_l_click_video_editor && imd->image_fd->format_class == FORMAT_CLASS_VIDEO)
                                {
                                start_editor_from_file(options->image_l_click_video_editor, imd->image_fd);
                                }
@@ -886,7 +892,7 @@ static void view_window_close(ViewWindow *vw)
 {
        view_slideshow_stop(vw);
        view_fullscreen_toggle(vw, TRUE);
-       gtk_widget_destroy(vw->window);
+       gq_gtk_widget_destroy(vw->window);
 }
 
 static gboolean view_window_delete_cb(GtkWidget *, GdkEventAny *, gpointer data)
@@ -902,13 +908,14 @@ static ViewWindow *real_view_window_new(FileData *fd, GList *list, CollectionDat
        ViewWindow *vw;
        GtkAllocation req_size;
        GdkGeometry geometry;
-       gint w, h;
+       gint w;
+       gint h;
 
        if (!fd && !list && (!cd || !info)) return nullptr;
 
        vw = g_new0(ViewWindow, 1);
 
-       vw->window = window_new(GTK_WINDOW_TOPLEVEL, "view", PIXBUF_INLINE_ICON_VIEW, nullptr, nullptr);
+       vw->window = window_new("view", PIXBUF_INLINE_ICON_VIEW, nullptr, nullptr);
        DEBUG_NAME(vw->window);
 
        geometry.min_width = DEFAULT_MINIMAL_WINDOW_SIZE;
@@ -931,7 +938,7 @@ static ViewWindow *real_view_window_new(FileData *fd, GList *list, CollectionDat
        image_auto_refresh_enable(vw->imd, TRUE);
        image_top_window_set_sync(vw->imd, TRUE);
 
-       gtk_container_add(GTK_CONTAINER(vw->window), vw->imd->widget);
+       gq_gtk_container_add(GTK_WIDGET(vw->window), vw->imd->widget);
        gtk_widget_show(vw->imd->widget);
 
        view_window_dnd_init(vw);
@@ -1320,7 +1327,7 @@ static LayoutWindow *view_new_layout_with_fd(FileData *fd)
        LayoutWindow *nw;
 
        nw = layout_new(nullptr, nullptr);
-       layout_sort_set(nw, options->file_sort.method, options->file_sort.ascending);
+       layout_sort_set_files(nw, nw->options.file_view_list_sort.method, nw->options.file_view_list_sort.ascend, nw->options.file_view_list_sort.case_sensitive);
        layout_set_fd(nw, fd);
        return nw;
 }