Run fixcc + astyle2.02.1

diff --git a/flower/include/yaffut.hh b/flower/include/yaffut.hh
index aa54fa66168363eec4fe87484103c1001297f2d6..8b10d23aa5a8dcde1fc5153d0787f7975a186946 100644 (file)
--- a/flower/include/yaffut.hh
+++ b/flower/include/yaffut.hh
@@ -277,7 +277,7 @@ struct Test: public ITest, public virtual Suite
   static Registrator<Suite, Case> s_Registrator;
   Test (): Suite ()
   {
-    Registrator<Suite, Case>* r = &s_Registrator;
+    Registrator<Suite, Case> *r = &s_Registrator;
     (void)r;
   }
   template <typename E, typename T>
@@ -301,7 +301,7 @@ struct Test<Case, void>: public ITest
   static Registrator<Case, void> s_Registrator;
   Test ()
   {
-    Registrator<Case, void>* r = &s_Registrator;
+    Registrator<Case, void> *r = &s_Registrator;
     (void)r;
   }
   template <typename E, typename T>

diff --git a/lily/include/beam-scoring-problem.hh b/lily/include/beam-scoring-problem.hh
index 6e2302d19a8811960ccb9c30c0a7b7d8ebd7724e..7e77d6794d9bea907c8afa293da73a0eab27a5b2 100644 (file)
--- a/lily/include/beam-scoring-problem.hh
+++ b/lily/include/beam-scoring-problem.hh
@@ -190,7 +190,7 @@ private:
   void score_slope_direction (Beam_configuration *config) const;
   void score_slope_musical (Beam_configuration *config) const;
   void score_stem_lengths (Beam_configuration *config) const;
-  void generate_quants (vector<Beam_configuration *>* scores) const;
+  void generate_quants (vector<Beam_configuration *> *scores) const;
   void score_collisions (Beam_configuration *config) const;
 };
 

diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh
index 0715c545a635a7f6af70ea85e8520c0804506338..ceedf24007d9f57f24928a20843275b5c440a974 100644 (file)
--- a/lily/include/skyline.hh
+++ b/lily/include/skyline.hh
@@ -54,9 +54,9 @@ private:
   list<Building> buildings_;
   Direction sky_;
 
-  void internal_merge_skyline (list<Building>*, list<Building>*,
+  void internal_merge_skyline (list<Building> *, list<Building> *,
                                list<Building> *const result);
-  list<Building> internal_build_skyline (list<Box>*, Real, Axis, Direction);
+  list<Building> internal_build_skyline (list<Box> *, Real, Axis, Direction);
 
   DECLARE_SIMPLE_SMOBS (Skyline);
 

diff --git a/lily/include/slur.hh b/lily/include/slur.hh
index d1f743ca8e2b51f34a8a50f3f358014a387ade0d..b20311785d2d1870c23075cc28e4645f4ea70c4d 100644 (file)
--- a/lily/include/slur.hh
+++ b/lily/include/slur.hh
@@ -30,7 +30,7 @@ public:
   static void add_column (Grob *me, Grob *col);
   static void add_extra_encompass (Grob *me, Grob *col);
   static void replace_breakable_encompass_objects (Grob *me);
-  static void auxiliary_acknowledge_extra_object (Grob_info const &, vector<Grob *>&, vector<Grob *>&);
+  static void auxiliary_acknowledge_extra_object (Grob_info const &, vector<Grob *> &, vector<Grob *> &);
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_control_points, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));

diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index 18582a607dee8abd6f5fffa41eef553752641c61..9a6f8f40f25c0edbe47f45ecde1780c2babc89b6 100644 (file)
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -504,7 +504,7 @@ Page_breaking::page_height (int page_num, bool last) const
   // This means that we won't cache properly if page_num is negative or
   // if calc_height returns a negative number.  But that's likely to
   // be rare, so it shouldn't affect performance.
-  vector<Real>& cache = last ? last_page_height_cache_ : page_height_cache_;
+  vector<Real> &cache = last ? last_page_height_cache_ : page_height_cache_;
   if (page_num >= 0 && (int) cache.size () > page_num && cache[page_num] >= 0)
     return cache[page_num];
   else

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 77dc986cfe8dd4fed779c32da03d8c57e0ee523d..31f3af6176ef91189a924c449e0fb3d7e57b4eb1 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -245,7 +245,7 @@ int
 Staff_performer::get_channel (string instrument)
 {
   SCM channel_mapping = get_property ("midiChannelMapping");
-  map<string, int>& channel_map
+  map<string, int> &channel_map
     = (channel_mapping != ly_symbol2scm ("instrument"))
       ? channel_map_
       : static_channel_map_;