Sort headers using clang-tidy

[geeqie.git] / src / editors.cc

diff --git a/src/editors.cc b/src/editors.cc
index 786d77e..a074d56 100644 (file)
--- a/src/editors.cc
+++ b/src/editors.cc
@@ -19,18 +19,26 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "main.h"
 #include "editors.h"
 
+#include <config.h>
+
+#include "compat.h"
+#include "debug.h"
 #include "filedata.h"
 #include "filefilter.h"
+#include "intl.h"
+#include "main-defines.h"
+#include "main.h"
+#include "options.h"
 #include "pixbuf-util.h"
 #include "ui-fileops.h"
-#include "ui-spinner.h"
 #include "utilops.h"
 
-#define EDITOR_WINDOW_WIDTH 500
-#define EDITOR_WINDOW_HEIGHT 300
+enum {
+       EDITOR_WINDOW_WIDTH = 500,
+       EDITOR_WINDOW_HEIGHT = 300
+};
 
 
 
@@ -175,7 +183,9 @@ gboolean editor_read_desktop_file(const gchar *path)
        gchar *extensions;
        gchar *type;
        const gchar *key = filename_from_path(path);
-       gchar **categories, **only_show_in, **not_show_in;
+       gchar **categories;
+       gchar **only_show_in;
+       gchar **not_show_in;
        gchar *try_exec;
        GtkTreeIter iter;
        gboolean category_geeqie = FALSE;
@@ -376,7 +386,7 @@ gboolean editor_read_desktop_file(const gchar *path)
        return TRUE;
 }
 
-static gboolean editor_remove_desktop_file_cb(gpointer UNUSED(key), gpointer value, gpointer UNUSED(user_data))
+static gboolean editor_remove_desktop_file_cb(gpointer, gpointer value, gpointer)
 {
        auto editor = static_cast<EditorDescription *>(value);
        return editor->hidden || editor->ignored;
@@ -471,7 +481,7 @@ GList *editor_get_desktop_files()
        return list;
 }
 
-static void editor_list_add_cb(gpointer UNUSED(key), gpointer value, gpointer data)
+static void editor_list_add_cb(gpointer, gpointer value, gpointer data)
 {
        auto listp = static_cast<GList **>(data);
        auto editor = static_cast<EditorDescription *>(value);
@@ -556,7 +566,7 @@ static void editor_verbose_window_close(GenericDialog *gd, gpointer data)
        if (ed->pid == -1) editor_data_free(ed); /* the process has already terminated */
 }
 
-static void editor_verbose_window_stop(GenericDialog *UNUSED(gd), gpointer data)
+static void editor_verbose_window_stop(GenericDialog *, gpointer data)
 {
        auto ed = static_cast<EditorData *>(data);
        ed->stopping = TRUE;
@@ -568,7 +578,7 @@ static void editor_verbose_window_enable_close(EditorVerboseData *vd)
 {
        vd->gd->cancel_cb = editor_verbose_window_close;
 
-       spinner_set_interval(vd->spinner, -1);
+       gtk_spinner_stop(GTK_SPINNER(vd->spinner));
        gtk_widget_set_sensitive(vd->button_stop, FALSE);
        gtk_widget_set_sensitive(vd->button_close, TRUE);
 }
@@ -588,40 +598,40 @@ static EditorVerboseData *editor_verbose_window(EditorData *ed, const gchar *tex
        buf = g_strdup_printf(_("Output of %s"), text);
        generic_dialog_add_message(vd->gd, nullptr, buf, nullptr, FALSE);
        g_free(buf);
-
-       vd->button_stop = generic_dialog_add_button(vd->gd, "process-stop", nullptr,
+       vd->button_stop = generic_dialog_add_button(vd->gd, GQ_ICON_STOP, nullptr,
                                                   editor_verbose_window_stop, FALSE);
        gtk_widget_set_sensitive(vd->button_stop, FALSE);
-       vd->button_close = generic_dialog_add_button(vd->gd, GTK_STOCK_CLOSE, nullptr,
+       vd->button_close = generic_dialog_add_button(vd->gd, GQ_ICON_CLOSE, _("Close"),
                                                    editor_verbose_window_close, TRUE);
        gtk_widget_set_sensitive(vd->button_close, FALSE);
 
-       scrolled = gtk_scrolled_window_new(nullptr, nullptr);
-       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+       scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
+       gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-       gtk_box_pack_start(GTK_BOX(vd->gd->vbox), scrolled, TRUE, TRUE, 5);
+       gq_gtk_box_pack_start(GTK_BOX(vd->gd->vbox), scrolled, TRUE, TRUE, 5);
        gtk_widget_show(scrolled);
 
        vd->text = gtk_text_view_new();
        gtk_text_view_set_editable(GTK_TEXT_VIEW(vd->text), FALSE);
        gtk_widget_set_size_request(vd->text, EDITOR_WINDOW_WIDTH, EDITOR_WINDOW_HEIGHT);
-       gtk_container_add(GTK_CONTAINER(scrolled), vd->text);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), vd->text);
        gtk_widget_show(vd->text);
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_box_pack_start(GTK_BOX(vd->gd->vbox), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vd->gd->vbox), hbox, FALSE, FALSE, 0);
        gtk_widget_show(hbox);
 
        vd->progress = gtk_progress_bar_new();
        gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(vd->progress), 0.0);
-       gtk_box_pack_start(GTK_BOX(hbox), vd->progress, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), vd->progress, TRUE, TRUE, 0);
        gtk_progress_bar_set_text(GTK_PROGRESS_BAR(vd->progress), "");
        gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(vd->progress), TRUE);
        gtk_widget_show(vd->progress);
 
-       vd->spinner = spinner_new(nullptr, SPINNER_SPEED);
-       gtk_box_pack_start(GTK_BOX(hbox), vd->spinner, FALSE, FALSE, 0);
+       vd->spinner = gtk_spinner_new();
+       gtk_spinner_start(GTK_SPINNER(vd->spinner));
+       gq_gtk_box_pack_start(GTK_BOX(hbox), vd->spinner, FALSE, FALSE, 0);
        gtk_widget_show(vd->spinner);
 
        gtk_widget_show(vd->gd->dialog);
@@ -1339,7 +1349,7 @@ EditorFlags start_editor_from_filelist_full(const gchar *key, GList *list, const
                {
                gchar *text = g_strdup_printf(_("%s\n\"%s\""), editor_get_error_str(error), editor->file);
 
-               file_util_warning_dialog(_("Invalid editor command"), text, GTK_STOCK_DIALOG_ERROR, nullptr);
+               file_util_warning_dialog(_("Invalid editor command"), text, GQ_ICON_DIALOG_ERROR, nullptr);
                g_free(text);
                }
 
@@ -1440,9 +1450,9 @@ const gchar *editor_get_error_str(EditorFlags flags)
 #pragma GCC diagnostic ignored "-Wunused-function"
 const gchar *editor_get_name_unused(const gchar *key)
 {
-       EditorDescription *editor = static_cast<EditorDescription *>(g_hash_table_lookup(editors, key));
+       auto *editor = static_cast<EditorDescription *>(g_hash_table_lookup(editors, key));
 
-       if (!editor) return NULL;
+       if (!editor) return nullptr;
 
        return editor->name;
 }