Issue 4555: Make Lookup a namespace rather than an empty struct

diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh
index afb6beba2a3bf3ac5947c1507003ff1d300c0c37..f574b39c3f25c0ecb69523bbce3bef8437d28742 100644 (file)
--- a/lily/include/lily-proto.hh
+++ b/lily/include/lily-proto.hh
@@ -86,7 +86,6 @@ class Ligature_engraver;
 class Lily_lexer;
 class Lily_parser;
 class Listener;
-class Lookup;
 class Lyric_combine_music;
 class Lyric_combine_music_iterator;
 class Lyric_engraver;

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 3c9c19d7dee28756f628d4f845f6cb673b4244f2..5b7614531625c0bb02099c3618bcdf8b3d054409 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -24,25 +24,25 @@
 #include "stencil.hh"
 #include "std-vector.hh"
 
-struct Lookup
+namespace Lookup
 {
-  static Stencil bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot);
-  static Stencil circle (Real rad, Real thick, bool filled);
-  static Stencil rotated_box (Real slope, Real width, Real thick, Real blot);
-  static Stencil round_filled_polygon (vector<Offset> const &points, Real blotdiameter);
-  static Stencil frame (Box b, Real thick, Real blot);
-  static Stencil slur (Bezier controls, Real cthick, Real thick,
+  Stencil bracket (Axis a, Interval iv, Real thick, Real protrude, Real blot);
+  Stencil circle (Real rad, Real thick, bool filled);
+  Stencil rotated_box (Real slope, Real width, Real thick, Real blot);
+  Stencil round_filled_polygon (vector<Offset> const &points, Real blotdiameter);
+  Stencil frame (Box b, Real thick, Real blot);
+  Stencil slur (Bezier controls, Real cthick, Real thick,
                        SCM dash_definition);
-  static Stencil bezier_sandwich (Bezier top_curve, Bezier bottom_curve,
+  Stencil bezier_sandwich (Bezier top_curve, Bezier bottom_curve,
                                   Real thickness);
-  static Stencil beam (Real slope, Real width, Real thick, Real blot);
-  static Stencil blank (Box b);
-  static Stencil filled_box (Box b);
-  static Stencil round_filled_box (Box b, Real blotdiameter);
-  static Stencil repeat_slash (Real w, Real slope, Real th);
-  static Stencil horizontal_line (Interval w, Real th);
-  static Stencil triangle (Interval iv, Real thick, Real protrude);
-  static Stencil points_to_line_stencil (Real thick, vector<Offset> const &points);
+  Stencil beam (Real slope, Real width, Real thick, Real blot);
+  Stencil blank (Box b);
+  Stencil filled_box (Box b);
+  Stencil round_filled_box (Box b, Real blotdiameter);
+  Stencil repeat_slash (Real w, Real slope, Real th);
+  Stencil horizontal_line (Interval w, Real th);
+  Stencil triangle (Interval iv, Real thick, Real protrude);
+  Stencil points_to_line_stencil (Real thick, vector<Offset> const &points);
 };
 
 #endif // LOOKUP_HH