clang-tidy: modernize-use-using

[geeqie.git] / src / ui-help.cc

diff --git a/src/ui-help.cc b/src/ui-help.cc
index b795d3b..3e9832a 100644 (file)
--- a/src/ui-help.cc
+++ b/src/ui-help.cc
@@ -145,14 +145,14 @@ static void help_window_load_text(GtkWidget *text, const gchar *path)
 
 static gboolean help_window_delete_cb(GtkWidget *widget, GdkEventAny *, gpointer)
 {
-       gtk_widget_destroy(widget);
+       gq_gtk_widget_destroy(widget);
        return TRUE;
 }
 
 static void help_window_close(GtkWidget *, gpointer data)
 {
        auto window = static_cast<GtkWidget *>(data);
-       gtk_widget_destroy(window);
+       gq_gtk_widget_destroy(window);
 }
 
 void help_window_set_key(GtkWidget *window, const gchar *key)
@@ -201,7 +201,7 @@ GtkWidget *help_window_new(const gchar *title,
 
        /* window */
 
-       window = window_new(GTK_WINDOW_TOPLEVEL, subclass, nullptr, nullptr, title);
+       window = window_new(subclass, nullptr, nullptr, title);
        DEBUG_NAME(window);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
        gtk_window_set_default_size(GTK_WINDOW(window), HELP_WINDOW_WIDTH, HELP_WINDOW_HEIGHT);
@@ -210,7 +210,7 @@ GtkWidget *help_window_new(const gchar *title,
                         G_CALLBACK(help_window_delete_cb), NULL);
 
        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
-       gtk_container_add(GTK_CONTAINER(window), vbox);
+       gq_gtk_container_add(GTK_WIDGET(window), vbox);
        gtk_widget_show(vbox);
 
        g_object_set_data(G_OBJECT(window), "text_vbox", vbox);
@@ -218,19 +218,19 @@ GtkWidget *help_window_new(const gchar *title,
        /* text window */
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
        gtk_widget_show(hbox);
 
-       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(hbox), scrolled, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), scrolled, TRUE, TRUE, 0);
        gtk_widget_show(scrolled);
 
        text = gtk_text_view_new();
        gtk_text_view_set_editable(GTK_TEXT_VIEW(text), FALSE);
-       gtk_container_add(GTK_CONTAINER(scrolled), text);
+       gq_gtk_container_add(GTK_WIDGET(scrolled), text);
        gtk_widget_show(text);
 
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
@@ -240,13 +240,13 @@ GtkWidget *help_window_new(const gchar *title,
        hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
        gtk_container_set_border_width(GTK_CONTAINER(hbox), PREF_PAD_BORDER);
        gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
-       gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+       gq_gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
        gtk_widget_show(hbox);
 
        button = gtk_button_new_from_icon_name(GQ_ICON_CLOSE, GTK_ICON_SIZE_BUTTON);
        g_signal_connect(G_OBJECT(button), "clicked",
                         G_CALLBACK(help_window_close), window);
-       gtk_container_add(GTK_CONTAINER(hbox), button);
+       gq_gtk_container_add(GTK_WIDGET(hbox), button);
        gtk_widget_set_can_default(button, TRUE);
        gtk_widget_grab_default(button);
        gtk_widget_show(button);