summaryrefslogtreecommitdiff
path: root/lily/rod.cc
diff options
context:
space:
mode:
authorHan-Wen Nienhuys <hanwen@xs4all.nl>1998-03-17 09:53:34 +0100
committerHan-Wen Nienhuys <hanwen@xs4all.nl>1998-03-17 09:53:34 +0100
commit77add406027ae5afda409a2e77b35852c5fae4f9 (patch)
tree5ef5e4a0736d627520c8344a548099e53ae756a0 /lily/rod.cc
parent1ff8f1c7e0baac008490e9e62995df70e0ed5128 (diff)
release: 0.1.53
Diffstat (limited to 'lily/rod.cc')
-rw-r--r--lily/rod.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/lily/rod.cc b/lily/rod.cc
index 707f5572e6..f624d01253 100644
--- a/lily/rod.cc
+++ b/lily/rod.cc
@@ -9,12 +9,13 @@
#include "rod.hh"
#include "p-col.hh"
#include "debug.hh"
+#include "single-malt-grouping-item.hh"
-Rod::Rod (Item *l, Item *r)
+Rod::Rod (Single_malt_grouping_item *l, Single_malt_grouping_item *r)
{
item_l_drul_[LEFT] =l;
item_l_drul_[RIGHT]=r;
- distance_f_ = l->width () [RIGHT] + r->width ()[LEFT];
+ distance_f_ = l->my_width () [RIGHT] + r->my_width ()[LEFT];
}
Rod::Rod ()
@@ -35,7 +36,6 @@ Column_rod::print () const
Column_rod::Column_rod ()
{
distance_f_ = 0;
- dir_ = CENTER;
other_l_ = 0;
}
@@ -48,7 +48,7 @@ void
Rod::add_to_cols ()
{
item_l_drul_[RIGHT]->column_l ()->add_rod
- (item_l_drul_[LEFT]->column_l (), distance_f_, LEFT);
+ (item_l_drul_[LEFT]->column_l (), distance_f_);
item_l_drul_[LEFT]->column_l ()->add_rod
- (item_l_drul_[RIGHT]->column_l (), distance_f_,RIGHT);
+ (item_l_drul_[RIGHT]->column_l (), distance_f_);
}