Issue 4550 (2/2) Avoid "using namespace std;" in included files

[lilypond.git] / lily / include / midi-chunk.hh

diff --git a/lily/include/midi-chunk.hh b/lily/include/midi-chunk.hh
index 64071d913ceaa059b756565045745cddd06ddebb..bf01cd7568611ca312576bb4cd84e51df6c704b2 100644 (file)
--- a/lily/include/midi-chunk.hh
+++ b/lily/include/midi-chunk.hh
@@ -1,10 +1,20 @@
-/* 
-  midi-chunk.hh -- declare  Midi_chunk
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2007 Han-Wen Nienhuys <hanwen@lilypond.org>
-  
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2007--2015 Han-Wen Nienhuys <hanwen@lilypond.org>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef MIDI_CHUNK_HH
@@ -14,7 +24,6 @@
 #include "virtual-methods.hh"
 #include "std-vector.hh"
 
-
 /**
    timed MIDI event
 */
@@ -25,33 +34,30 @@ public:
 
   int delta_ticks_;
   Midi_item *midi_;
-  string to_string () const;
+  std::string to_string () const;
 };
 
-
-
-
 /**
    variable sized MIDI data
 */
 class Midi_chunk
 {
 public:
-  void set (string header_string, string data_string, string footer_string);
-  virtual string to_string () const;
-  virtual string data_string () const;
-  DECLARE_CLASSNAME(Midi_chunk);
+  void set (const std::string &header_string, const std::string &data_string, const std::string &footer_string);
+  virtual std::string to_string () const;
+  virtual std::string data_string () const;
+  DECLARE_CLASSNAME (Midi_chunk);
   virtual ~Midi_chunk ();
 private:
-  string data_string_;
-  string footer_string_;
-  string header_string_;
+  std::string data_string_;
+  std::string footer_string_;
+  std::string header_string_;
 };
 
 class Midi_header : public Midi_chunk
 {
 public:
-  DECLARE_CLASSNAME(Midi_header);
+  DECLARE_CLASSNAME (Midi_header);
 
   Midi_header (int format, int tracks, int clocks_per_4);
 };
@@ -60,15 +66,16 @@ class Midi_track : public Midi_chunk
 {
 public:
   int number_;
-  DECLARE_CLASSNAME(Midi_track);
+  int port_;
+  DECLARE_CLASSNAME (Midi_track);
 
-  vector<Midi_event*> events_;
+  std::vector<Midi_event *> events_;
 
-  Midi_track ();
+  Midi_track (int number, bool port);
   ~Midi_track ();
 
   void add (int, Midi_item *midi);
-  virtual string data_string () const;
+  virtual std::string data_string () const;
 };
 
 #endif /* MIDI_CHUNK_HH */