From 3b2fd26415133da19eee10ae18b61df19d5ce80f Mon Sep 17 00:00:00 2001 From: rbuj Date: Tue, 29 Dec 2020 10:38:15 +0100 Subject: Remove unnecessary casts on g_signal_connect calls --- cpufreq/src/cpufreq-applet.c | 22 +++++++++++----------- cpufreq/src/cpufreq-popup.c | 4 ++-- cpufreq/src/cpufreq-prefs.c | 28 ++++++++++++++++------------ cpufreq/src/cpufreq-utils.c | 6 +++--- 4 files changed, 32 insertions(+), 28 deletions(-) (limited to 'cpufreq/src') diff --git a/cpufreq/src/cpufreq-applet.c b/cpufreq/src/cpufreq-applet.c index eb887229..adbd0e8c 100644 --- a/cpufreq/src/cpufreq-applet.c +++ b/cpufreq/src/cpufreq-applet.c @@ -799,27 +799,27 @@ cpufreq_applet_setup (CPUFreqApplet *applet) settings = mate_panel_applet_settings_new (MATE_PANEL_APPLET (applet), "org.mate.panel.applet.cpufreq"); applet->prefs = cpufreq_prefs_new (settings); - g_signal_connect (G_OBJECT (applet->prefs), - "notify::cpu", + g_signal_connect (applet->prefs, "notify::cpu", G_CALLBACK (cpufreq_applet_prefs_cpu_changed), - (gpointer) applet); - g_signal_connect (G_OBJECT (applet->prefs), - "notify::show-mode", + applet); + + g_signal_connect (applet->prefs, "notify::show-mode", G_CALLBACK (cpufreq_applet_prefs_show_mode_changed), - (gpointer) applet); - g_signal_connect (G_OBJECT (applet->prefs), - "notify::show-text-mode", + applet); + + g_signal_connect (applet->prefs, "notify::show-text-mode", G_CALLBACK (cpufreq_applet_prefs_show_mode_changed), - (gpointer) applet); + applet); /* Monitor */ applet->monitor = cpufreq_monitor_factory_create_monitor (cpufreq_prefs_get_cpu (applet->prefs)); cpufreq_monitor_run (applet->monitor); - g_signal_connect_swapped (G_OBJECT (applet->monitor), "changed", + + g_signal_connect_swapped (applet->monitor, "changed", G_CALLBACK (cpufreq_applet_update), - (gpointer) applet); + applet); /* Setup the menus */ action_group = gtk_action_group_new ("CPUFreq Applet Actions"); diff --git a/cpufreq/src/cpufreq-popup.c b/cpufreq/src/cpufreq-popup.c index 56c1b0d0..456a60a6 100644 --- a/cpufreq/src/cpufreq-popup.c +++ b/cpufreq/src/cpufreq-popup.c @@ -244,14 +244,14 @@ cpufreq_popup_menu_add_action (CPUFreqPopup *popup, g_signal_connect (action, "activate", G_CALLBACK (cpufreq_popup_frequencies_menu_activate), - (gpointer) popup); + popup); } else if (g_ascii_strcasecmp (menu, "Governor") == 0) { popup->priv->govs_actions = g_slist_prepend (popup->priv->govs_actions, (gpointer) action); g_signal_connect (action, "activate", G_CALLBACK (cpufreq_popup_governors_menu_activate), - (gpointer) popup); + popup); } gtk_action_group_add_action (action_group, GTK_ACTION (action)); diff --git a/cpufreq/src/cpufreq-prefs.c b/cpufreq/src/cpufreq-prefs.c index 5682e5e5..f0e60bf0 100644 --- a/cpufreq/src/cpufreq-prefs.c +++ b/cpufreq/src/cpufreq-prefs.c @@ -553,25 +553,29 @@ cpufreq_prefs_dialog_create (CPUFreqPrefs *prefs) if (cpufreq_utils_get_n_cpus () > 1) cpufreq_prefs_dialog_cpu_combo_setup (prefs); - g_signal_connect_swapped (G_OBJECT (prefs->priv->dialog), "response", + g_signal_connect_swapped (prefs->priv->dialog, "response", G_CALLBACK (cpufreq_prefs_dialog_response_cb), - (gpointer) prefs); + prefs); - g_signal_connect (G_OBJECT (prefs->priv->show_freq), "toggled", + g_signal_connect (prefs->priv->show_freq, "toggled", G_CALLBACK (cpufreq_prefs_dialog_show_freq_toggled), - (gpointer) prefs); - g_signal_connect (G_OBJECT (prefs->priv->show_unit), "toggled", + prefs); + + g_signal_connect (prefs->priv->show_unit, "toggled", G_CALLBACK (cpufreq_prefs_dialog_show_unit_toggled), - (gpointer) prefs); - g_signal_connect (G_OBJECT (prefs->priv->show_perc), "toggled", + prefs); + + g_signal_connect (prefs->priv->show_perc, "toggled", G_CALLBACK (cpufreq_prefs_dialog_show_perc_toggled), - (gpointer) prefs); - g_signal_connect (G_OBJECT (prefs->priv->cpu_combo), "changed", + prefs); + + g_signal_connect (prefs->priv->cpu_combo, "changed", G_CALLBACK (cpufreq_prefs_dialog_cpu_number_changed), - (gpointer) prefs); - g_signal_connect (G_OBJECT (prefs->priv->show_mode_combo), "changed", + prefs); + + g_signal_connect (prefs->priv->show_mode_combo, "changed", G_CALLBACK (cpufreq_prefs_dialog_show_mode_changed), - (gpointer) prefs); + prefs); } void diff --git a/cpufreq/src/cpufreq-utils.c b/cpufreq/src/cpufreq-utils.c index a49d27c6..736806e8 100644 --- a/cpufreq/src/cpufreq-utils.c +++ b/cpufreq/src/cpufreq-utils.c @@ -99,9 +99,9 @@ cpufreq_utils_display_error (const gchar *message, gtk_window_set_title (GTK_WINDOW (dialog), ""); /* as per HIG */ gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), TRUE); - g_signal_connect (G_OBJECT (dialog), - "response", - G_CALLBACK (gtk_widget_destroy), NULL); + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), + NULL); gtk_widget_show (dialog); } -- cgit v1.2.1