[beast/devel: 9/15] BSE: rename "class" variables to "klass" for C++ compatibility
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast/devel: 9/15] BSE: rename "class" variables to "klass" for C++ compatibility
- Date: Sun, 16 Dec 2012 15:53:04 +0000 (UTC)
commit 8c18249f12692c4da440b4fdb7017a439dc887be
Author: Tim Janik <timj gnu org>
Date: Sun Dec 16 15:41:48 2012 +0100
BSE: rename "class" variables to "klass" for C++ compatibility
bse/bseinstrument.c | 10 ++--
bse/bsemidinotifier.c | 10 ++--
bse/bsemidisynth.c | 14 ++--
bse/bsemidivoice.c | 20 +++---
bse/bseobject.c | 54 +++++++++---------
bse/bseparasite.c | 4 +-
bse/bsepart.c | 12 ++--
bse/bsepattern.c | 10 ++--
bse/bsepatterngroup.c | 10 ++--
bse/bseplugin.c | 6 +-
bse/bseproject.c | 20 +++---
bse/bsequery.c | 20 +++---
bse/bsescripthelper.c | 8 +-
bse/bsesnet.c | 12 ++--
bse/bsesnooper.c | 14 ++--
bse/bsesong.c | 18 +++---
bse/bsesource.c | 146 ++++++++++++++++++++++++------------------------
bse/bsestandardosc.c | 16 +++---
bse/bsestorage.c | 8 +-
bse/bsesubiport.c | 12 ++--
bse/bsesuboport.c | 12 ++--
bse/bsesubsynth.c | 14 ++--
bse/bsesuper.c | 16 +++---
bse/bsetrack.c | 16 +++---
bse/bsewave.c | 10 ++--
bse/bsewaveosc.c | 14 ++--
bse/bsewaverepo.c | 10 ++--
27 files changed, 258 insertions(+), 258 deletions(-)
---
diff --git a/bse/bseinstrument.c b/bse/bseinstrument.c
index a33890d..8ed8421 100644
--- a/bse/bseinstrument.c
+++ b/bse/bseinstrument.c
@@ -79,7 +79,7 @@ static BseDot env_dflt_dots[ENV_N_DOTS] = {
/* --- prototypes --- */
-static void bse_instrument_class_init (BseInstrumentClass *class);
+static void bse_instrument_class_init (BseInstrumentClass *klass);
static void bse_instrument_init (BseInstrument *instrument);
static void bse_instrument_do_destroy (BseObject *object);
static void bse_instrument_set_property (GObject *object,
@@ -123,12 +123,12 @@ BSE_BUILTIN_TYPE (BseInstrument)
}
static void
-bse_instrument_class_init (BseInstrumentClass *class)
+bse_instrument_class_init (BseInstrumentClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = bse_instrument_set_property;
gobject_class->get_property = bse_instrument_get_property;
diff --git a/bse/bsemidinotifier.c b/bse/bsemidinotifier.c
index 103b86c..f47c97f 100644
--- a/bse/bsemidinotifier.c
+++ b/bse/bsemidinotifier.c
@@ -21,7 +21,7 @@
/* --- prototypes --- */
-static void bse_midi_notifier_class_init (BseMidiNotifierClass *class);
+static void bse_midi_notifier_class_init (BseMidiNotifierClass *klass);
static void bse_midi_notifier_init (BseMidiNotifier *self);
static void bse_midi_notifier_finalize (GObject *object);
@@ -56,13 +56,13 @@ BSE_BUILTIN_TYPE (BseMidiNotifier)
}
static void
-bse_midi_notifier_class_init (BseMidiNotifierClass *class)
+bse_midi_notifier_class_init (BseMidiNotifierClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
guint i;
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = bse_midi_notifier_finalize;
diff --git a/bse/bsemidisynth.c b/bse/bsemidisynth.c
index 090d2b1..c6ac69e 100644
--- a/bse/bsemidisynth.c
+++ b/bse/bsemidisynth.c
@@ -46,7 +46,7 @@ enum
/* --- prototypes --- */
-static void bse_midi_synth_class_init (BseMidiSynthClass *class);
+static void bse_midi_synth_class_init (BseMidiSynthClass *klass);
static void bse_midi_synth_init (BseMidiSynth *msynth);
static void bse_midi_synth_finalize (GObject *object);
static void bse_midi_synth_set_property (GObject *object,
@@ -421,14 +421,14 @@ bse_midi_synth_context_dismiss (BseSource *source,
}
static void
-bse_midi_synth_class_init (BseMidiSynthClass *class)
+bse_midi_synth_class_init (BseMidiSynthClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
- BseItemClass *item_class = BSE_ITEM_CLASS (class);
- BseSourceClass *source_class = BSE_SOURCE_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
+ BseItemClass *item_class = BSE_ITEM_CLASS (klass);
+ BseSourceClass *source_class = BSE_SOURCE_CLASS (klass);
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = bse_midi_synth_set_property;
gobject_class->get_property = bse_midi_synth_get_property;
diff --git a/bse/bsemidivoice.c b/bse/bsemidivoice.c
index 0b81187..1b35767 100644
--- a/bse/bsemidivoice.c
+++ b/bse/bsemidivoice.c
@@ -25,7 +25,7 @@
/* --- prototypes --- */
static void bse_midi_voice_input_init (BseMidiVoiceInput *self);
-static void bse_midi_voice_input_class_init (BseMidiVoiceInputClass *class);
+static void bse_midi_voice_input_class_init (BseMidiVoiceInputClass *klass);
static void bse_midi_voice_input_dispose (GObject *object);
static void bse_midi_voice_input_context_create (BseSource *source,
guint context_handle,
@@ -34,7 +34,7 @@ static void bse_midi_voice_input_context_dismiss (BseSource *sou
guint context_handle,
BseTrans *trans);
static void bse_midi_voice_switch_init (BseMidiVoiceSwitch *self);
-static void bse_midi_voice_switch_class_init (BseMidiVoiceSwitchClass *class);
+static void bse_midi_voice_switch_class_init (BseMidiVoiceSwitchClass *klass);
static void bse_midi_voice_switch_dispose (GObject *object);
static void bse_midi_voice_switch_context_create (BseSource *source,
guint context_handle,
@@ -93,13 +93,13 @@ BSE_BUILTIN_TYPE (BseMidiVoiceSwitch)
}
static void
-bse_midi_voice_input_class_init (BseMidiVoiceInputClass *class)
+bse_midi_voice_input_class_init (BseMidiVoiceInputClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseSourceClass *source_class = BSE_SOURCE_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseSourceClass *source_class = BSE_SOURCE_CLASS (klass);
guint channel_id;
- voice_input_parent_class = g_type_class_peek_parent (class);
+ voice_input_parent_class = g_type_class_peek_parent (klass);
gobject_class->dispose = bse_midi_voice_input_dispose;
@@ -117,13 +117,13 @@ bse_midi_voice_input_class_init (BseMidiVoiceInputClass *class)
}
static void
-bse_midi_voice_switch_class_init (BseMidiVoiceSwitchClass *class)
+bse_midi_voice_switch_class_init (BseMidiVoiceSwitchClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseSourceClass *source_class = BSE_SOURCE_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseSourceClass *source_class = BSE_SOURCE_CLASS (klass);
guint channel_id;
- voice_switch_parent_class = g_type_class_peek_parent (class);
+ voice_switch_parent_class = g_type_class_peek_parent (klass);
gobject_class->dispose = bse_midi_voice_switch_dispose;
diff --git a/bse/bseobject.c b/bse/bseobject.c
index fbd9360..0b9f4c0 100644
--- a/bse/bseobject.c
+++ b/bse/bseobject.c
@@ -285,29 +285,29 @@ bse_object_do_get_property (GObject *gobject,
}
void
-bse_object_class_add_grouped_property (BseObjectClass *class,
+bse_object_class_add_grouped_property (BseObjectClass *klass,
guint property_id,
GParamSpec *pspec)
{
- g_return_if_fail (BSE_IS_OBJECT_CLASS (class));
+ g_return_if_fail (BSE_IS_OBJECT_CLASS (klass));
g_return_if_fail (G_IS_PARAM_SPEC (pspec));
g_return_if_fail (property_id > 0);
- g_object_class_install_property (G_OBJECT_CLASS (class), property_id, pspec);
+ g_object_class_install_property (G_OBJECT_CLASS (klass), property_id, pspec);
}
void
-bse_object_class_add_property (BseObjectClass *class,
+bse_object_class_add_property (BseObjectClass *klass,
const gchar *property_group,
guint property_id,
GParamSpec *pspec)
{
- g_return_if_fail (BSE_IS_OBJECT_CLASS (class));
+ g_return_if_fail (BSE_IS_OBJECT_CLASS (klass));
g_return_if_fail (G_IS_PARAM_SPEC (pspec));
g_return_if_fail (sfi_pspec_get_group (pspec) == NULL);
sfi_pspec_set_group (pspec, property_group);
- bse_object_class_add_grouped_property (class, property_id, pspec);
+ bse_object_class_add_grouped_property (klass, property_id, pspec);
}
void
@@ -530,9 +530,9 @@ object_check_pspec_editable (BseObject *object,
{
if (sfi_pspec_check_option (pspec, "ro")) /* RDONLY option (GUI) */
return FALSE;
- BseObjectClass *class = g_type_class_peek (pspec->owner_type);
- if (class && class->editable_property)
- return class->editable_property (object, pspec->param_id, pspec) != FALSE;
+ BseObjectClass *klass = g_type_class_peek (pspec->owner_type);
+ if (klass && klass->editable_property)
+ return klass->editable_property (object, pspec->param_id, pspec) != FALSE;
else
return TRUE;
}
@@ -802,22 +802,22 @@ bse_object_remove_reemit (gpointer src_object,
}
static void
-bse_object_class_base_init (BseObjectClass *class)
+bse_object_class_base_init (BseObjectClass *klass)
{
- class->editable_property = NULL;
+ klass->editable_property = NULL;
}
static void
-bse_object_class_base_finalize (BseObjectClass *class)
+bse_object_class_base_finalize (BseObjectClass *klass)
{
}
static void
-bse_object_class_init (BseObjectClass *class)
+bse_object_class_init (BseObjectClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
bse_quark_uname = g_quark_from_static_string ("bse-object-uname");
bse_quark_icon = g_quark_from_static_string ("bse-object-icon");
@@ -832,16 +832,16 @@ bse_object_class_init (BseObjectClass *class)
gobject_class->dispose = bse_object_do_dispose;
gobject_class->finalize = bse_object_do_finalize;
- class->check_pspec_editable = object_check_pspec_editable;
- class->set_uname = bse_object_do_set_uname;
- class->store_private = bse_object_store_private;
- class->restore_start = object_restore_start;
- class->restore_private = object_restore_private;
- class->restore_finish = object_restore_finish;
- class->unlocked = NULL;
- class->get_icon = bse_object_do_get_icon;
+ klass->check_pspec_editable = object_check_pspec_editable;
+ klass->set_uname = bse_object_do_set_uname;
+ klass->store_private = bse_object_store_private;
+ klass->restore_start = object_restore_start;
+ klass->restore_private = object_restore_private;
+ klass->restore_finish = object_restore_finish;
+ klass->unlocked = NULL;
+ klass->get_icon = bse_object_do_get_icon;
- bse_object_class_add_param (class, NULL,
+ bse_object_class_add_param (klass, NULL,
PROP_UNAME,
sfi_pspec_string ("uname", _("Name"), _("Unique name of this object"),
NULL,
@@ -851,15 +851,15 @@ bse_object_class_init (BseObjectClass *class)
* objects, specifically BseItem
* and BseContainer.
*/));
- bse_object_class_add_param (class, NULL,
+ bse_object_class_add_param (klass, NULL,
PROP_BLURB,
sfi_pspec_string ("blurb", _("Comment"), _("Free form comment or description"),
"",
SFI_PARAM_STANDARD ":skip-default"));
- object_signals[SIGNAL_RELEASE] = bse_object_class_add_signal (class, "release",
+ object_signals[SIGNAL_RELEASE] = bse_object_class_add_signal (klass, "release",
G_TYPE_NONE, 0);
- object_signals[SIGNAL_ICON_CHANGED] = bse_object_class_add_signal (class, "icon_changed",
+ object_signals[SIGNAL_ICON_CHANGED] = bse_object_class_add_signal (klass, "icon_changed",
G_TYPE_NONE, 0);
}
diff --git a/bse/bseparasite.c b/bse/bseparasite.c
index b75c706..b69f39e 100644
--- a/bse/bseparasite.c
+++ b/bse/bseparasite.c
@@ -71,9 +71,9 @@ static const GBSearchConfig bconfig_crefs = {
/* --- functions --- */
void
-bse_item_class_add_parasite_signals (BseItemClass *class)
+bse_item_class_add_parasite_signals (BseItemClass *klass)
{
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
signal_parasites_added = bse_object_class_add_dsignal (object_class, "parasites-added",
G_TYPE_NONE, 1, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE);
signal_parasite_changed = bse_object_class_add_dsignal (object_class, "parasite-changed",
diff --git a/bse/bsepart.c b/bse/bsepart.c
index 7c51769..834584f 100644
--- a/bse/bsepart.c
+++ b/bse/bsepart.c
@@ -42,7 +42,7 @@ enum
/* --- prototypes --- */
-static void bse_part_class_init (BsePartClass *class);
+static void bse_part_class_init (BsePartClass *klass);
static void bse_part_init (BsePart *self);
static void bse_part_set_property (GObject *object,
guint param_id,
@@ -100,13 +100,13 @@ BSE_BUILTIN_TYPE (BsePart)
}
static void
-bse_part_class_init (BsePartClass *class)
+bse_part_class_init (BsePartClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
- // BseItemClass *item_class = BSE_ITEM_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
+ // BseItemClass *item_class = BSE_ITEM_CLASS (klass);
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = bse_part_set_property;
gobject_class->get_property = bse_part_get_property;
diff --git a/bse/bsepattern.c b/bse/bsepattern.c
index 65e8c0a..9d36780 100644
--- a/bse/bsepattern.c
+++ b/bse/bsepattern.c
@@ -43,7 +43,7 @@ enum {
/* --- prototypes --- */
-static void bse_pattern_class_init (BsePatternClass *class);
+static void bse_pattern_class_init (BsePatternClass *klass);
static void bse_pattern_init (BsePattern *pattern);
static void bse_pattern_do_destroy (BseObject *object);
static void bse_pattern_do_set_parent (BseItem *item,
@@ -89,14 +89,14 @@ BSE_BUILTIN_TYPE (BsePattern)
}
static void
-bse_pattern_class_init (BsePatternClass *class)
+bse_pattern_class_init (BsePatternClass *klass)
{
BseObjectClass *object_class;
BseItemClass *item_class;
- parent_class = g_type_class_peek_parent (class);
- object_class = BSE_OBJECT_CLASS (class);
- item_class = BSE_ITEM_CLASS (class);
+ parent_class = g_type_class_peek_parent (klass);
+ object_class = BSE_OBJECT_CLASS (klass);
+ item_class = BSE_ITEM_CLASS (klass);
object_class->restore = bse_pattern_restore;
object_class->store_private = bse_pattern_store_private;
diff --git a/bse/bsepatterngroup.c b/bse/bsepatterngroup.c
index 87829ac..6183ff2 100644
--- a/bse/bsepatterngroup.c
+++ b/bse/bsepatterngroup.c
@@ -36,7 +36,7 @@ enum {
/* --- prototypes --- */
-static void bse_pattern_group_class_init (BsePatternGroupClass *class);
+static void bse_pattern_group_class_init (BsePatternGroupClass *klass);
static void bse_pattern_group_init (BsePatternGroup *pattern_group);
static void bse_pattern_group_destroy (BseObject *object);
static void bse_pattern_group_set_property (BsePatternGroup *pattern_group,
@@ -86,12 +86,12 @@ BSE_BUILTIN_TYPE (BsePatternGroup)
}
static void
-bse_pattern_group_class_init (BsePatternGroupClass *class)
+bse_pattern_group_class_init (BsePatternGroupClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = bse_pattern_group_set_property;
gobject_class->get_property = bse_pattern_group_get_property;
diff --git a/bse/bseplugin.c b/bse/bseplugin.c
index 2a0ec57..bd7779c 100644
--- a/bse/bseplugin.c
+++ b/bse/bseplugin.c
@@ -34,7 +34,7 @@ static SFI_MSG_TYPE_DEFINE (debug_plugins, "plugins", SFI_MSG_DEBUG, NULL);
/* --- prototypes --- */
static void bse_plugin_init (BsePlugin *plugin);
-static void bse_plugin_class_init (BsePluginClass *class);
+static void bse_plugin_class_init (BsePluginClass *klass);
static void bse_plugin_complete_info (GTypePlugin *gplugin,
GType type,
GTypeInfo *type_info,
@@ -116,9 +116,9 @@ bse_plugin_finalize (GObject *object)
}
static void
-bse_plugin_class_init (BsePluginClass *class)
+bse_plugin_class_init (BsePluginClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
gobject_class->dispose = bse_plugin_dispose;
gobject_class->finalize = bse_plugin_finalize;
diff --git a/bse/bseproject.c b/bse/bseproject.c
index 340e0e2..27f3521 100644
--- a/bse/bseproject.c
+++ b/bse/bseproject.c
@@ -56,8 +56,8 @@ enum {
/* --- prototypes --- */
-static void bse_project_class_init (BseProjectClass *class);
-static void bse_project_class_finalize (BseProjectClass *class);
+static void bse_project_class_init (BseProjectClass *klass);
+static void bse_project_class_finalize (BseProjectClass *klass);
static void bse_project_init (BseProject *project,
gpointer rclass);
static void bse_project_set_property (GObject *object,
@@ -118,15 +118,15 @@ BSE_BUILTIN_TYPE (BseProject)
}
static void
-bse_project_class_init (BseProjectClass *class)
+bse_project_class_init (BseProjectClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
- BseItemClass *item_class = BSE_ITEM_CLASS (class);
- BseSourceClass *source_class = BSE_SOURCE_CLASS (class);
- BseContainerClass *container_class = BSE_CONTAINER_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
+ BseItemClass *item_class = BSE_ITEM_CLASS (klass);
+ BseSourceClass *source_class = BSE_SOURCE_CLASS (klass);
+ BseContainerClass *container_class = BSE_CONTAINER_CLASS (klass);
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
quark_storage_trap = g_quark_from_static_string ("bse-project-storage-trap");
gobject_class->set_property = bse_project_set_property;
@@ -156,7 +156,7 @@ bse_project_class_init (BseProjectClass *class)
}
static void
-bse_project_class_finalize (BseProjectClass *class)
+bse_project_class_finalize (BseProjectClass *klass)
{
}
diff --git a/bse/bsequery.c b/bse/bsequery.c
index d7fb172..702050a 100644
--- a/bse/bsequery.c
+++ b/bse/bsequery.c
@@ -89,15 +89,15 @@ show_nodes (GType type,
if (feature_channels && g_type_is_a (type, BSE_TYPE_SOURCE))
{
- BseSourceClass *class = g_type_class_ref (type);
+ BseSourceClass *klass = g_type_class_ref (type);
gchar buffer[1024];
sprintf (buffer,
"\t(ichannels %u) (ochannels %u)",
- class->channel_defs.n_ichannels,
- class->channel_defs.n_ochannels);
+ klass->channel_defs.n_ichannels,
+ klass->channel_defs.n_ochannels);
fputs (buffer, f_out);
- g_type_class_unref (class);
+ g_type_class_unref (klass);
}
fputc ('\n', f_out);
@@ -146,23 +146,23 @@ show_procdoc (void)
for (i = 0; i < cseq->n_cats; i++)
{
GType type = g_type_from_name (cseq->cats[i]->type);
- BseProcedureClass *class = g_type_class_ref (type);
+ BseProcedureClass *klass = g_type_class_ref (type);
gchar *pname = g_type_name_to_sname (cseq->cats[i]->type);
const gchar *blurb = bse_type_get_blurb (type);
guint j;
fprintf (f_out, "/**\n * %s\n", pname);
- for (j = 0; j < class->n_in_pspecs; j++)
+ for (j = 0; j < klass->n_in_pspecs; j++)
{
- GParamSpec *pspec = G_PARAM_SPEC (class->in_pspecs[j]);
+ GParamSpec *pspec = G_PARAM_SPEC (klass->in_pspecs[j]);
fprintf (f_out, " * @%s: %s\n",
pspec->name,
g_param_spec_get_blurb (pspec) ? g_param_spec_get_blurb (pspec) : nullstr);
}
- for (j = 0; j < class->n_out_pspecs; j++)
+ for (j = 0; j < klass->n_out_pspecs; j++)
{
- GParamSpec *pspec = G_PARAM_SPEC (class->out_pspecs[j]);
+ GParamSpec *pspec = G_PARAM_SPEC (klass->out_pspecs[j]);
fprintf (f_out, " * @Returns: %s: %s\n",
pspec->name,
@@ -171,7 +171,7 @@ show_procdoc (void)
if (blurb)
fprintf (f_out, " * %s\n", blurb);
fprintf (f_out, " **/\n");
- g_type_class_unref (class);
+ g_type_class_unref (klass);
g_free (pname);
}
bse_category_seq_free (cseq);
diff --git a/bse/bsescripthelper.c b/bse/bsescripthelper.c
index 718dc90..480548f 100644
--- a/bse/bsescripthelper.c
+++ b/bse/bsescripthelper.c
@@ -27,7 +27,7 @@
/* --- prototypes --- */
-static void bse_script_procedure_init (BseScriptProcedureClass *class,
+static void bse_script_procedure_init (BseScriptProcedureClass *klass,
BseScriptData *sdata);
static BseErrorType bse_script_procedure_exec (BseProcedureClass *proc,
const GValue *in_values,
@@ -45,14 +45,14 @@ static GQuark quark_script_args = 0;
/* --- functions --- */
static void
-bse_script_procedure_init (BseScriptProcedureClass *class,
+bse_script_procedure_init (BseScriptProcedureClass *klass,
BseScriptData *sdata)
{
- BseProcedureClass *proc = (BseProcedureClass*) class;
+ BseProcedureClass *proc = (BseProcedureClass*) klass;
SfiRing *ring;
guint n;
- class->sdata = sdata;
+ klass->sdata = sdata;
proc->execute = bse_script_procedure_exec;
/* we support a limited parameter set for scripts */
diff --git a/bse/bsesnet.c b/bse/bsesnet.c
index 8cbcba0..6306928 100644
--- a/bse/bsesnet.c
+++ b/bse/bsesnet.c
@@ -916,14 +916,14 @@ bse_snet_context_dismiss (BseSource *source,
}
static void
-bse_snet_class_init (BseSNetClass *class)
+bse_snet_class_init (BseSNetClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
- BseSourceClass *source_class = BSE_SOURCE_CLASS (class);
- BseContainerClass *container_class = BSE_CONTAINER_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
+ BseSourceClass *source_class = BSE_SOURCE_CLASS (klass);
+ BseContainerClass *container_class = BSE_CONTAINER_CLASS (klass);
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = bse_snet_set_property;
gobject_class->get_property = bse_snet_get_property;
diff --git a/bse/bsesnooper.c b/bse/bsesnooper.c
index 8a0c760..e74fdc2 100644
--- a/bse/bsesnooper.c
+++ b/bse/bsesnooper.c
@@ -29,7 +29,7 @@ enum {
/* --- prototypes --- */
static void bse_snooper_init (BseSnooper *snooper);
-static void bse_snooper_class_init (BseSnooperClass *class);
+static void bse_snooper_class_init (BseSnooperClass *klass);
static void bse_snooper_set_property (GObject *object,
guint param_id,
const GValue *value,
@@ -79,15 +79,15 @@ BSE_BUILTIN_TYPE (BseSnooper)
}
static void
-bse_snooper_class_init (BseSnooperClass *class)
+bse_snooper_class_init (BseSnooperClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
- BseItemClass *item_class = BSE_ITEM_CLASS (class);
- BseSourceClass *source_class = BSE_SOURCE_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
+ BseItemClass *item_class = BSE_ITEM_CLASS (klass);
+ BseSourceClass *source_class = BSE_SOURCE_CLASS (klass);
guint ichannel;
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = bse_snooper_set_property;
gobject_class->get_property = bse_snooper_get_property;
diff --git a/bse/bsesong.c b/bse/bsesong.c
index 6cb48a0..c4cfebc 100644
--- a/bse/bsesong.c
+++ b/bse/bsesong.c
@@ -50,7 +50,7 @@ enum
/* --- prototypes --- */
static void bse_song_update_tpsi_SL (BseSong *song);
-static void bse_song_class_init (BseSongClass *class);
+static void bse_song_class_init (BseSongClass *klass);
static void bse_song_init (BseSong *song);
@@ -711,17 +711,17 @@ bse_song_compat_finish (BseSuper *super,
}
static void
-bse_song_class_init (BseSongClass *class)
+bse_song_class_init (BseSongClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
- BseItemClass *item_class = BSE_ITEM_CLASS (class);
- BseSourceClass *source_class = BSE_SOURCE_CLASS (class);
- BseContainerClass *container_class = BSE_CONTAINER_CLASS (class);
- BseSuperClass *super_class = BSE_SUPER_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
+ BseItemClass *item_class = BSE_ITEM_CLASS (klass);
+ BseSourceClass *source_class = BSE_SOURCE_CLASS (klass);
+ BseContainerClass *container_class = BSE_CONTAINER_CLASS (klass);
+ BseSuperClass *super_class = BSE_SUPER_CLASS (klass);
BseSongTiming timing;
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = bse_song_set_property;
gobject_class->get_property = bse_song_get_property;
diff --git a/bse/bsesource.c b/bse/bsesource.c
index 91f7725..9b66432 100644
--- a/bse/bsesource.c
+++ b/bse/bsesource.c
@@ -71,9 +71,9 @@ static const GBSearchConfig context_config = {
/* --- functions --- */
static void
bse_source_init (BseSource *source,
- BseSourceClass *class)
+ BseSourceClass *klass)
{
- source->channel_defs = &BSE_SOURCE_CLASS (class)->channel_defs;
+ source->channel_defs = &BSE_SOURCE_CLASS (klass)->channel_defs;
source->inputs = g_new0 (BseSourceInput, BSE_SOURCE_N_ICHANNELS (source));
source->outputs = NULL;
source->contexts = NULL;
@@ -175,15 +175,15 @@ bse_source_finalize (GObject *object)
}
static gboolean
-bse_source_class_has_channel (BseSourceClass *class,
+bse_source_class_has_channel (BseSourceClass *klass,
const gchar *channel_ident)
{
guint i;
- for (i = 0; i < class->channel_defs.n_ichannels; i++)
- if (strcmp (channel_ident, class->channel_defs.ichannel_idents[i]) == 0)
+ for (i = 0; i < klass->channel_defs.n_ichannels; i++)
+ if (strcmp (channel_ident, klass->channel_defs.ichannel_idents[i]) == 0)
return TRUE;
- for (i = 0; i < class->channel_defs.n_ochannels; i++)
- if (strcmp (channel_ident, class->channel_defs.ochannel_idents[i]) == 0)
+ for (i = 0; i < klass->channel_defs.n_ochannels; i++)
+ if (strcmp (channel_ident, klass->channel_defs.ochannel_idents[i]) == 0)
return TRUE;
return FALSE;
}
@@ -345,12 +345,12 @@ bse_source_find_ochannel (BseSource *source,
}
static void
-source_class_collect_properties (BseSourceClass *class)
+source_class_collect_properties (BseSourceClass *klass)
{
- if (!class->filtered_properties)
+ if (!klass->filtered_properties)
{
guint n, i;
- GParamSpec **pspecs = g_object_class_list_properties (G_OBJECT_CLASS (class), &n);
+ GParamSpec **pspecs = g_object_class_list_properties (G_OBJECT_CLASS (klass), &n);
for (i = 0; i < n; i++)
{
GParamSpec *pspec = pspecs[i];
@@ -358,7 +358,7 @@ source_class_collect_properties (BseSourceClass *class)
gboolean preparation = automate || (sfi_pspec_check_option (pspec, "prepared") ||
sfi_pspec_check_option (pspec, "unprepared"));
if (preparation)
- class->unprepared_properties = sfi_ring_append (class->unprepared_properties, pspec);
+ klass->unprepared_properties = sfi_ring_append (klass->unprepared_properties, pspec);
if (automate && (pspec->flags & G_PARAM_WRITABLE) &&
g_type_is_a (pspec->owner_type, BSE_TYPE_SOURCE) &&
(g_type_is_a (G_PARAM_SPEC_VALUE_TYPE (pspec), SFI_TYPE_REAL) ||
@@ -371,22 +371,22 @@ source_class_collect_properties (BseSourceClass *class)
g_warning ("%s: ignoring automation property \"%s\" without property_updated() implementation",
g_type_name (pspec->owner_type), pspec->name);
else
- class->automation_properties = sfi_ring_append (class->automation_properties, pspec);
+ klass->automation_properties = sfi_ring_append (klass->automation_properties, pspec);
g_type_class_unref (source_class);
}
}
g_free (pspecs);
- class->filtered_properties = TRUE;
+ klass->filtered_properties = TRUE;
}
}
static void
source_notify_properties (BseSource *self)
{
- BseSourceClass *class = BSE_SOURCE_GET_CLASS (self);
+ BseSourceClass *klass = BSE_SOURCE_GET_CLASS (self);
source_class_collect_properties (BSE_SOURCE_GET_CLASS (self));
SfiRing *ring;
- for (ring = class->unprepared_properties; ring; ring = sfi_ring_walk (ring, class->unprepared_properties))
+ for (ring = klass->unprepared_properties; ring; ring = sfi_ring_walk (ring, klass->unprepared_properties))
g_object_notify (self, G_PARAM_SPEC (ring->data)->name);
}
@@ -1906,25 +1906,25 @@ bse_source_restore_private (BseObject *object,
}
static void
-bse_source_class_base_init (BseSourceClass *class)
+bse_source_class_base_init (BseSourceClass *klass)
{
/* reset ichannel, jchannel and ochannel defs */
- class->channel_defs.n_ichannels = 0;
- class->channel_defs.ichannel_idents = NULL;
- class->channel_defs.ichannel_labels = NULL;
- class->channel_defs.ichannel_blurbs = NULL;
- class->channel_defs.ijstreams = NULL;
- class->channel_defs.n_jstreams = 0;
- class->channel_defs.n_ochannels = 0;
- class->channel_defs.ochannel_idents = NULL;
- class->channel_defs.ochannel_labels = NULL;
- class->channel_defs.ochannel_blurbs = NULL;
+ klass->channel_defs.n_ichannels = 0;
+ klass->channel_defs.ichannel_idents = NULL;
+ klass->channel_defs.ichannel_labels = NULL;
+ klass->channel_defs.ichannel_blurbs = NULL;
+ klass->channel_defs.ijstreams = NULL;
+ klass->channel_defs.n_jstreams = 0;
+ klass->channel_defs.n_ochannels = 0;
+ klass->channel_defs.ochannel_idents = NULL;
+ klass->channel_defs.ochannel_labels = NULL;
+ klass->channel_defs.ochannel_blurbs = NULL;
/* reset other class members */
- class->property_updated = NULL;
- class->engine_class = NULL;
- class->filtered_properties = FALSE;
- class->unprepared_properties = NULL;
- class->automation_properties = NULL;
+ klass->property_updated = NULL;
+ klass->engine_class = NULL;
+ klass->filtered_properties = FALSE;
+ klass->unprepared_properties = NULL;
+ klass->automation_properties = NULL;
}
BseMusicalTuningType
@@ -1977,52 +1977,52 @@ bse_source_class_inherit_channels (BseSourceClass *source_class)
}
static void
-bse_source_class_base_finalize (BseSourceClass *class)
+bse_source_class_base_finalize (BseSourceClass *klass)
{
guint i;
- for (i = 0; i < class->channel_defs.n_ichannels; i++)
+ for (i = 0; i < klass->channel_defs.n_ichannels; i++)
{
- g_free (class->channel_defs.ichannel_idents[i]);
- g_free (class->channel_defs.ichannel_labels[i]);
- g_free (class->channel_defs.ichannel_blurbs[i]);
+ g_free (klass->channel_defs.ichannel_idents[i]);
+ g_free (klass->channel_defs.ichannel_labels[i]);
+ g_free (klass->channel_defs.ichannel_blurbs[i]);
}
- g_free (class->channel_defs.ichannel_idents);
- g_free (class->channel_defs.ichannel_labels);
- g_free (class->channel_defs.ichannel_blurbs);
- g_free (class->channel_defs.ijstreams);
- class->channel_defs.n_jstreams = 0;
- class->channel_defs.n_ichannels = 0;
- class->channel_defs.ichannel_idents = NULL;
- class->channel_defs.ichannel_labels = NULL;
- class->channel_defs.ichannel_blurbs = NULL;
- class->channel_defs.ijstreams = NULL;
- for (i = 0; i < class->channel_defs.n_ochannels; i++)
+ g_free (klass->channel_defs.ichannel_idents);
+ g_free (klass->channel_defs.ichannel_labels);
+ g_free (klass->channel_defs.ichannel_blurbs);
+ g_free (klass->channel_defs.ijstreams);
+ klass->channel_defs.n_jstreams = 0;
+ klass->channel_defs.n_ichannels = 0;
+ klass->channel_defs.ichannel_idents = NULL;
+ klass->channel_defs.ichannel_labels = NULL;
+ klass->channel_defs.ichannel_blurbs = NULL;
+ klass->channel_defs.ijstreams = NULL;
+ for (i = 0; i < klass->channel_defs.n_ochannels; i++)
{
- g_free (class->channel_defs.ochannel_idents[i]);
- g_free (class->channel_defs.ochannel_labels[i]);
- g_free (class->channel_defs.ochannel_blurbs[i]);
+ g_free (klass->channel_defs.ochannel_idents[i]);
+ g_free (klass->channel_defs.ochannel_labels[i]);
+ g_free (klass->channel_defs.ochannel_blurbs[i]);
}
- g_free (class->channel_defs.ochannel_idents);
- g_free (class->channel_defs.ochannel_labels);
- g_free (class->channel_defs.ochannel_blurbs);
- class->channel_defs.n_ochannels = 0;
- class->channel_defs.ochannel_idents = NULL;
- class->channel_defs.ochannel_labels = NULL;
- class->channel_defs.ochannel_blurbs = NULL;
- g_free (class->engine_class);
- class->engine_class = NULL;
- sfi_ring_free (class->unprepared_properties);
- sfi_ring_free (class->automation_properties);
+ g_free (klass->channel_defs.ochannel_idents);
+ g_free (klass->channel_defs.ochannel_labels);
+ g_free (klass->channel_defs.ochannel_blurbs);
+ klass->channel_defs.n_ochannels = 0;
+ klass->channel_defs.ochannel_idents = NULL;
+ klass->channel_defs.ochannel_labels = NULL;
+ klass->channel_defs.ochannel_blurbs = NULL;
+ g_free (klass->engine_class);
+ klass->engine_class = NULL;
+ sfi_ring_free (klass->unprepared_properties);
+ sfi_ring_free (klass->automation_properties);
}
static void
-bse_source_class_init (BseSourceClass *class)
+bse_source_class_init (BseSourceClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = bse_source_set_property;
gobject_class->get_property = bse_source_get_property;
@@ -2033,13 +2033,13 @@ bse_source_class_init (BseSourceClass *class)
object_class->store_private = bse_source_real_store_private;
object_class->restore_private = bse_source_restore_private;
- class->prepare = bse_source_real_prepare;
- class->context_create = bse_source_real_context_create;
- class->context_connect = bse_source_real_context_connect;
- class->context_dismiss = bse_source_real_context_dismiss;
- class->reset = bse_source_real_reset;
- class->add_input = bse_source_real_add_input;
- class->remove_input = bse_source_real_remove_input;
+ klass->prepare = bse_source_real_prepare;
+ klass->context_create = bse_source_real_context_create;
+ klass->context_connect = bse_source_real_context_connect;
+ klass->context_dismiss = bse_source_real_context_dismiss;
+ klass->reset = bse_source_real_reset;
+ klass->add_input = bse_source_real_add_input;
+ klass->remove_input = bse_source_real_remove_input;
bse_object_class_add_param (object_class, "Position",
PROP_POS_X,
@@ -2053,7 +2053,7 @@ bse_source_class_init (BseSourceClass *class)
SFI_PARAM_STORAGE ":skip-default:f:"));
signal_io_changed = bse_object_class_add_signal (object_class, "io-changed", G_TYPE_NONE, 0);
- bse_source_class_add_probe_signals (class);
+ bse_source_class_add_probe_signals (klass);
}
BSE_BUILTIN_TYPE (BseSource)
diff --git a/bse/bsestandardosc.c b/bse/bsestandardosc.c
index cd82fe8..14f956b 100644
--- a/bse/bsestandardosc.c
+++ b/bse/bsestandardosc.c
@@ -46,8 +46,8 @@ enum
/* --- prototypes --- */
static void bse_standard_osc_init (BseStandardOsc *standard_osc);
-static void bse_standard_osc_class_init (BseStandardOscClass *class);
-static void bse_standard_osc_class_finalize (BseStandardOscClass *class);
+static void bse_standard_osc_class_init (BseStandardOscClass *klass);
+static void bse_standard_osc_class_finalize (BseStandardOscClass *klass);
static void bse_standard_osc_set_property (GObject *object,
guint param_id,
const GValue *value,
@@ -112,14 +112,14 @@ BSE_BUILTIN_TYPE (BseStandardOsc)
}
static void
-bse_standard_osc_class_init (BseStandardOscClass *class)
+bse_standard_osc_class_init (BseStandardOscClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
- BseSourceClass *source_class = BSE_SOURCE_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
+ BseSourceClass *source_class = BSE_SOURCE_CLASS (klass);
guint ochannel, ichannel;
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = bse_standard_osc_set_property;
gobject_class->get_property = bse_standard_osc_get_property;
@@ -209,7 +209,7 @@ bse_standard_osc_class_init (BseStandardOscClass *class)
}
static void
-bse_standard_osc_class_finalize (BseStandardOscClass *class)
+bse_standard_osc_class_finalize (BseStandardOscClass *klass)
{
}
diff --git a/bse/bsestorage.c b/bse/bsestorage.c
index f206984..e58cf42 100644
--- a/bse/bsestorage.c
+++ b/bse/bsestorage.c
@@ -59,7 +59,7 @@ struct _BseStorageItemLink
/* --- prototypes --- */
static void bse_storage_init (BseStorage *self);
-static void bse_storage_class_init (BseStorageClass *class);
+static void bse_storage_class_init (BseStorageClass *klass);
static void bse_storage_finalize (GObject *object);
static void storage_path_table_insert (BseStorage *self,
BseContainer *container,
@@ -111,11 +111,11 @@ BSE_BUILTIN_TYPE (BseStorage)
}
static void
-bse_storage_class_init (BseStorageClass *class)
+bse_storage_class_init (BseStorageClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
quark_raw_data_handle = g_quark_from_static_string ("raw-data-handle");
quark_vorbis_data_handle = g_quark_from_static_string ("vorbis-data-handle");
diff --git a/bse/bsesubiport.c b/bse/bsesubiport.c
index 7f3dace..01d4950 100644
--- a/bse/bsesubiport.c
+++ b/bse/bsesubiport.c
@@ -264,15 +264,15 @@ bse_sub_iport_update_modules (BseSubIPort *self,
}
static void
-bse_sub_iport_class_init (BseSubIPortClass *class)
+bse_sub_iport_class_init (BseSubIPortClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
- BseItemClass *item_class = BSE_ITEM_CLASS (class);
- BseSourceClass *source_class = BSE_SOURCE_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
+ BseItemClass *item_class = BSE_ITEM_CLASS (klass);
+ BseSourceClass *source_class = BSE_SOURCE_CLASS (klass);
guint i, channel_id;
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = bse_sub_iport_set_property;
gobject_class->get_property = bse_sub_iport_get_property;
diff --git a/bse/bsesuboport.c b/bse/bsesuboport.c
index 63ddb97..db93ca6 100644
--- a/bse/bsesuboport.c
+++ b/bse/bsesuboport.c
@@ -265,15 +265,15 @@ bse_sub_oport_update_modules (BseSubOPort *self,
bse_trans_commit (trans);
}
static void
-bse_sub_oport_class_init (BseSubOPortClass *class)
+bse_sub_oport_class_init (BseSubOPortClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
- BseItemClass *item_class = BSE_ITEM_CLASS (class);
- BseSourceClass *source_class = BSE_SOURCE_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
+ BseItemClass *item_class = BSE_ITEM_CLASS (klass);
+ BseSourceClass *source_class = BSE_SOURCE_CLASS (klass);
guint i, channel_id;
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = bse_sub_oport_set_property;
gobject_class->get_property = bse_sub_oport_get_property;
diff --git a/bse/bsesubsynth.c b/bse/bsesubsynth.c
index 1591d50..e811e6c 100644
--- a/bse/bsesubsynth.c
+++ b/bse/bsesubsynth.c
@@ -38,7 +38,7 @@ enum
/* --- prototypes --- */
static void bse_sub_synth_init (BseSubSynth *scard);
-static void bse_sub_synth_class_init (BseSubSynthClass *class);
+static void bse_sub_synth_class_init (BseSubSynthClass *klass);
static void bse_sub_synth_set_property (GObject *object,
guint param_id,
const GValue *value,
@@ -486,15 +486,15 @@ bse_sub_synth_update_port_contexts (BseSubSynth *self,
}
static void
-bse_sub_synth_class_init (BseSubSynthClass *class)
+bse_sub_synth_class_init (BseSubSynthClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
- BseItemClass *item_class = BSE_ITEM_CLASS (class);
- BseSourceClass *source_class = BSE_SOURCE_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
+ BseItemClass *item_class = BSE_ITEM_CLASS (klass);
+ BseSourceClass *source_class = BSE_SOURCE_CLASS (klass);
guint channel_id, i;
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = bse_sub_synth_set_property;
gobject_class->get_property = bse_sub_synth_get_property;
diff --git a/bse/bsesuper.c b/bse/bsesuper.c
index ba41f21..6b44c59 100644
--- a/bse/bsesuper.c
+++ b/bse/bsesuper.c
@@ -177,14 +177,14 @@ super_compat_finish (BseSuper *super,
}
static void
-bse_super_class_init (BseSuperClass *class)
+bse_super_class_init (BseSuperClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
- BseItemClass *item_class = BSE_ITEM_CLASS (class);
- // BseSourceClass *source_class = BSE_SOURCE_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
+ BseItemClass *item_class = BSE_ITEM_CLASS (klass);
+ // BseSourceClass *source_class = BSE_SOURCE_CLASS (klass);
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
quark_author = g_quark_from_static_string ("author");
quark_license = g_quark_from_static_string ("license");
@@ -195,8 +195,8 @@ bse_super_class_init (BseSuperClass *class)
item_class->compat_setup = super_compat_setup;
- class->modified = super_modified;
- class->compat_finish = super_compat_finish;
+ klass->modified = super_modified;
+ klass->compat_finish = super_compat_finish;
bse_object_class_add_param (object_class, NULL,
PARAM_AUTHOR,
diff --git a/bse/bsetrack.c b/bse/bsetrack.c
index 6e4cf7b..7c9a7a9 100644
--- a/bse/bsetrack.c
+++ b/bse/bsetrack.c
@@ -52,7 +52,7 @@ enum {
};
/* --- prototypes --- */
-static void bse_track_class_init (BseTrackClass *class);
+static void bse_track_class_init (BseTrackClass *klass);
static void bse_track_init (BseTrack *self);
static void bse_track_dispose (GObject *object);
static void bse_track_finalize (GObject *object);
@@ -981,14 +981,14 @@ bse_track_restore_private (BseObject *object,
}
static void
-bse_track_class_init (BseTrackClass *class)
+bse_track_class_init (BseTrackClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
- BseItemClass *item_class = BSE_ITEM_CLASS (class);
- BseSourceClass *source_class = BSE_SOURCE_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
+ BseItemClass *item_class = BSE_ITEM_CLASS (klass);
+ BseSourceClass *source_class = BSE_SOURCE_CLASS (klass);
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = bse_track_set_property;
gobject_class->get_property = bse_track_get_property;
@@ -1003,7 +1003,7 @@ bse_track_class_init (BseTrackClass *class)
source_class->context_create = bse_track_context_create;
source_class->context_dismiss = bse_track_context_dismiss;
- bse_source_class_inherit_channels (BSE_SOURCE_CLASS (class));
+ bse_source_class_inherit_channels (BSE_SOURCE_CLASS (klass));
bse_object_class_add_param (object_class, _("Adjustments"),
PROP_MUTED,
diff --git a/bse/bsewave.c b/bse/bsewave.c
index d8a3e01..bc60db5 100644
--- a/bse/bsewave.c
+++ b/bse/bsewave.c
@@ -812,13 +812,13 @@ bse_wave_index_lookup_best (BseWaveIndex *windex,
}
static void
-bse_wave_class_init (BseWaveClass *class)
+bse_wave_class_init (BseWaveClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
- BseItemClass *item_class = BSE_ITEM_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
+ BseItemClass *item_class = BSE_ITEM_CLASS (klass);
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = bse_wave_set_property;
gobject_class->get_property = bse_wave_get_property;
diff --git a/bse/bsewaveosc.c b/bse/bsewaveosc.c
index 18653fb..8ba2a66 100644
--- a/bse/bsewaveosc.c
+++ b/bse/bsewaveosc.c
@@ -40,7 +40,7 @@ enum
/* --- prototypes --- */
static void bse_wave_osc_init (BseWaveOsc *self);
-static void bse_wave_osc_class_init (BseWaveOscClass *class);
+static void bse_wave_osc_class_init (BseWaveOscClass *klass);
static void bse_wave_osc_dispose (GObject *object);
static void bse_wave_osc_finalize (GObject *object);
static void bse_wave_osc_set_property (GObject *object,
@@ -539,15 +539,15 @@ bse_wave_osc_request_pcm_position (BseWaveOsc *self)
}
static void
-bse_wave_osc_class_init (BseWaveOscClass *class)
+bse_wave_osc_class_init (BseWaveOscClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
- BseItemClass *item_class = BSE_ITEM_CLASS (class);
- BseSourceClass *source_class = BSE_SOURCE_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
+ BseItemClass *item_class = BSE_ITEM_CLASS (klass);
+ BseSourceClass *source_class = BSE_SOURCE_CLASS (klass);
guint ochannel, ichannel;
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = bse_wave_osc_set_property;
gobject_class->get_property = bse_wave_osc_get_property;
diff --git a/bse/bsewaverepo.c b/bse/bsewaverepo.c
index 83e0cdf..ad5a88d 100644
--- a/bse/bsewaverepo.c
+++ b/bse/bsewaverepo.c
@@ -27,7 +27,7 @@ enum
/* --- prototypes --- */
-static void bse_wave_repo_class_init (BseWaveRepoClass *class);
+static void bse_wave_repo_class_init (BseWaveRepoClass *klass);
static void bse_wave_repo_init (BseWaveRepo *wrepo);
static void bse_wave_repo_dispose (GObject *object);
static void bse_wave_repo_release_children (BseContainer *container);
@@ -80,12 +80,12 @@ BSE_BUILTIN_TYPE (BseWaveRepo)
}
static void
-bse_wave_repo_class_init (BseWaveRepoClass *class)
+bse_wave_repo_class_init (BseWaveRepoClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseContainerClass *container_class = BSE_CONTAINER_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseContainerClass *container_class = BSE_CONTAINER_CLASS (klass);
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = bse_wave_repo_set_property;
gobject_class->get_property = bse_wave_repo_get_property;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
