Lilypond_grob_key::Lilypond_grob_key (Object_key const *context,
Moment start,
- String name,
+ string name,
int disambiguation_count)
{
context_ = context;
void
Lilypond_grob_key::derived_mark () const
{
- scm_gc_mark (context_->self_scm ());
+ if (context_)
+ scm_gc_mark (context_->self_scm ());
}
// todo: reverse order of comparison for efficiency reasons.
if (c)
return c;
- c = String::compare (grob_name_, other->grob_name_);
+ c = grob_name_.compare (other->grob_name_);
if (c)
return c;
Lilypond_context_key::Lilypond_context_key (Object_key const *parent,
Moment start,
- String type,
- String id,
+ string type,
+ string id,
int count)
{
disambiguation_count_ = count;
if (c)
return c;
- c = String::compare (context_name_, other->context_name_);
+ c = context_name_.compare (other->context_name_);
if (c)
return c;
- c = String::compare (id_, other->id_);
+ c = id_.compare (other->id_);
if (c)
return c;
}
Lilypond_general_key::Lilypond_general_key (Object_key const *parent,
- String name,
+ string name,
int count)
{
parent_ = parent;
else if (other->parent_)
return 1;
- int c = String::compare (name_, other->name_);
+ int c = name_.compare (other->name_);
if (c)
return c;