[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 18/20: Match member and function pointer styles.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

g   o   t   t   c   o   d   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository panel-plugins/xfce4-whiskermenu-plugin.

commit a17fa30a217bff73cae204dc7ec7680a513b7367
Author: Graeme Gott <graeme at gottcode.org>
Date:   Wed Feb 5 09:24:53 2020 -0500

    Match member and function pointer styles.
---
 panel-plugin/icon-renderer.cpp      | 10 +++++-----
 panel-plugin/launcher-icon-view.cpp |  2 +-
 panel-plugin/page.cpp               |  2 +-
 panel-plugin/section-button.cpp     |  6 +++---
 panel-plugin/window.cpp             |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/panel-plugin/icon-renderer.cpp b/panel-plugin/icon-renderer.cpp
index a08c5d0..fe3d2f4 100644
--- a/panel-plugin/icon-renderer.cpp
+++ b/panel-plugin/icon-renderer.cpp
@@ -239,13 +239,13 @@ static void whiskermenu_icon_renderer_finalize(GObject* object)
 static void whiskermenu_icon_renderer_class_init(WhiskerMenuIconRendererClass* klass)
 {
 	GObjectClass* gobject_class = G_OBJECT_CLASS(klass);
-	gobject_class->finalize = whiskermenu_icon_renderer_finalize;
-	gobject_class->get_property = whiskermenu_icon_renderer_get_property;
-	gobject_class->set_property = whiskermenu_icon_renderer_set_property;
+	gobject_class->finalize = &whiskermenu_icon_renderer_finalize;
+	gobject_class->get_property = &whiskermenu_icon_renderer_get_property;
+	gobject_class->set_property = &whiskermenu_icon_renderer_set_property;
 
 	GtkCellRendererClass* renderer_class = GTK_CELL_RENDERER_CLASS(klass);
-	renderer_class->get_size = whiskermenu_icon_renderer_get_size;
-	renderer_class->render = whiskermenu_icon_renderer_render;
+	renderer_class->get_size = &whiskermenu_icon_renderer_get_size;
+	renderer_class->render = &whiskermenu_icon_renderer_render;
 
 	g_object_class_install_property(gobject_class,
 			PROP_LAUNCHER,
diff --git a/panel-plugin/launcher-icon-view.cpp b/panel-plugin/launcher-icon-view.cpp
index e849800..22b4c08 100644
--- a/panel-plugin/launcher-icon-view.cpp
+++ b/panel-plugin/launcher-icon-view.cpp
@@ -96,7 +96,7 @@ GtkTreePath* LauncherIconView::get_selected_path() const
 	{
 		path = gtk_tree_path_copy(static_cast<GtkTreePath*>(selection->data));
 	}
-	g_list_free_full(selection, reinterpret_cast<GDestroyNotify>(gtk_tree_path_free));
+	g_list_free_full(selection, reinterpret_cast<GDestroyNotify>(&gtk_tree_path_free));
 	return path;
 }
 
diff --git a/panel-plugin/page.cpp b/panel-plugin/page.cpp
index ad8ea9e..4d98d9d 100644
--- a/panel-plugin/page.cpp
+++ b/panel-plugin/page.cpp
@@ -157,7 +157,7 @@ void Page::create_view()
 	{
 		m_view = new LauncherTreeView();
 		g_signal_connect(m_view->get_widget(), "row-activated", G_CALLBACK(&Page::row_activated_slot), this);
-		g_signal_connect_swapped(m_view->get_widget(), "start-interactive-search", G_CALLBACK(gtk_widget_grab_focus), m_window->get_search_entry());
+		g_signal_connect_swapped(m_view->get_widget(), "start-interactive-search", G_CALLBACK(&gtk_widget_grab_focus), m_window->get_search_entry());
 	}
 	g_signal_connect_slot(m_view->get_widget(), "button-press-event", &Page::view_button_press_event, this);
 	g_signal_connect_slot(m_view->get_widget(), "button-release-event", &Page::view_button_release_event, this);
diff --git a/panel-plugin/section-button.cpp b/panel-plugin/section-button.cpp
index d71fe67..28cc64f 100644
--- a/panel-plugin/section-button.cpp
+++ b/panel-plugin/section-button.cpp
@@ -40,7 +40,7 @@ static gboolean on_enter_notify_event(GtkWidget* widget, GdkEvent*, gpointer)
 	GtkToggleButton* button = GTK_TOGGLE_BUTTON(widget);
 	if (wm_settings->category_hover_activate && !gtk_toggle_button_get_active(button))
 	{
-		g_timeout_add(150, hover_timeout, button);
+		g_timeout_add(150, &hover_timeout, button);
 	}
 	return false;
 }
@@ -65,8 +65,8 @@ SectionButton::SectionButton(GIcon* icon, const gchar* text)
 	gtk_button_set_relief(GTK_BUTTON(m_button), GTK_RELIEF_NONE);
 	gtk_widget_set_tooltip_text(GTK_WIDGET(m_button), text);
 	gtk_widget_set_focus_on_click(GTK_WIDGET(m_button), false);
-	g_signal_connect(m_button, "enter-notify-event", G_CALLBACK(on_enter_notify_event), m_button);
-	g_signal_connect(m_button, "focus-in-event", G_CALLBACK(on_focus_in_event), m_button);
+	g_signal_connect(m_button, "enter-notify-event", G_CALLBACK(&on_enter_notify_event), m_button);
+	g_signal_connect(m_button, "focus-in-event", G_CALLBACK(&on_focus_in_event), m_button);
 
 	m_box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4));
 	gtk_container_add(GTK_CONTAINER(m_button), GTK_WIDGET(m_box));
diff --git a/panel-plugin/window.cpp b/panel-plugin/window.cpp
index 1933486..1fb3aba 100644
--- a/panel-plugin/window.cpp
+++ b/panel-plugin/window.cpp
@@ -102,7 +102,7 @@ WhiskerMenu::Window::Window(Plugin* plugin) :
 	g_signal_connect_slot(m_window, "map-event", &Window::on_map_event, this);
 	g_signal_connect_slot(m_window, "state-flags-changed", &Window::on_state_flags_changed_event, this);
 	g_signal_connect_slot(m_window, "configure-event", &Window::on_configure_event, this);
-	g_signal_connect(m_window, "delete_event", G_CALLBACK(gtk_widget_hide_on_delete), nullptr);
+	g_signal_connect(m_window, "delete_event", G_CALLBACK(&gtk_widget_hide_on_delete), nullptr);
 
 	// Create the border of the window
 	GtkWidget* frame = gtk_frame_new(nullptr);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.