Issue 4903/1: internal_make_grob: Remove unused `name' argument

diff --git a/lily/engraver-scheme.cc b/lily/engraver-scheme.cc
index 587a93199f8af73690cc0cc30298c46f903d527c..970aebde55159e80132fc884ed3614a8e019821b 100644 (file)
--- a/lily/engraver-scheme.cc
+++ b/lily/engraver-scheme.cc
@@ -33,7 +33,6 @@ LY_DEFINE (ly_engraver_make_grob, "ly:engraver-make-grob",
 
   Grob *g = unsmob<Engraver> (engraver)->
             internal_make_grob (grob_name, cause,
-                                ly_symbol2string (grob_name).c_str (),
                                 "scheme", 0, "scheme");
   return g->self_scm ();
 }

diff --git a/lily/engraver.cc b/lily/engraver.cc
index 5a1486927a3f696a9d503b99ab5dce2fb61ff2dd..daf055ccf71141ea0df2e2c8e2a5843e93d082d1 100644 (file)
--- a/lily/engraver.cc
+++ b/lily/engraver.cc
@@ -106,7 +106,6 @@ LY_DEFINE (ly_set_grob_creation_callback, "ly:set-grob-creation-callback",
 Grob *
 Engraver::internal_make_grob (SCM symbol,
                               SCM cause,
-                              char const * /* name */,
                               char const *file,
                               int line,
                               char const *fun)
@@ -146,26 +145,24 @@ Engraver::internal_make_grob (SCM symbol,
 
 Item *
 Engraver::internal_make_item (SCM x, SCM cause,
-                              char const *name,
                               char const *file, int line, char const *fun)
 {
-  Item *it = dynamic_cast<Item *> (internal_make_grob (x, cause, name, file, line, fun));
+  Item *it = dynamic_cast<Item *> (internal_make_grob (x, cause, file, line, fun));
   assert (it);
   return it;
 }
 
 Paper_column *
-Engraver::internal_make_column (SCM x, char const *name,
-                                char const *file, int line, char const *fun)
+Engraver::internal_make_column (SCM x, char const *file, int line, char const *fun)
 {
-  return dynamic_cast<Paper_column *> (internal_make_grob (x, SCM_EOL, name, file, line, fun));
+  return dynamic_cast<Paper_column *> (internal_make_grob (x, SCM_EOL, file, line, fun));
 }
 
 Spanner *
-Engraver::internal_make_spanner (SCM x, SCM cause, char const *name,
+Engraver::internal_make_spanner (SCM x, SCM cause,
                                  char const *file, int line, char const *fun)
 {
-  Spanner *sp = dynamic_cast<Spanner *> (internal_make_grob (x, cause, name, file, line, fun));
+  Spanner *sp = dynamic_cast<Spanner *> (internal_make_grob (x, cause, file, line, fun));
   assert (sp);
   return sp;
 }

diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh
index 928f6a969dbddad717c25856351b53b9fba4f5d5..868af25d4541558c029507fbcc7b2a586119843c 100644 (file)
--- a/lily/include/engraver.hh
+++ b/lily/include/engraver.hh
@@ -31,7 +31,7 @@
 */
 class Engraver : public Translator
 {
-  Grob *internal_make_grob (SCM sym, SCM cause, char const *name,
+  Grob *internal_make_grob (SCM sym, SCM cause,
                             char const *f, int l, char const *fun);
   friend SCM ly_engraver_make_grob (SCM, SCM, SCM);
   friend class Engraver_group;
@@ -67,11 +67,11 @@ public:
 
   Grob_info make_grob_info (Grob *, SCM cause);
 
-  Item *internal_make_item (SCM sym, SCM cause, char const *name,
+  Item *internal_make_item (SCM sym, SCM cause,
                             char const *f, int l, char const *fun);
-  Spanner *internal_make_spanner (SCM sym, SCM cause, char const *name,
+  Spanner *internal_make_spanner (SCM sym, SCM cause,
                                   char const *f, int l, char const *fun);
-  Paper_column *internal_make_column (SCM sym, char const *name,
+  Paper_column *internal_make_column (SCM sym,
                                       char const *f, int l, char const *fun);
 
   /**
@@ -82,9 +82,9 @@ public:
   Engraver ();
 };
 
-#define make_item(x, cause) internal_make_item (ly_symbol2scm (x), cause, x, __FILE__, __LINE__, __FUNCTION__)
-#define make_spanner(x, cause) internal_make_spanner (ly_symbol2scm (x), cause, x, __FILE__, __LINE__, __FUNCTION__)
-#define make_paper_column(x) internal_make_column (ly_symbol2scm (x), x, __FILE__, __LINE__, __FUNCTION__)
+#define make_item(x, cause) internal_make_item (ly_symbol2scm (x), cause, __FILE__, __LINE__, __FUNCTION__)
+#define make_spanner(x, cause) internal_make_spanner (ly_symbol2scm (x), cause, __FILE__, __LINE__, __FUNCTION__)
+#define make_paper_column(x) internal_make_column (ly_symbol2scm (x), __FILE__, __LINE__, __FUNCTION__)
 
 bool ly_is_grob_cause (SCM obj);
 

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index 75eccf69fc2cb44edb69d4cc63861332f6d8f578..047a547525ee9ac70bf484bf46bec633d8858c3b 100644 (file)
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -176,9 +176,7 @@ New_fingering_engraver::add_fingering (Grob *head,
 {
   Finger_tuple ft;
 
-  ft.script_ = internal_make_item (grob_sym, event->self_scm (),
-                                   ly_symbol2string (grob_sym).c_str (),
-                                   __FILE__, __LINE__, __FUNCTION__);
+  ft.script_ = make_item (grob_sym, event->self_scm ());
 
   Side_position_interface::add_support (ft.script_, head);