X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fside-position-interface.cc;h=52551e8b5286452342d4eae53dbc1f9396efef36;hb=8e2eaf4959bec63a1128a444591a540f4f1e2937;hp=efb182092fe599634fdb82b59cd780fdaa1ca122;hpb=f127e14af04f474d20406ca0e0f76f05061ee103;p=lilypond.git

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index efb182092f..52551e8b52 100644
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -48,10 +48,6 @@ using namespace std;
 #include "warn.hh"
 #include "unpure-pure-container.hh"
 
-using std::set;
-using std::string;
-using std::vector;
-
 void
 Side_position_interface::add_support (Grob *me, Grob *e)
 {
@@ -224,7 +220,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i
       // skyline will likely be of infinite width anyway
       // and we don't want to prematurely trigger H spacing
       Real xc = a == X_AXIS || (pure && dynamic_cast<Spanner *> (me))
-                ? me->get_parent (X_AXIS)->relative_coordinate (common[X_AXIS], X_AXIS)
+                ? me->parent_relative (common[X_AXIS], X_AXIS)
                 : me->relative_coordinate (common[X_AXIS], X_AXIS);
       // same here, for X_AXIS spacing, if it's happening, it should only be
       // before line breaking.  because there is no thing as "pure" x spacing,
@@ -278,7 +274,7 @@ Side_position_interface::aligned_side (Grob *me, Axis a, bool pure, int start, i
            if (unsmob<Skyline_pair> (sp))
              {
                Real xc = pure && dynamic_cast<Spanner *> (e)
-                         ? e->get_parent (X_AXIS)->relative_coordinate (common[X_AXIS], X_AXIS)
+                         ? e->parent_relative (common[X_AXIS], X_AXIS)
                          : e->relative_coordinate (common[X_AXIS], X_AXIS);
                // same logic as above
                // we assume horizontal spacing is always pure