Sort headers using clang-tidy

[geeqie.git] / src / bar-sort.cc

diff --git a/src/bar-sort.cc b/src/bar-sort.cc
index 3559846..730f382 100644 (file)
--- a/src/bar-sort.cc
+++ b/src/bar-sort.cc
@@ -19,21 +19,27 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "main.h"
 #include "bar-sort.h"
 
-#include "collect.h"
+#include <config.h>
+
 #include "collect-io.h"
+#include "collect.h"
+#include "compat.h"
+#include "debug.h"
+#include "editors.h"
 #include "filedata.h"
 #include "history-list.h"
-#include "layout.h"
+#include "intl.h"
 #include "layout-image.h"
-#include "utilops.h"
-#include "editors.h"
+#include "layout.h"
+#include "main-defines.h"
+#include "misc.h"
+#include "rcfile.h"
 #include "ui-bookmark.h"
 #include "ui-fileops.h"
 #include "ui-misc.h"
-#include "rcfile.h"
+#include "utilops.h"
 #include "window.h"
 
 
@@ -434,7 +440,7 @@ static void bar_filter_help_dialog()
        generic_dialog_add_message(gd, GQ_ICON_DIALOG_INFO,
                                "Sort Manager Operations", _("Additional operations utilising plugins\nmay be included by setting:\n\nX-Geeqie-Filter=true\n\nin the plugin file."), TRUE);
        generic_dialog_add_button(gd, GQ_ICON_HELP, _("Help"), bar_filter_help_cb, TRUE);
-       generic_dialog_add_button(gd, GQ_ICON_OK, "OK", NULL, TRUE);
+       generic_dialog_add_button(gd, GQ_ICON_OK, "OK", nullptr, TRUE);
 
        gtk_widget_show(gd->dialog);
 }
@@ -482,10 +488,10 @@ static void bar_sort_add_close(SortData *sd)
 static void bar_sort_add_ok_cb(FileDialog *fd, gpointer data)
 {
        auto sd = static_cast<SortData *>(data);
-       const gchar *name = gtk_entry_get_text(GTK_ENTRY(sd->dialog_name_entry));
+       const gchar *name = gq_gtk_entry_get_text(GTK_ENTRY(sd->dialog_name_entry));
        gboolean empty_name = (name[0] == '\0');
 
-       name = gtk_entry_get_text(GTK_ENTRY(sd->dialog_name_entry));
+       name = gq_gtk_entry_get_text(GTK_ENTRY(sd->dialog_name_entry));
        if (sd->mode == BAR_SORT_MODE_FOLDER)
                {
                if (empty_name)
@@ -636,7 +642,8 @@ static GtkWidget *bar_sort_new(LayoutWindow *lw, SortActionType action,
        GtkWidget *label;
        GtkWidget *tbar;
        GtkWidget *combo;
-       GList *editors_list, *work;
+       GList *editors_list;
+       GList *work;
        gboolean have_filter;
        GtkWidget *button;