Sort headers using clang-tidy

[geeqie.git] / src / shortcuts.cc

diff --git a/src/shortcuts.cc b/src/shortcuts.cc
index d2228ff..35c635b 100644 (file)
--- a/src/shortcuts.cc
+++ b/src/shortcuts.cc
@@ -19,18 +19,21 @@
  * 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"
 
-typedef struct _ShortcutsData ShortcutsData;
-struct _ShortcutsData
+struct ShortcutsData
 {
        GtkWidget *vbox;
        GtkWidget *bookmarks;
@@ -46,7 +49,7 @@ struct _ShortcutsData
 
 static void shortcuts_bookmark_select(const gchar *path, gpointer data)
 {
-       ShortcutsData *scd = static_cast<ShortcutsData *>(data);
+       auto scd = static_cast<ShortcutsData *>(data);
 
        if (file_extension_match(path, GQ_COLLECTION_EXT))
                {
@@ -62,13 +65,13 @@ static void shortcuts_bookmark_select(const gchar *path, gpointer data)
 static void shortcuts_add_close(ShortcutsData *scd)
 {
        if (scd->dialog) file_dialog_close(scd->dialog);
-       scd->dialog_name_entry = NULL;
-       scd->dialog = NULL;
+       scd->dialog_name_entry = nullptr;
+       scd->dialog = nullptr;
 }
 
 static void shortcuts_add_ok_cb(FileDialog *fd, gpointer data)
 {
-       ShortcutsData *scd = static_cast<ShortcutsData *>(data);
+       auto scd = static_cast<ShortcutsData *>(data);
        const gchar *name = gtk_entry_get_text(GTK_ENTRY(scd->dialog_name_entry));
        gboolean empty_name = (name[0] == '\0');
 
@@ -84,16 +87,16 @@ static void shortcuts_add_ok_cb(FileDialog *fd, gpointer data)
        shortcuts_add_close(scd);
 }
 
-static void shortcuts_add_cancel_cb(FileDialog *UNUSED(fd), gpointer data)
+static void shortcuts_add_cancel_cb(FileDialog *, gpointer data)
 {
-       ShortcutsData *scd = static_cast<ShortcutsData *>(data);
+       auto scd = static_cast<ShortcutsData *>(data);
 
        shortcuts_add_close(scd);
 }
 
 static void shortcuts_add_cb(GtkWidget *button, gpointer data)
 {
-       ShortcutsData *scd = static_cast<ShortcutsData *>(data);
+       auto scd = static_cast<ShortcutsData *>(data);
        GtkWidget *hbox;
        const gchar *title;
 
@@ -107,27 +110,27 @@ static void shortcuts_add_cb(GtkWidget *button, gpointer data)
        scd->dialog = file_util_file_dlg(title,
                                        "add_shortcuts", button,
                                        shortcuts_add_cancel_cb, scd);
-       file_dialog_add_button(scd->dialog, GTK_STOCK_OK, NULL, shortcuts_add_ok_cb, TRUE);
+       file_dialog_add_button(scd->dialog, GQ_ICON_OK, "OK", shortcuts_add_ok_cb, TRUE);
 
-       generic_dialog_add_message(GENERIC_DIALOG(scd->dialog), NULL, title, NULL, FALSE);
+       generic_dialog_add_message(GENERIC_DIALOG(scd->dialog), nullptr, title, nullptr, FALSE);
 
-       file_dialog_add_path_widgets(scd->dialog, NULL, NULL, "add_shortcuts", NULL, NULL);
+       file_dialog_add_path_widgets(scd->dialog, nullptr, nullptr, "add_shortcuts", nullptr, nullptr);
 
        hbox = pref_box_new(GENERIC_DIALOG(scd->dialog)->vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
 
        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);
 
        gtk_widget_show(GENERIC_DIALOG(scd->dialog)->dialog);
 }
 
-static void shortcuts_destroy(GtkWidget *UNUSED(widget), gpointer data)
+static void shortcuts_destroy(GtkWidget *, gpointer data)
 {
-       ShortcutsData *scd = static_cast<ShortcutsData *>(data);
+       auto scd = static_cast<ShortcutsData *>(data);
 
        shortcuts_add_close(scd);
 
@@ -139,7 +142,7 @@ static GtkWidget *shortcuts_new(LayoutWindow *lw)
        ShortcutsData *scd;
        GtkWidget *tbar;
 
-       if (!lw) return NULL;
+       if (!lw) return nullptr;
 
        scd = g_new0(ShortcutsData, 1);
 
@@ -151,19 +154,19 @@ 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, GTK_STOCK_ADD, NULL, FALSE,
+       scd->add_button = pref_toolbar_button(tbar, GQ_ICON_ADD, _("Add"), FALSE,
                                        _("Add Shortcut"),
                                        G_CALLBACK(shortcuts_add_cb), scd);
 
        return scd->vbox;
 }
 
-GtkWidget *shortcuts_new_from_config(LayoutWindow *lw, const gchar **UNUSED(attribute_names), const gchar **UNUSED(attribute_values))
+GtkWidget *shortcuts_new_from_config(LayoutWindow *lw, const gchar **, const gchar **)
 {
        GtkWidget *shortcuts_bar;
 
@@ -175,7 +178,7 @@ GtkWidget *shortcuts_new_from_config(LayoutWindow *lw, const gchar **UNUSED(attr
 
 GtkWidget *shortcuts_new_default(LayoutWindow *lw)
 {
-       return shortcuts_new_from_config(lw, NULL, NULL);
+       return shortcuts_new_from_config(lw, nullptr, nullptr);
 }
 
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */