Sort headers using clang-tidy

[geeqie.git] / src / shortcuts.cc

diff --git a/src/shortcuts.cc b/src/shortcuts.cc
index e9310cd..35c635b 100644 (file)
--- a/src/shortcuts.cc
+++ b/src/shortcuts.cc
@@ -19,15 +19,19 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "main.h"
 #include "shortcuts.h"
 
+#include <config.h>
+
 #include "collect.h"
+#include "compat.h"
+#include "intl.h"
 #include "layout.h"
-#include "utilops.h"
+#include "main-defines.h"
 #include "ui-bookmark.h"
 #include "ui-fileops.h"
 #include "ui-misc.h"
+#include "utilops.h"
 
 struct ShortcutsData
 {
@@ -117,7 +121,7 @@ static void shortcuts_add_cb(GtkWidget *button, gpointer data)
        pref_label_new(hbox, _("Name:"));
 
        scd->dialog_name_entry = gtk_entry_new();
-       gtk_box_pack_start(GTK_BOX(hbox), scd->dialog_name_entry, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), scd->dialog_name_entry, TRUE, TRUE, 0);
        generic_dialog_attach_default(GENERIC_DIALOG(scd->dialog), scd->dialog_name_entry);
        gtk_widget_show(scd->dialog_name_entry);
 
@@ -150,10 +154,10 @@ static GtkWidget *shortcuts_new(LayoutWindow *lw)
                        G_CALLBACK(shortcuts_destroy), scd);
 
        scd->bookmarks = bookmark_list_new(SHORTCUTS, shortcuts_bookmark_select, scd);
-       gtk_box_pack_start(GTK_BOX(scd->vbox), scd->bookmarks, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(scd->vbox), scd->bookmarks, TRUE, TRUE, 0);
        gtk_widget_show(scd->bookmarks);
 
-       tbar = pref_toolbar_new(scd->vbox, GTK_TOOLBAR_ICONS);
+       tbar = pref_toolbar_new(scd->vbox);
 
        scd->add_button = pref_toolbar_button(tbar, GQ_ICON_ADD, _("Add"), FALSE,
                                        _("Add Shortcut"),