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 c567e904f1797a814b4699b8f7a06d5247070c75..bf01cd7568611ca312576bb4cd84e51df6c704b2 100644 (file)
--- a/lily/include/midi-chunk.hh
+++ b/lily/include/midi-chunk.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2007--2011 Han-Wen Nienhuys <hanwen@lilypond.org>
+  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
@@ -24,7 +24,6 @@
 #include "virtual-methods.hh"
 #include "std-vector.hh"
 
-
 /**
    timed MIDI event
 */
@@ -35,27 +34,24 @@ 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;
+  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
@@ -73,13 +69,13 @@ public:
   int port_;
   DECLARE_CLASSNAME (Midi_track);
 
-  vector<Midi_event*> events_;
+  std::vector<Midi_event *> events_;
 
   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 */