Sort headers using clang-tidy

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

diff --git a/src/view-file/view-file.cc b/src/view-file/view-file.cc
index a40a58c..89b712c 100644 (file)
--- a/src/view-file/view-file.cc
+++ b/src/view-file/view-file.cc
@@ -18,22 +18,28 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "main.h"
 #include "view-file.h"
 
+#include <config.h>
+
+#include "compat.h"
+#include "debug.h"
 #include "dupe.h"
 #include "history-list.h"
+#include "intl.h"
 #include "layout.h"
+#include "main-defines.h"
+#include "main.h"
 #include "menu.h"
 #include "misc.h"
 #include "pixbuf-util.h"
 #include "thumb.h"
-#include "ui-menu.h"
 #include "ui-fileops.h"
+#include "ui-menu.h"
 #include "ui-misc.h"
 #include "utilops.h"
-#include "view-file/view-file-list.h"
 #include "view-file/view-file-icon.h"
+#include "view-file/view-file-list.h"
 #include "window.h"
 
 /*
@@ -828,7 +834,7 @@ static void vf_destroy_cb(GtkWidget *widget, gpointer data)
                {
                g_signal_handlers_disconnect_matched(G_OBJECT(vf->popup), G_SIGNAL_MATCH_DATA,
                                                     0, 0, nullptr, nullptr, vf);
-               gtk_widget_destroy(vf->popup);
+               g_object_unref(vf->popup);
                }
 
        if (vf->read_metadata_in_idle_id)
@@ -867,7 +873,7 @@ static void vf_marks_tooltip_ok_cb(GenericDialog *gd, gpointer data)
        auto mte = static_cast<MarksTextEntry *>(data);
 
        g_free(options->marks_tooltips[mte->mark_no]);
-       options->marks_tooltips[mte->mark_no] = g_strdup(gtk_entry_get_text(GTK_ENTRY(mte->edit_widget)));
+       options->marks_tooltips[mte->mark_no] = g_strdup(gq_gtk_entry_get_text(GTK_ENTRY(mte->edit_widget)));
 
        gtk_widget_set_tooltip_text(mte->parent, options->marks_tooltips[mte->mark_no]);
 
@@ -881,7 +887,7 @@ void vf_marks_filter_on_icon_press(GtkEntry *, GtkEntryIconPosition, GdkEvent *,
 
        g_free(mte->text_entry);
        mte->text_entry = g_strdup("");
-       gtk_entry_set_text(GTK_ENTRY(mte->edit_widget), "");
+       gq_gtk_entry_set_text(GTK_ENTRY(mte->edit_widget), "");
 }
 
 static void vf_marks_tooltip_help_cb(GenericDialog *, gpointer)
@@ -920,9 +926,9 @@ static gboolean vf_marks_tooltip_cb(GtkWidget *widget,
        gtk_widget_set_size_request(mte->edit_widget, 300, -1);
        if (mte->text_entry)
                {
-               gtk_entry_set_text(GTK_ENTRY(mte->edit_widget), mte->text_entry);
+               gq_gtk_entry_set_text(GTK_ENTRY(mte->edit_widget), mte->text_entry);
                }
-       gtk_table_attach_defaults(GTK_TABLE(table), mte->edit_widget, 1, 2, 0, 1);
+       gq_gtk_grid_attach_default(GTK_GRID(table), mte->edit_widget, 1, 2, 0, 1);
        generic_dialog_attach_default(mte->gd, mte->edit_widget);
 
        gtk_entry_set_icon_from_icon_name(GTK_ENTRY(mte->edit_widget),
@@ -948,7 +954,7 @@ static void vf_file_filter_save_cb(GtkWidget *, gpointer data)
        gboolean text_found = FALSE;
        gint i;
 
-       entry_text = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(vf->file_filter.combo)))));
+       entry_text = g_strdup(gq_gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(vf->file_filter.combo)))));
 
        if (entry_text[0] == '\0' && vf->file_filter.last_selected >= 0)
                {
@@ -960,7 +966,7 @@ static void vf_file_filter_save_cb(GtkWidget *, gpointer data)
 
                gtk_combo_box_set_active(GTK_COMBO_BOX(vf->file_filter.combo), -1);
                vf->file_filter.last_selected = - 1;
-               gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(vf->file_filter.combo))), "");
+               gq_gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(vf->file_filter.combo))), "");
                vf->file_filter.count--;
                }
        else
@@ -1035,7 +1041,7 @@ static GtkWidget *vf_marks_filter_init(ViewFile *vf)
                gtk_widget_show(check);
                vf->filter_check[i] = check;
                }
-       gtk_container_add(GTK_CONTAINER(frame), hbox);
+       gq_gtk_container_add(GTK_WIDGET(frame), hbox);
        gtk_widget_show(hbox);
        return frame;
 }
@@ -1159,7 +1165,7 @@ static void file_filter_clear_cb(GtkEntry *, GtkEntryIconPosition pos, GdkEvent
 {
        if (pos == GTK_ENTRY_ICON_SECONDARY)
                {
-               gtk_entry_set_text(GTK_ENTRY(userdata), "");
+               gq_gtk_entry_set_text(GTK_ENTRY(userdata), "");
                gtk_widget_grab_focus(GTK_WIDGET(userdata));
                }
 }
@@ -1209,7 +1215,7 @@ static GtkWidget *vf_file_filter_init(ViewFile *vf)
 
        gq_gtk_box_pack_start(GTK_BOX(hbox), vf->file_filter.combo, FALSE, FALSE, 0);
        gtk_widget_show(vf->file_filter.combo);
-       gtk_container_add(GTK_CONTAINER(frame), hbox);
+       gq_gtk_container_add(GTK_WIDGET(frame), hbox);
        gtk_widget_show(hbox);
 
        case_sensitive = gtk_check_button_new_with_label(_("Case"));
@@ -1234,8 +1240,8 @@ static GtkWidget *vf_file_filter_init(ViewFile *vf)
        gtk_widget_set_tooltip_text(GTK_WIDGET(menuitem), _("Select Class filter"));
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), class_filter_menu(vf));
        gtk_menu_shell_append(GTK_MENU_SHELL(menubar), menuitem);
-       gtk_container_add(GTK_CONTAINER(menuitem), box);
-       gtk_widget_show_all(menuitem);
+       gq_gtk_container_add(GTK_WIDGET(menuitem), box);
+       gq_gtk_widget_show_all(menuitem);
 
        return frame;
 }
@@ -1290,7 +1296,7 @@ ViewFile *vf_new(FileViewType type, FileData *dir_fd)
        g_signal_connect(G_OBJECT(vf->listview), "button_release_event",
                         G_CALLBACK(vf_release_cb), vf);
 
-       gtk_container_add(GTK_CONTAINER(vf->scrolled), vf->listview);
+       gq_gtk_container_add(GTK_WIDGET(vf->scrolled), vf->listview);
        gtk_widget_show(vf->listview);
 
        if (dir_fd) vf_set_fd(vf, dir_fd);
@@ -1563,12 +1569,10 @@ gboolean vf_stars_cb(gpointer data)
                        {
                        return G_SOURCE_CONTINUE;
                        }
-               else
-                       {
-                       vf->stars_filedata = nullptr;
-                       vf->stars_id = 0;
-                       return G_SOURCE_REMOVE;
-                       }
+
+               vf->stars_filedata = nullptr;
+               vf->stars_id = 0;
+               return G_SOURCE_REMOVE;
                }
 
        return G_SOURCE_REMOVE;