From c5f392ca0e8b878206a012da11522125e1d86342 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 4 Oct 2001 23:52:20 +0000 Subject: add E_OBJECT_CLASS_ADD_SIGNALS and E_OBJECT_CLASS_TYPE to ease migration 2001-10-05 Michael Meeks * gal/util/e-util.h: add E_OBJECT_CLASS_ADD_SIGNALS and E_OBJECT_CLASS_TYPE to ease migration to Gnome 2.0 from a single source base. * All C files: s/object_class->type,/E_OBJECT_CLASS_TYPE (object_class),/g; s/gtk_object_class_add_signals([^\(]*)\(([^,]*),([^,]*),([^\)]*)/ E_OBJECT_CLASS_ADD_SIGNALS\1(\2,\3,\4/; svn path=/trunk/; revision=13428 --- widgets/text/e-completion-view.c | 14 +++++++------- widgets/text/e-completion.c | 19 ++++++++++--------- widgets/text/e-entry.c | 10 +++++----- widgets/text/e-text-model.c | 11 ++++++----- widgets/text/e-text.c | 11 ++++++----- 5 files changed, 34 insertions(+), 31 deletions(-) (limited to 'widgets/text') diff --git a/widgets/text/e-completion-view.c b/widgets/text/e-completion-view.c index 06f6428fd4..97a00fccd0 100644 --- a/widgets/text/e-completion-view.c +++ b/widgets/text/e-completion-view.c @@ -225,7 +225,7 @@ e_completion_view_class_init (ECompletionViewClass *klass) e_completion_view_signals[E_COMPLETION_VIEW_NONEMPTY] = gtk_signal_new ("nonempty", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ECompletionViewClass, nonempty), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -233,7 +233,7 @@ e_completion_view_class_init (ECompletionViewClass *klass) e_completion_view_signals[E_COMPLETION_VIEW_ADDED] = gtk_signal_new ("added", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ECompletionViewClass, added), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -241,7 +241,7 @@ e_completion_view_class_init (ECompletionViewClass *klass) e_completion_view_signals[E_COMPLETION_VIEW_FULL] = gtk_signal_new ("full", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ECompletionViewClass, full), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -249,7 +249,7 @@ e_completion_view_class_init (ECompletionViewClass *klass) e_completion_view_signals[E_COMPLETION_VIEW_BROWSE] = gtk_signal_new ("browse", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ECompletionViewClass, browse), gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, @@ -258,7 +258,7 @@ e_completion_view_class_init (ECompletionViewClass *klass) e_completion_view_signals[E_COMPLETION_VIEW_UNBROWSE] = gtk_signal_new ("unbrowse", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ECompletionViewClass, unbrowse), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -266,13 +266,13 @@ e_completion_view_class_init (ECompletionViewClass *klass) e_completion_view_signals[E_COMPLETION_VIEW_ACTIVATE] = gtk_signal_new ("activate", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ECompletionViewClass, activate), gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); - gtk_object_class_add_signals (object_class, e_completion_view_signals, E_COMPLETION_VIEW_LAST_SIGNAL); + E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_completion_view_signals, E_COMPLETION_VIEW_LAST_SIGNAL); object_class->destroy = e_completion_view_destroy; diff --git a/widgets/text/e-completion.c b/widgets/text/e-completion.c index 0d72e4690b..5c2dca0dbe 100644 --- a/widgets/text/e-completion.c +++ b/widgets/text/e-completion.c @@ -31,6 +31,7 @@ #include #include #include "e-completion.h" +#include "gal/util/e-util.h" enum { E_COMPLETION_REQUEST_COMPLETION, @@ -111,7 +112,7 @@ e_completion_class_init (ECompletionClass *klass) e_completion_signals[E_COMPLETION_REQUEST_COMPLETION] = gtk_signal_new ("request_completion", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ECompletionClass, request_completion), gtk_marshal_NONE__POINTER_INT_INT, GTK_TYPE_NONE, 3, @@ -120,7 +121,7 @@ e_completion_class_init (ECompletionClass *klass) e_completion_signals[E_COMPLETION_BEGIN_COMPLETION] = gtk_signal_new ("begin_completion", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ECompletionClass, begin_completion), gtk_marshal_NONE__POINTER_INT_INT, GTK_TYPE_NONE, 3, @@ -129,7 +130,7 @@ e_completion_class_init (ECompletionClass *klass) e_completion_signals[E_COMPLETION_COMPLETION] = gtk_signal_new ("completion", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ECompletionClass, completion), gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, @@ -138,7 +139,7 @@ e_completion_class_init (ECompletionClass *klass) e_completion_signals[E_COMPLETION_RESTART_COMPLETION] = gtk_signal_new ("restart_completion", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ECompletionClass, restart_completion), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -146,7 +147,7 @@ e_completion_class_init (ECompletionClass *klass) e_completion_signals[E_COMPLETION_CANCEL_COMPLETION] = gtk_signal_new ("cancel_completion", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ECompletionClass, cancel_completion), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -154,7 +155,7 @@ e_completion_class_init (ECompletionClass *klass) e_completion_signals[E_COMPLETION_END_COMPLETION] = gtk_signal_new ("end_completion", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ECompletionClass, end_completion), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -162,7 +163,7 @@ e_completion_class_init (ECompletionClass *klass) e_completion_signals[E_COMPLETION_CLEAR_COMPLETION] = gtk_signal_new ("clear_completion", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ECompletionClass, clear_completion), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -170,12 +171,12 @@ e_completion_class_init (ECompletionClass *klass) e_completion_signals[E_COMPLETION_LOST_COMPLETION] = gtk_signal_new ("lost_completion", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ECompletionClass, lost_completion), gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_POINTER); - gtk_object_class_add_signals (object_class, e_completion_signals, E_COMPLETION_LAST_SIGNAL); + E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_completion_signals, E_COMPLETION_LAST_SIGNAL); object_class->destroy = e_completion_destroy; } diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c index 4345994126..54a9e6e8af 100644 --- a/widgets/text/e-entry.c +++ b/widgets/text/e-entry.c @@ -1159,7 +1159,7 @@ e_entry_class_init (GtkObjectClass *object_class) e_entry_signals[E_ENTRY_CHANGED] = gtk_signal_new ("changed", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (EEntryClass, changed), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -1167,7 +1167,7 @@ e_entry_class_init (GtkObjectClass *object_class) e_entry_signals[E_ENTRY_ACTIVATE] = gtk_signal_new ("activate", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (EEntryClass, activate), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -1175,7 +1175,7 @@ e_entry_class_init (GtkObjectClass *object_class) e_entry_signals[E_ENTRY_POPUP] = gtk_signal_new ("popup", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (EEntryClass, popup), gtk_marshal_NONE__POINTER_INT, GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_INT); @@ -1183,13 +1183,13 @@ e_entry_class_init (GtkObjectClass *object_class) e_entry_signals[E_ENTRY_COMPLETION_POPUP] = gtk_signal_new ("completion_popup", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (EEntryClass, completion_popup), gtk_marshal_NONE__INT, GTK_TYPE_NONE, 1, GTK_TYPE_INT); - gtk_object_class_add_signals (object_class, e_entry_signals, E_ENTRY_LAST_SIGNAL); + E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_entry_signals, E_ENTRY_LAST_SIGNAL); gtk_object_add_arg_type ("EEntry::model", GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_MODEL); diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c index af67def74e..97eb2a9a86 100644 --- a/widgets/text/e-text-model.c +++ b/widgets/text/e-text-model.c @@ -24,6 +24,7 @@ #include #include "e-text-model-repos.h" #include "e-text-model.h" +#include "gal/util/e-util.h" #define CLASS(obj) (E_TEXT_MODEL_CLASS (GTK_OBJECT (obj)->klass)) @@ -105,7 +106,7 @@ e_text_model_class_init (ETextModelClass *klass) e_text_model_signals[E_TEXT_MODEL_CHANGED] = gtk_signal_new ("changed", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ETextModelClass, changed), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -113,7 +114,7 @@ e_text_model_class_init (ETextModelClass *klass) e_text_model_signals[E_TEXT_MODEL_REPOSITION] = gtk_signal_new ("reposition", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ETextModelClass, reposition), gtk_marshal_NONE__POINTER_POINTER, GTK_TYPE_NONE, 2, @@ -122,7 +123,7 @@ e_text_model_class_init (ETextModelClass *klass) e_text_model_signals[E_TEXT_MODEL_OBJECT_ACTIVATED] = gtk_signal_new ("object_activated", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ETextModelClass, object_activated), gtk_marshal_NONE__INT, GTK_TYPE_NONE, 1, @@ -131,12 +132,12 @@ e_text_model_class_init (ETextModelClass *klass) e_text_model_signals[E_TEXT_MODEL_CANCEL_COMPLETION] = gtk_signal_new ("cancel_completion", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ETextModelClass, cancel_completion), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); - gtk_object_class_add_signals (object_class, e_text_model_signals, E_TEXT_MODEL_LAST_SIGNAL); + E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_text_model_signals, E_TEXT_MODEL_LAST_SIGNAL); /* No default signal handlers. */ klass->changed = NULL; diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index c5b3a7d95e..60bbdcd08a 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -35,6 +35,7 @@ #include "gal/widgets/e-canvas-utils.h" #include "gal/widgets/e-unicode.h" #include "gal/util/e-text-event-processor-emacs-like.h" +#include "gal/util/e-util.h" #include #include #include @@ -223,7 +224,7 @@ e_text_class_init (ETextClass *klass) e_text_signals[E_TEXT_CHANGED] = gtk_signal_new ("changed", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ETextClass, changed), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -231,7 +232,7 @@ e_text_class_init (ETextClass *klass) e_text_signals[E_TEXT_ACTIVATE] = gtk_signal_new ("activate", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ETextClass, activate), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); @@ -239,7 +240,7 @@ e_text_class_init (ETextClass *klass) e_text_signals[E_TEXT_KEYPRESS] = gtk_signal_new ("keypress", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ETextClass, keypress), gtk_marshal_NONE__INT_INT, GTK_TYPE_NONE, 2, GTK_TYPE_UINT, GTK_TYPE_UINT); @@ -247,12 +248,12 @@ e_text_class_init (ETextClass *klass) e_text_signals[E_TEXT_POPUP] = gtk_signal_new ("popup", GTK_RUN_LAST, - object_class->type, + E_OBJECT_CLASS_TYPE (object_class), GTK_SIGNAL_OFFSET (ETextClass, popup), gtk_marshal_NONE__POINTER_INT, GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_INT); - gtk_object_class_add_signals (object_class, e_text_signals, E_TEXT_LAST_SIGNAL); + E_OBJECT_CLASS_ADD_SIGNALS (object_class, e_text_signals, E_TEXT_LAST_SIGNAL); gtk_object_add_arg_type ("EText::model", -- cgit v1.2.3