From e9597d15a279ae1bda2e5916962e6d2297f6dcba Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Tue, 12 Feb 2019 14:02:47 +0100 Subject: Change prefix on drag and drop functions. --- src/inkscape-window.cpp | 2 +- src/ui/drag-and-drop.cpp | 14 +++++++------- src/ui/drag-and-drop.h | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/inkscape-window.cpp b/src/inkscape-window.cpp index 2681bfc1d..0da0dae15 100644 --- a/src/inkscape-window.cpp +++ b/src/inkscape-window.cpp @@ -52,7 +52,7 @@ InkscapeWindow::InkscapeWindow(SPDocument* document) set_resizable(true); - sp_ui_drag_setup(this); + ink_drag_setup(this); // =============== Build interface =============== diff --git a/src/ui/drag-and-drop.cpp b/src/ui/drag-and-drop.cpp index f972e764b..c2b348473 100644 --- a/src/ui/drag-and-drop.cpp +++ b/src/ui/drag-and-drop.cpp @@ -78,7 +78,7 @@ static guint nui_drop_target_entries = G_N_ELEMENTS(ui_drop_target_entries); /* Drag and Drop */ void -sp_ui_drag_data_received(GtkWidget *widget, +ink_drag_data_received(GtkWidget *widget, GdkDragContext *drag_context, gint x, gint y, GtkSelectionData *data, @@ -447,7 +447,7 @@ sp_ui_drag_data_received(GtkWidget *widget, #include "ui/tools/gradient-tool.h" -void sp_ui_drag_motion( GtkWidget */*widget*/, +void ink_drag_motion( GtkWidget */*widget*/, GdkDragContext */*drag_context*/, gint /*x*/, gint /*y*/, GtkSelectionData */*data*/, @@ -462,7 +462,7 @@ void sp_ui_drag_motion( GtkWidget */*widget*/, // g_message("drag-n-drop motion (%4d, %4d) at %d", x, y, event_time); } -static void sp_ui_drag_leave( GtkWidget */*widget*/, +static void ink_drag_leave( GtkWidget */*widget*/, GdkDragContext */*drag_context*/, guint /*event_time*/, gpointer /*user_data*/ ) @@ -471,7 +471,7 @@ static void sp_ui_drag_leave( GtkWidget */*widget*/, } void -sp_ui_drag_setup(Gtk::Widget* win) +ink_drag_setup(Gtk::Widget* win) { if ( completeDropTargets == nullptr || completeDropTargetsCount == 0 ) { @@ -507,17 +507,17 @@ sp_ui_drag_setup(Gtk::Widget* win) g_signal_connect(G_OBJECT(win->gobj()), "drag_data_received", - G_CALLBACK(sp_ui_drag_data_received), + G_CALLBACK(ink_drag_data_received), NULL); g_signal_connect(G_OBJECT(win->gobj()), "drag_motion", - G_CALLBACK(sp_ui_drag_motion), + G_CALLBACK(ink_drag_motion), NULL); g_signal_connect(G_OBJECT(win->gobj()), "drag_leave", - G_CALLBACK(sp_ui_drag_leave), + G_CALLBACK(ink_drag_leave), NULL); } diff --git a/src/ui/drag-and-drop.h b/src/ui/drag-and-drop.h index 50495b664..fb3a445ea 100644 --- a/src/ui/drag-and-drop.h +++ b/src/ui/drag-and-drop.h @@ -16,23 +16,23 @@ #include -void sp_ui_drag_setup(Gtk::Widget* win); +void ink_drag_setup(Gtk::Widget* win); -static void sp_ui_drag_data_received(GtkWidget *widget, +static void ink_drag_data_received(GtkWidget *widget, GdkDragContext *drag_context, gint x, gint y, GtkSelectionData *data, guint info, guint event_time, gpointer user_data); -static void sp_ui_drag_motion( GtkWidget *widget, +static void ink_drag_motion( GtkWidget *widget, GdkDragContext *drag_context, gint x, gint y, GtkSelectionData *data, guint info, guint event_time, gpointer user_data ); -static void sp_ui_drag_leave( GtkWidget *widget, +static void ink_drag_leave( GtkWidget *widget, GdkDragContext *drag_context, guint event_time, gpointer user_data ); -- cgit v1.2.3